     /// - Returns: Retrieved entry
     /// - Throws: KeychainStorageError
     @objc open func retrieveEntry(withName name: String) throws -> KeychainEntry {
-        let tag = String(format: KeychainStorage.privateKeyIdentifierFormat, self.storageParams.appName, name)
-
     #if os(iOS) || os(tvOS) || os(watchOS)
-        guard let tagData = tag.data(using: .utf8),
-            let nameData = name.data(using: .utf8) else {
-                throw KeychainStorageError(errCode: .utf8ConvertingError)
+        guard let nameData = name.data(using: .utf8) else {
+            throw KeychainStorageError(errCode: .utf8ConvertingError)
         }
 
         let query: [String: Any] = [
             kSecClass as String: kSecClassKey,
             kSecAttrKeyClass as String: kSecAttrKeyClassPrivate,
             kSecAttrApplicationLabel as String: nameData,
-            kSecAttrApplicationTag as String: tagData,
 
             kSecReturnData as String: true,
             kSecReturnAttributes as String: true

        let query: [String: Any] = [
            kSecClass as String: kSecClassGenericPassword,
            kSecAttrAccount as String: name,
            kSecAttrService as String: tag,

            kSecAttrComment as String: self.commentString()
        ]

    /// - Parameter name: Alias
    /// - Throws: KeychainStorageError
    @objc open func deleteEntry(withName name: String) throws {
    #if os(iOS) || os(tvOS) || os(watchOS)
        guard let nameData = name.data(using: .utf8) else {
            throw KeychainStorageError(errCode: .utf8ConvertingError)
        }

        let query: [String: Any] = [
            kSecClass as String: kSecClassKey,
            kSecAttrKeyClass as String: kSecAttrKeyClassPrivate,
            kSecAttrApplicationLabel as String: nameData,
        ]

        #if TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
