Refactored these classes to have the 's'.