Short names

Added short name functionality