Remove short name option

[davidd-amd]

This PR removes support for the --short-names option which reduces complexity and risk for regression. The corresponding naming functions were removed as well.