Remove todo - generic camelCase