Refactored Class Name to stay consistant