Changed type synonyms to use the new synonyms for polymorphism