Improve naming of Data(Set|Type|Group)