Move type synonyms to more appropriate place