Fix KeyLocator and KeyName classes.