OCSADV-172: Case class and method name cleanup.