update case classes to be more descriptive