Rename to be consistent in naming.
Fix case in customerGroup.