renaming classes to better express intent