Updating Class and file names according to PR feedback.