CamelCase fixes.