Changed class name from default Underscores names