Added class and method naming suggestions