More lowerCamelCase cleanups