Class Name Changed for consistency