Better naming of one control classes