Rename Extension.TYPES to TYPE for consistency/style