A few leftovers from a class rename refactoring.