Changed class name for better readability