Toponymy is the discipline that studies place-names.