Renamed local SubjectLocator ivars to follow new logic