Refactored type names