Merge "Improved naming and usage of groupings"