Better handling of camelcased type names in makeFields camel case rules

Reported by #476