One more renaming fix