Eradicate remaining CamelCase