rename some case classes for consistency