Longernaming - rename classes with complete-word name components

Naming conventions per code review.