diff --git a/Mac/Scriptability/Account+Scriptability.swift b/Mac/Scriptability/ScriptableAccount.swift
similarity index 100%
rename from Mac/Scriptability/Account+Scriptability.swift
rename to Mac/Scriptability/ScriptableAccount.swift
diff --git a/Mac/Scriptability/Article+Scriptability.swift b/Mac/Scriptability/ScriptableArticle.swift
similarity index 100%
rename from Mac/Scriptability/Article+Scriptability.swift
rename to Mac/Scriptability/ScriptableArticle.swift
diff --git a/Mac/Scriptability/Author+Scriptability.swift b/Mac/Scriptability/ScriptableAuthor.swift
similarity index 100%
rename from Mac/Scriptability/Author+Scriptability.swift
rename to Mac/Scriptability/ScriptableAuthor.swift
diff --git a/Mac/Scriptability/AppDelegate+Scriptability.swift b/Mac/Scriptability/ScriptingAppDelegate.swift
similarity index 100%
rename from Mac/Scriptability/AppDelegate+Scriptability.swift
rename to Mac/Scriptability/ScriptingAppDelegate.swift
diff --git a/Mac/Scriptability/MainWindowController+Scriptability.swift b/Mac/Scriptability/ScriptingMainWindowController.swift
similarity index 100%
rename from Mac/Scriptability/MainWindowController+Scriptability.swift
rename to Mac/Scriptability/ScriptingMainWindowController.swift