Adjust REST API class names to better match their purpose