More fixing after renaming.