Class renaming seems to be working.