fixed camelCase issues