two classes renamed to follow naming conventions