Fix casing issues