Simplify name handling for TestMorisawa2007.