add "Type" prefix to field types for clarity