Fixing a bug that name refactoring caused.