CamelCase updates

updates