Fix few PascalCase bugs