CamelCase and slight spelling fixes