modify class name to conform with Amazaon naming conventions