Fixed wrong camel casing and simplified dealing with locale