Removed leading parts of names

Shortened symbol names further