Remove exceptions for class name formatting