Fixed some casing issues