Modify mail class name