Fixed cursor naming after refactoring.