moving short name into subclasses where differnet from account, changing stations to use name as short name