Add CamelCase & -_ mappings