Reordered type processing to allow alteration of previously defined types.
Automatically convert type names from hyphens to camelCase