diff --git a/pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift b/pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift
index d6ebcb0..e718821 100644
--- a/pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift
+++ b/pass/Controllers/GitSSHKeyArmorSettingTableViewController.swift
@@ -61,7 +61,7 @@ class GitSSHKeyArmorSettingTableViewController: UITableViewController, UITextVie
             // update full text and check whether we are done
             key.append(segment)
             if let index1 = key.range(of: "-----END")?.lowerBound,
-                let _ = key.substring(from: index1).range(of: "KEY-----")?.lowerBound {
+                let _ = key.suffix(from: index1).range(of: "KEY-----")?.lowerBound {
                 isDone = true
             }
             
diff --git a/passKit/Models/PasswordEntity.swift b/passKit/Models/PasswordEntity.swift
index abc77fc..645dba8 100644
--- a/passKit/Models/PasswordEntity.swift
+++ b/passKit/Models/PasswordEntity.swift
@@ -14,7 +14,7 @@ extension PasswordEntity {
     public var nameWithCategory: String {
         get {
             if let p = path, p.hasSuffix(".gpg") {
-                return p.substring(to: p.index(p.endIndex, offsetBy: -4))
+                return String(p.prefix(upTo: p.index(p.endIndex, offsetBy: -4)))
             } else {
                 return ""
             }
diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 825bd61..537672a 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -347,7 +347,7 @@ public class PasswordStore {
             }.map { (filename) -> PasswordEntity in
                 let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity
                 if filename.hasSuffix(".gpg") {
-                    passwordEntity.name = filename.substring(to: filename.index(filename.endIndex, offsetBy: -4))
+                    passwordEntity.name = String(filename.prefix(upTo: filename.index(filename.endIndex, offsetBy: -4)))
                 } else {
                     passwordEntity.name = filename
                 }
@@ -369,7 +369,7 @@ public class PasswordStore {
                         let files = try fm.contentsOfDirectory(atPath: filePath).map { (filename) -> PasswordEntity in
                             let passwordEntity = NSEntityDescription.insertNewObject(forEntityName: "PasswordEntity", into: context) as! PasswordEntity
                             if filename.hasSuffix(".gpg") {
-                                passwordEntity.name = filename.substring(to: filename.index(filename.endIndex, offsetBy: -4))
+                                passwordEntity.name = String(filename.prefix(upTo: filename.index(filename.endIndex, offsetBy: -4)))
                             } else {
                                 passwordEntity.name = filename
                             }