Refactored case classes val names