In KeyLocator, added support for KeyName.