Fix custom class name problem