Unify naming between method names and groups
CR fixes
Merge pull request #168 from Wikia/unify-naming-of-groups

Unify naming between method names and groups