[GH-31] Fix problems with renaming classes.