Rename the class and function to remove underscore