major renaming in order to shorten names