diff --git a/cookiecutter.json b/cookiecutter.json
index 18537ab..669464b 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -1,5 +1,8 @@
 {
-  "short_name": "MyNewPlugin",
-  "author": "Your Name",
-  "description": "One line description of the plug-in"
-}
+  "plugin_name": null,
+  "author": null,
+  "description": null,
+  "__prompts__": {
+    "plugin_name": "Plugin Name (strongly suggested to use 'QS' prefix, e.g. 'QSMyNewPlugin'):"
+  }
+}
\ No newline at end of file
diff --git a/{{cookiecutter.short_name}}/.gitignore b/{{cookiecutter.plugin_name}}/.gitignore
similarity index 100%
rename from {{cookiecutter.short_name}}/.gitignore
rename to {{cookiecutter.plugin_name}}/.gitignore
diff --git a/{{cookiecutter.plugin_name}}/Documentation.mdown b/{{cookiecutter.plugin_name}}/Documentation.mdown
new file mode 100644
index 0000000..c4d35b3
--- /dev/null
+++ b/{{cookiecutter.plugin_name}}/Documentation.mdown
@@ -0,0 +1,5 @@
+# {{cookiecutter.plugin_name}} #
+
+## {{cookiecutter.description}} ##
+
+Documentation for {{cookiecutter.plugin_name}}
diff --git a/{{cookiecutter.short_name}}/README.markdown b/{{cookiecutter.plugin_name}}/README.markdown
similarity index 100%
rename from {{cookiecutter.short_name}}/README.markdown
rename to {{cookiecutter.plugin_name}}/README.markdown
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}} Unit Tests/QS{{cookiecutter.short_name}}_Unit_Tests.swift b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}} Unit Tests/{{cookiecutter.plugin_name}}_Unit_Tests.swift
similarity index 83%
rename from {{cookiecutter.short_name}}/QS{{cookiecutter.short_name}} Unit Tests/QS{{cookiecutter.short_name}}_Unit_Tests.swift
rename to {{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}} Unit Tests/{{cookiecutter.plugin_name}}_Unit_Tests.swift
index ece60db..a459660 100644
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}} Unit Tests/QS{{cookiecutter.short_name}}_Unit_Tests.swift	
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}} Unit Tests/{{cookiecutter.plugin_name}}_Unit_Tests.swift	
@@ -1,6 +1,6 @@
 //
-//  QS{{cookiecutter.short_name}}_Unit_Tests.swift
-//  QS{{cookiecutter.short_name}} Unit Tests
+//  {{cookiecutter.plugin_name}}_Unit_Tests.swift
+//  {{cookiecutter.plugin_name}} Unit Tests
 //
 //  Created by Nathan Henrie on 2022-09-11.
 //  Copyright © 2022 Quicksilver. All rights reserved.
@@ -8,9 +8,9 @@
 
 import XCTest
 
-import QS{{cookiecutter.short_name}}
+import {{cookiecutter.plugin_name}}
 
-class QS{{cookiecutter.short_name}}_Unit_Tests: XCTestCase {
+class {{cookiecutter.plugin_name}}_Unit_Tests: XCTestCase {
 
     override func setUpWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.
@@ -21,7 +21,7 @@ class QS{{cookiecutter.short_name}}_Unit_Tests: XCTestCase {
     }
 
     func testExample() throws {
-        let action = QS{{cookiecutter.short_name}}SwiftAction()
+        let action = {{cookiecutter.plugin_name}}SwiftAction()
         let result = action.performSwiftActionOnObject(QSObject(string:"example input")!)
         XCTAssertEqual(result, QSObject(string:"here it comes!")!)
         // This is an example of a functional test case.
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.xcodeproj/project.pbxproj b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.xcodeproj/project.pbxproj
similarity index 69%
rename from {{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.xcodeproj/project.pbxproj
rename to {{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.xcodeproj/project.pbxproj
index feeb8d1..8a2b754 100644
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.xcodeproj/project.pbxproj
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.xcodeproj/project.pbxproj
@@ -7,15 +7,15 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		603AE8F228CE5ED700C67DD0 /* QS{{cookiecutter.short_name}}_Unit_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 603AE8F128CE5ED700C67DD0 /* QS{{cookiecutter.short_name}}_Unit_Tests.swift */; };
+		603AE8F228CE5ED700C67DD0 /* {{cookiecutter.plugin_name}}_Unit_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 603AE8F128CE5ED700C67DD0 /* {{cookiecutter.plugin_name}}_Unit_Tests.swift */; };
 		603AE8FD28CE604C00C67DD0 /* QSInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 603AE8F928CE604C00C67DD0 /* QSInterface.framework */; };
 		603AE8FE28CE604C00C67DD0 /* QSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 603AE8FA28CE604C00C67DD0 /* QSCore.framework */; };
 		603AE8FF28CE604D00C67DD0 /* QSEffects.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 603AE8FB28CE604C00C67DD0 /* QSEffects.framework */; };
 		603AE90028CE604D00C67DD0 /* QSFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 603AE8FC28CE604C00C67DD0 /* QSFoundation.framework */; };
-		608539A227D15DA2004EE149 /* QS{{cookiecutter.short_name}}.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608539A127D15DA2004EE149 /* QS{{cookiecutter.short_name}}.swift */; };
-		609B1FC727F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Source.m in Sources */ = {isa = PBXBuildFile; fileRef = 609B1FC327F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Source.m */; };
-		609B1FC827F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Action.m in Sources */ = {isa = PBXBuildFile; fileRef = 609B1FC427F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Action.m */; };
-		60E5BA1E28CE80950006B489 /* QS{{cookiecutter.short_name}}.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608539A127D15DA2004EE149 /* QS{{cookiecutter.short_name}}.swift */; };
+		608539A227D15DA2004EE149 /* {{cookiecutter.plugin_name}}.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608539A127D15DA2004EE149 /* {{cookiecutter.plugin_name}}.swift */; };
+		609B1FC727F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Source.m in Sources */ = {isa = PBXBuildFile; fileRef = 609B1FC327F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Source.m */; };
+		609B1FC827F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Action.m in Sources */ = {isa = PBXBuildFile; fileRef = 609B1FC427F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Action.m */; };
+		60E5BA1E28CE80950006B489 /* {{cookiecutter.plugin_name}}.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608539A127D15DA2004EE149 /* {{cookiecutter.plugin_name}}.swift */; };
 		D434B7751FC8FFC7007AF9C3 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D434B7741FC8FFC7007AF9C3 /* Cocoa.framework */; };
 /* End PBXBuildFile section */
 
@@ -25,26 +25,26 @@
 			containerPortal = D434B7681FC8FFC7007AF9C3 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = D434B7701FC8FFC7007AF9C3;
-			remoteInfo = QS{{cookiecutter.short_name}};
+			remoteInfo = {{cookiecutter.plugin_name}};
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		603AE8EF28CE5ED700C67DD0 /* QS{{cookiecutter.short_name}} Unit Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "QS{{cookiecutter.short_name}} Unit Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
-		603AE8F128CE5ED700C67DD0 /* QS{{cookiecutter.short_name}}_Unit_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QS{{cookiecutter.short_name}}_Unit_Tests.swift; sourceTree = "<group>"; };
-		603AE8F628CE5F0800C67DD0 /* QS{{cookiecutter.short_name}}.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = QS{{cookiecutter.short_name}}.xctestplan; sourceTree = SOURCE_ROOT; };
+		603AE8EF28CE5ED700C67DD0 /* {{cookiecutter.plugin_name}} Unit Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "{{cookiecutter.plugin_name}} Unit Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
+		603AE8F128CE5ED700C67DD0 /* {{cookiecutter.plugin_name}}_Unit_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = {{cookiecutter.plugin_name}}_Unit_Tests.swift; sourceTree = "<group>"; };
+		603AE8F628CE5F0800C67DD0 /* {{cookiecutter.plugin_name}}.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = {{cookiecutter.plugin_name}}.xctestplan; sourceTree = SOURCE_ROOT; };
 		603AE8F928CE604C00C67DD0 /* QSInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QSInterface.framework; path = ../../../../../private/tmp/QS/build/Debug/QSInterface.framework; sourceTree = "<group>"; };
 		603AE8FA28CE604C00C67DD0 /* QSCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QSCore.framework; path = ../../../../../private/tmp/QS/build/Debug/QSCore.framework; sourceTree = "<group>"; };
 		603AE8FB28CE604C00C67DD0 /* QSEffects.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QSEffects.framework; path = ../../../../../private/tmp/QS/build/Debug/QSEffects.framework; sourceTree = "<group>"; };
 		603AE8FC28CE604C00C67DD0 /* QSFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QSFoundation.framework; path = ../../../../../private/tmp/QS/build/Debug/QSFoundation.framework; sourceTree = "<group>"; };
-		606D3146289F600F00A76A21 /* QS{{cookiecutter.short_name}}.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QS{{cookiecutter.short_name}}.h; sourceTree = "<group>"; };
-		608539A027D15DA2004EE149 /* QS{{cookiecutter.short_name}}-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "QS{{cookiecutter.short_name}}-Bridging-Header.h"; sourceTree = "<group>"; };
-		608539A127D15DA2004EE149 /* QS{{cookiecutter.short_name}}.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QS{{cookiecutter.short_name}}.swift; sourceTree = "<group>"; };
-		609B1FC327F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Source.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QS{{cookiecutter.short_name}}Source.m; sourceTree = "<group>"; };
-		609B1FC427F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Action.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QS{{cookiecutter.short_name}}Action.m; sourceTree = "<group>"; };
-		609B1FC527F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Action.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QS{{cookiecutter.short_name}}Action.h; sourceTree = "<group>"; };
-		609B1FC627F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Source.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QS{{cookiecutter.short_name}}Source.h; sourceTree = "<group>"; };
-		D434B7711FC8FFC7007AF9C3 /* QS{{cookiecutter.short_name}}.qsplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = QS{{cookiecutter.short_name}}.qsplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		606D3146289F600F00A76A21 /* {{cookiecutter.plugin_name}}.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = {{cookiecutter.plugin_name}}.h; sourceTree = "<group>"; };
+		608539A027D15DA2004EE149 /* {{cookiecutter.plugin_name}}-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "{{cookiecutter.plugin_name}}-Bridging-Header.h"; sourceTree = "<group>"; };
+		608539A127D15DA2004EE149 /* {{cookiecutter.plugin_name}}.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = {{cookiecutter.plugin_name}}.swift; sourceTree = "<group>"; };
+		609B1FC327F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Source.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = {{cookiecutter.plugin_name}}Source.m; sourceTree = "<group>"; };
+		609B1FC427F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Action.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = {{cookiecutter.plugin_name}}Action.m; sourceTree = "<group>"; };
+		609B1FC527F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Action.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = {{cookiecutter.plugin_name}}Action.h; sourceTree = "<group>"; };
+		609B1FC627F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Source.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = {{cookiecutter.plugin_name}}Source.h; sourceTree = "<group>"; };
+		D434B7711FC8FFC7007AF9C3 /* {{cookiecutter.plugin_name}}.qsplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = {{cookiecutter.plugin_name}}.qsplugin; sourceTree = BUILT_PRODUCTS_DIR; };
 		D434B7741FC8FFC7007AF9C3 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		D46888911FC903AC00797047 /* Developer.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Developer.xcconfig; sourceTree = "<group>"; };
 		D46888921FC903AC00797047 /* Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Common.xcconfig; sourceTree = "<group>"; };
@@ -78,21 +78,21 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		603AE8F028CE5ED700C67DD0 /* QS{{cookiecutter.short_name}} Unit Tests */ = {
+		603AE8F028CE5ED700C67DD0 /* {{cookiecutter.plugin_name}} Unit Tests */ = {
 			isa = PBXGroup;
 			children = (
-				603AE8F128CE5ED700C67DD0 /* QS{{cookiecutter.short_name}}_Unit_Tests.swift */,
+				603AE8F128CE5ED700C67DD0 /* {{cookiecutter.plugin_name}}_Unit_Tests.swift */,
 			);
-			path = "QS{{cookiecutter.short_name}} Unit Tests";
+			path = "{{cookiecutter.plugin_name}} Unit Tests";
 			sourceTree = "<group>";
 		};
 		D434B7671FC8FFC7007AF9C3 = {
 			isa = PBXGroup;
 			children = (
-				603AE8F628CE5F0800C67DD0 /* QS{{cookiecutter.short_name}}.xctestplan */,
+				603AE8F628CE5F0800C67DD0 /* {{cookiecutter.plugin_name}}.xctestplan */,
 				D46888901FC903AC00797047 /* Configuration */,
-				D434B7761FC8FFC7007AF9C3 /* QS{{cookiecutter.short_name}} */,
-				603AE8F028CE5ED700C67DD0 /* QS{{cookiecutter.short_name}} Unit Tests */,
+				D434B7761FC8FFC7007AF9C3 /* {{cookiecutter.plugin_name}} */,
+				603AE8F028CE5ED700C67DD0 /* {{cookiecutter.plugin_name}} Unit Tests */,
 				D434B7731FC8FFC7007AF9C3 /* Frameworks */,
 				D434B7721FC8FFC7007AF9C3 /* Products */,
 			);
@@ -101,8 +101,8 @@
 		D434B7721FC8FFC7007AF9C3 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				D434B7711FC8FFC7007AF9C3 /* QS{{cookiecutter.short_name}}.qsplugin */,
-				603AE8EF28CE5ED700C67DD0 /* QS{{cookiecutter.short_name}} Unit Tests.xctest */,
+				D434B7711FC8FFC7007AF9C3 /* {{cookiecutter.plugin_name}}.qsplugin */,
+				603AE8EF28CE5ED700C67DD0 /* {{cookiecutter.plugin_name}} Unit Tests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -119,19 +119,19 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		D434B7761FC8FFC7007AF9C3 /* QS{{cookiecutter.short_name}} */ = {
+		D434B7761FC8FFC7007AF9C3 /* {{cookiecutter.plugin_name}} */ = {
 			isa = PBXGroup;
 			children = (
-				606D3146289F600F00A76A21 /* QS{{cookiecutter.short_name}}.h */,
-				609B1FC527F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Action.h */,
-				609B1FC427F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Action.m */,
-				609B1FC627F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Source.h */,
-				609B1FC327F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Source.m */,
+				606D3146289F600F00A76A21 /* {{cookiecutter.plugin_name}}.h */,
+				609B1FC527F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Action.h */,
+				609B1FC427F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Action.m */,
+				609B1FC627F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Source.h */,
+				609B1FC327F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Source.m */,
 				D4EF80261FC9004F0025F5EA /* Info.plist */,
-				608539A127D15DA2004EE149 /* QS{{cookiecutter.short_name}}.swift */,
-				608539A027D15DA2004EE149 /* QS{{cookiecutter.short_name}}-Bridging-Header.h */,
+				608539A127D15DA2004EE149 /* {{cookiecutter.plugin_name}}.swift */,
+				608539A027D15DA2004EE149 /* {{cookiecutter.plugin_name}}-Bridging-Header.h */,
 			);
-			path = QS{{cookiecutter.short_name}};
+			path = {{cookiecutter.plugin_name}};
 			sourceTree = "<group>";
 		};
 		D46888901FC903AC00797047 /* Configuration */ = {
@@ -151,9 +151,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		603AE8EE28CE5ED700C67DD0 /* QS{{cookiecutter.short_name}} Unit Tests */ = {
+		603AE8EE28CE5ED700C67DD0 /* {{cookiecutter.plugin_name}} Unit Tests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 603AE8F528CE5ED700C67DD0 /* Build configuration list for PBXNativeTarget "QS{{cookiecutter.short_name}} Unit Tests" */;
+			buildConfigurationList = 603AE8F528CE5ED700C67DD0 /* Build configuration list for PBXNativeTarget "{{cookiecutter.plugin_name}} Unit Tests" */;
 			buildPhases = (
 				603AE8EB28CE5ED700C67DD0 /* Sources */,
 				603AE8EC28CE5ED700C67DD0 /* Frameworks */,
@@ -164,14 +164,14 @@
 			dependencies = (
 				603AE8F828CE601500C67DD0 /* PBXTargetDependency */,
 			);
-			name = "QS{{cookiecutter.short_name}} Unit Tests";
-			productName = "QS{{cookiecutter.short_name}} Unit Tests";
-			productReference = 603AE8EF28CE5ED700C67DD0 /* QS{{cookiecutter.short_name}} Unit Tests.xctest */;
+			name = "{{cookiecutter.plugin_name}} Unit Tests";
+			productName = "{{cookiecutter.plugin_name}} Unit Tests";
+			productReference = 603AE8EF28CE5ED700C67DD0 /* {{cookiecutter.plugin_name}} Unit Tests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
-		D434B7701FC8FFC7007AF9C3 /* QS{{cookiecutter.short_name}} */ = {
+		D434B7701FC8FFC7007AF9C3 /* {{cookiecutter.plugin_name}} */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = D434B7851FC8FFC7007AF9C3 /* Build configuration list for PBXNativeTarget "QS{{cookiecutter.short_name}}" */;
+			buildConfigurationList = D434B7851FC8FFC7007AF9C3 /* Build configuration list for PBXNativeTarget "{{cookiecutter.plugin_name}}" */;
 			buildPhases = (
 				D434B76C1FC8FFC7007AF9C3 /* ShellScript */,
 				D434B76D1FC8FFC7007AF9C3 /* Sources */,
@@ -182,9 +182,9 @@
 			);
 			dependencies = (
 			);
-			name = QS{{cookiecutter.short_name}};
-			productName = QS{{cookiecutter.short_name}};
-			productReference = D434B7711FC8FFC7007AF9C3 /* QS{{cookiecutter.short_name}}.qsplugin */;
+			name = {{cookiecutter.plugin_name}};
+			productName = {{cookiecutter.plugin_name}};
+			productReference = D434B7711FC8FFC7007AF9C3 /* {{cookiecutter.plugin_name}}.qsplugin */;
 			productType = "com.apple.product-type.bundle";
 		};
 /* End PBXNativeTarget section */
@@ -208,7 +208,7 @@
 					};
 				};
 			};
-			buildConfigurationList = D434B76B1FC8FFC7007AF9C3 /* Build configuration list for PBXProject "QS{{cookiecutter.short_name}}" */;
+			buildConfigurationList = D434B76B1FC8FFC7007AF9C3 /* Build configuration list for PBXProject "{{cookiecutter.plugin_name}}" */;
 			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -220,8 +220,8 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				D434B7701FC8FFC7007AF9C3 /* QS{{cookiecutter.short_name}} */,
-				603AE8EE28CE5ED700C67DD0 /* QS{{cookiecutter.short_name}} Unit Tests */,
+				D434B7701FC8FFC7007AF9C3 /* {{cookiecutter.plugin_name}} */,
+				603AE8EE28CE5ED700C67DD0 /* {{cookiecutter.plugin_name}} Unit Tests */,
 			);
 		};
 /* End PBXProject section */
@@ -264,8 +264,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				603AE8F228CE5ED700C67DD0 /* QS{{cookiecutter.short_name}}_Unit_Tests.swift in Sources */,
-				60E5BA1E28CE80950006B489 /* QS{{cookiecutter.short_name}}.swift in Sources */,
+				603AE8F228CE5ED700C67DD0 /* {{cookiecutter.plugin_name}}_Unit_Tests.swift in Sources */,
+				60E5BA1E28CE80950006B489 /* {{cookiecutter.plugin_name}}.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -273,9 +273,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				609B1FC827F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Action.m in Sources */,
-				609B1FC727F3C4E00048FFEB /* QS{{cookiecutter.short_name}}Source.m in Sources */,
-				608539A227D15DA2004EE149 /* QS{{cookiecutter.short_name}}.swift in Sources */,
+				609B1FC827F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Action.m in Sources */,
+				609B1FC727F3C4E00048FFEB /* {{cookiecutter.plugin_name}}Source.m in Sources */,
+				608539A227D15DA2004EE149 /* {{cookiecutter.plugin_name}}.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -284,7 +284,7 @@
 /* Begin PBXTargetDependency section */
 		603AE8F828CE601500C67DD0 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = D434B7701FC8FFC7007AF9C3 /* QS{{cookiecutter.short_name}} */;
+			target = D434B7701FC8FFC7007AF9C3 /* {{cookiecutter.plugin_name}} */;
 			targetProxy = 603AE8F728CE601500C67DD0 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
@@ -294,7 +294,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/QS{{cookiecutter.short_name}}.qsplugin/Contents/MacOS/QS{{cookiecutter.short_name}}";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -349,12 +348,12 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.blacktree.QS{{cookiecutter.short_name}}.QS{{cookiecutter.short_name}}-Unit-Tests";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.blacktree.{{cookiecutter.plugin_name}}.{{cookiecutter.plugin_name}}-Unit-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_EMIT_LOC_STRINGS = NO;
-				SWIFT_OBJC_BRIDGING_HEADER = "QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 			};
@@ -411,11 +410,11 @@
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.blacktree.QS{{cookiecutter.short_name}}.QS{{cookiecutter.short_name}}-Unit-Tests";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.blacktree.{{cookiecutter.plugin_name}}.{{cookiecutter.plugin_name}}-Unit-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 				SWIFT_EMIT_LOC_STRINGS = NO;
-				SWIFT_OBJC_BRIDGING_HEADER = "QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
 			};
@@ -445,11 +444,11 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_TESTABILITY = YES;
-				INFOPLIST_FILE = "$(SRCROOT)/QS{{cookiecutter.short_name}}/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/{{cookiecutter.plugin_name}}/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
@@ -461,11 +460,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
-				INFOPLIST_FILE = "$(SRCROOT)/QS{{cookiecutter.short_name}}/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/{{cookiecutter.plugin_name}}/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_OBJC_BRIDGING_HEADER = "QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
@@ -473,7 +472,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		603AE8F528CE5ED700C67DD0 /* Build configuration list for PBXNativeTarget "QS{{cookiecutter.short_name}} Unit Tests" */ = {
+		603AE8F528CE5ED700C67DD0 /* Build configuration list for PBXNativeTarget "{{cookiecutter.plugin_name}} Unit Tests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				603AE8F328CE5ED700C67DD0 /* Debug */,
@@ -482,7 +481,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D434B76B1FC8FFC7007AF9C3 /* Build configuration list for PBXProject "QS{{cookiecutter.short_name}}" */ = {
+		D434B76B1FC8FFC7007AF9C3 /* Build configuration list for PBXProject "{{cookiecutter.plugin_name}}" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D434B7831FC8FFC7007AF9C3 /* Debug */,
@@ -491,7 +490,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		D434B7851FC8FFC7007AF9C3 /* Build configuration list for PBXNativeTarget "QS{{cookiecutter.short_name}}" */ = {
+		D434B7851FC8FFC7007AF9C3 /* Build configuration list for PBXNativeTarget "{{cookiecutter.plugin_name}}" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D434B7861FC8FFC7007AF9C3 /* Debug */,
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.xcodeproj/xcshareddata/xcschemes/QS{{cookiecutter.short_name}}.xcscheme b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.xcodeproj/xcshareddata/xcschemes/{{cookiecutter.plugin_name}}.xcscheme
similarity index 81%
rename from {{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.xcodeproj/xcshareddata/xcschemes/QS{{cookiecutter.short_name}}.xcscheme
rename to {{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.xcodeproj/xcshareddata/xcschemes/{{cookiecutter.plugin_name}}.xcscheme
index 3925e64..c1ba30d 100644
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.xcodeproj/xcshareddata/xcschemes/QS{{cookiecutter.short_name}}.xcscheme
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.xcodeproj/xcshareddata/xcschemes/{{cookiecutter.plugin_name}}.xcscheme
@@ -15,9 +15,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D434B7701FC8FFC7007AF9C3"
-               BuildableName = "QS{{cookiecutter.short_name}}.qsplugin"
-               BlueprintName = "QS{{cookiecutter.short_name}}"
-               ReferencedContainer = "container:QS{{cookiecutter.short_name}}.xcodeproj">
+               BuildableName = "{{cookiecutter.plugin_name}}.qsplugin"
+               BlueprintName = "{{cookiecutter.plugin_name}}"
+               ReferencedContainer = "container:{{cookiecutter.plugin_name}}.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -29,7 +29,7 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:QS{{cookiecutter.short_name}}.xctestplan"
+            reference = "container:{{cookiecutter.plugin_name}}.xctestplan"
             default = "YES">
          </TestPlanReference>
       </TestPlans>
@@ -59,9 +59,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D434B7701FC8FFC7007AF9C3"
-            BuildableName = "QS{{cookiecutter.short_name}}.qsplugin"
-            BlueprintName = "QS{{cookiecutter.short_name}}"
-            ReferencedContainer = "container:QS{{cookiecutter.short_name}}.xcodeproj">
+            BuildableName = "{{cookiecutter.plugin_name}}.qsplugin"
+            BlueprintName = "{{cookiecutter.plugin_name}}"
+            ReferencedContainer = "container:{{cookiecutter.plugin_name}}.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.xctestplan b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.xctestplan
similarity index 69%
rename from {{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.xctestplan
rename to {{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.xctestplan
index 73e6a71..b1fdcce 100644
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.xctestplan
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.xctestplan
@@ -14,9 +14,9 @@
   "testTargets" : [
     {
       "target" : {
-        "containerPath" : "container:QS{{cookiecutter.short_name}}.xcodeproj",
+        "containerPath" : "container:{{cookiecutter.plugin_name}}.xcodeproj",
         "identifier" : "603AE8EE28CE5ED700C67DD0",
-        "name" : "QS{{cookiecutter.short_name}} Unit Tests"
+        "name" : "{{cookiecutter.plugin_name}} Unit Tests"
       }
     }
   ],
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/Info.plist b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/Info.plist
similarity index 76%
rename from {{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/Info.plist
rename to {{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/Info.plist
index a46ffd5..9420971 100644
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/Info.plist
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.qsapp.{{cookiecutter.short_name}}Plugin</string>
+	<string>com.qsapp.{{cookiecutter.plugin_name}}Plugin</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,20 +17,20 @@
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFBundleDisplayName</key>
-	<string>{{cookiecutter.short_name}} Plugin</string>
+	<string>{{cookiecutter.plugin_name}} Plugin</string>
 	<key>QSActions</key>
 	<dict>
 		<key>DoSomethingAction</key>
 		<dict>
 			<key>actionClass</key>
-			<string>QS{{cookiecutter.short_name}}Action</string>
+			<string>{{cookiecutter.plugin_name}}Action</string>
 			<key>actionSelector</key>
 			<string>performActionOnObject:</string>
 			<key>commandFormat</key>
 			<string>Do something to %@</string>
 			<key>directTypes</key>
 			<array>
-				<string>QS{{cookiecutter.short_name}}Type</string>
+				<string>{{cookiecutter.plugin_name}}Type</string>
 				<string>NSStringPboardType</string>
 			</array>
 			<key>displaysResult</key>
@@ -45,14 +45,14 @@
 		<key>DoSomethingUsingAction</key>
 		<dict>
 			<key>actionClass</key>
-			<string>QS{{cookiecutter.short_name}}Action</string>
+			<string>{{cookiecutter.plugin_name}}Action</string>
 			<key>actionSelector</key>
 			<string>performActionOnObject:using:</string>
 			<key>commandFormat</key>
 			<string>Do something to %@ using %@</string>
 			<key>directTypes</key>
 			<array>
-				<string>QS{{cookiecutter.short_name}}Type</string>
+				<string>{{cookiecutter.plugin_name}}Type</string>
 				<string>NSStringPboardType</string>
 			</array>
 			<key>displaysResult</key>
@@ -63,7 +63,7 @@
 			<false/>
 			<key>indirectTypes</key>
 			<array>
-				<string>QS{{cookiecutter.short_name}}Type</string>
+				<string>{{cookiecutter.plugin_name}}Type</string>
 				<string>NSStringPboardType</string>
 			</array>
 			<key>name</key>
@@ -74,14 +74,14 @@
 		<key>DoSomethingInSwiftAction</key>
 		<dict>
 			<key>actionClass</key>
-			<string>QS{{cookiecutter.short_name}}.QS{{cookiecutter.short_name}}SwiftAction</string>
+			<string>{{cookiecutter.plugin_name}}.{{cookiecutter.plugin_name}}SwiftAction</string>
 			<key>actionSelector</key>
 			<string>performSwiftActionOnObject:</string>
 			<key>commandFormat</key>
 			<string>Do Something in Swift to %@</string>
 			<key>directTypes</key>
 			<array>
-				<string>QS{{cookiecutter.short_name}}Type</string>
+				<string>{{cookiecutter.plugin_name}}Type</string>
 				<string>NSStringPboardType</string>
 			</array>
 			<key>displaysResult</key>
@@ -96,14 +96,14 @@
 		<key>DoSomethingInSwiftUsingAction</key>
 		<dict>
 			<key>actionClass</key>
-			<string>QS{{cookiecutter.short_name}}.QS{{cookiecutter.short_name}}SwiftAction</string>
+			<string>{{cookiecutter.plugin_name}}.{{cookiecutter.plugin_name}}SwiftAction</string>
 			<key>actionSelector</key>
 			<string>performSwiftActionOnObject:using:</string>
 			<key>commandFormat</key>
 			<string>Do something in Swift to %@ using %@</string>
 			<key>directTypes</key>
 			<array>
-				<string>QS{{cookiecutter.short_name}}Type</string>
+				<string>{{cookiecutter.plugin_name}}Type</string>
 				<string>NSStringPboardType</string>
 			</array>
 			<key>displaysResult</key>
@@ -114,7 +114,7 @@
 			<false/>
 			<key>indirectTypes</key>
 			<array>
-				<string>QS{{cookiecutter.short_name}}Type</string>
+				<string>{{cookiecutter.plugin_name}}Type</string>
 				<string>NSStringPboardType</string>
 			</array>
 			<key>name</key>
@@ -125,14 +125,14 @@
 		<key>DoSomethingInSwiftFromObjCAction</key>
 		<dict>
 			<key>actionClass</key>
-			<string>QS{{cookiecutter.short_name}}.QS{{cookiecutter.short_name}}SwiftAction</string>
+			<string>{{cookiecutter.plugin_name}}.{{cookiecutter.plugin_name}}SwiftAction</string>
 			<key>actionSelector</key>
 			<string>performSwiftActionFromObjC:</string>
 			<key>commandFormat</key>
 			<string>Do Something in Swift from ObjC to %@</string>
 			<key>directTypes</key>
 			<array>
-				<string>QS{{cookiecutter.short_name}}Type</string>
+				<string>{{cookiecutter.plugin_name}}Type</string>
 				<string>NSStringPboardType</string>
 			</array>
 			<key>displaysResult</key>
@@ -147,14 +147,14 @@
 		<key>DoSomethingInSwiftFromObjCUsingAction</key>
 		<dict>
 			<key>actionClass</key>
-			<string>QS{{cookiecutter.short_name}}.QS{{cookiecutter.short_name}}SwiftAction</string>
+			<string>{{cookiecutter.plugin_name}}.{{cookiecutter.plugin_name}}SwiftAction</string>
 			<key>actionSelector</key>
 			<string>performSwiftActionFromObjC:using:</string>
 			<key>commandFormat</key>
 			<string>Do something in Swift from ObjC to %@ using %@</string>
 			<key>directTypes</key>
 			<array>
-				<string>QS{{cookiecutter.short_name}}Type</string>
+				<string>{{cookiecutter.plugin_name}}Type</string>
 				<string>NSStringPboardType</string>
 			</array>
 			<key>displaysResult</key>
@@ -165,7 +165,7 @@
 			<false/>
 			<key>indirectTypes</key>
 			<array>
-				<string>QS{{cookiecutter.short_name}}Type</string>
+				<string>{{cookiecutter.plugin_name}}Type</string>
 				<string>NSStringPboardType</string>
 			</array>
 			<key>name</key>
@@ -176,7 +176,7 @@
 	</dict>
 	<key>QSDefaultsTemplate</key>
 	<dict>
-		<key>{{cookiecutter.short_name}}EnableFeature</key>
+		<key>{{cookiecutter.plugin_name}}EnableFeature</key>
 		<true/>
 	</dict>
 	<key>QSPlugIn</key>
@@ -190,9 +190,9 @@
 		<key>description</key>
 		<string>{{cookiecutter.description}}</string>
 		<key>extendedDescription</key>
-		<string>&lt;h1&gt;{{cookiecutter.short_name}}&lt;/h1&gt;
+		<string>&lt;h1&gt;{{cookiecutter.plugin_name}}&lt;/h1&gt;
 &lt;h2&gt;{{cookiecutter.description}}&lt;/h2&gt;
-&lt;p&gt;Documentation for {{cookiecutter.short_name}}&lt;/p&gt;</string>
+&lt;p&gt;Documentation for {{cookiecutter.plugin_name}}&lt;/p&gt;</string>
 		<key>icon</key>
 		<string>QSPlugIn</string>
 	</dict>
@@ -213,7 +213,7 @@
 				<string>/path/to/data</string>
 			</dict>
 			<key>source</key>
-			<string>QS{{cookiecutter.short_name}}Source</string>
+			<string>{{cookiecutter.plugin_name}}Source</string>
 		</dict>
 		<dict>
 			<key>ID</key>
@@ -230,34 +230,34 @@
 				<string>/path/to/data</string>
 			</dict>
 			<key>source</key>
-			<string>QS{{cookiecutter.short_name}}.QS{{cookiecutter.short_name}}SwiftSource</string>
+			<string>{{cookiecutter.plugin_name}}.{{cookiecutter.plugin_name}}SwiftSource</string>
 		</dict>
 	</array>
 	<key>QSRegistration</key>
 	<dict>
 		<key>QSActionProviders</key>
 		<dict>
-			<key>QS{{cookiecutter.short_name}}Action</key>
-			<string>QS{{cookiecutter.short_name}}Action</string>
+			<key>{{cookiecutter.plugin_name}}Action</key>
+			<string>{{cookiecutter.plugin_name}}Action</string>
 		</dict>
 		<key>QSObjectHandlers</key>
 		<dict>
-			<key>QS{{cookiecutter.short_name}}Type</key>
-			<string>QS{{cookiecutter.short_name}}Source</string>
+			<key>{{cookiecutter.plugin_name}}Type</key>
+			<string>{{cookiecutter.plugin_name}}Source</string>
 		</dict>
 		<key>QSObjectSources</key>
 		<dict>
-			<key>QS{{cookiecutter.short_name}}Source</key>
-			<string>QS{{cookiecutter.short_name}}Source</string>
+			<key>{{cookiecutter.plugin_name}}Source</key>
+			<string>{{cookiecutter.plugin_name}}Source</string>
 		</dict>
 		<key>QSTypeDefinitions</key>
 		<dict>
-			<key>QS{{cookiecutter.short_name}}Type</key>
+			<key>{{cookiecutter.plugin_name}}Type</key>
 			<dict>
 				<key>icon</key>
 				<string>GenericDocumentIcon</string>
 				<key>name</key>
-				<string>{{cookiecutter.short_name}} Objects</string>
+				<string>{{cookiecutter.plugin_name}} Objects</string>
 			</dict>
 		</dict>
 	</dict>
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}-Bridging-Header.h b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}-Bridging-Header.h
similarity index 75%
rename from {{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}-Bridging-Header.h
rename to {{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}-Bridging-Header.h
index ecb3947..b7ad6e9 100644
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}-Bridging-Header.h
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}-Bridging-Header.h
@@ -2,5 +2,5 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#import "QS{{cookiecutter.short_name}}.h"
+#import "{{cookiecutter.plugin_name}}.h"
 #import "Quicksilver.pch"
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.h b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.h
similarity index 53%
rename from {{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.h
rename to {{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.h
index 50af0a1..e295089 100644
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.h
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.h
@@ -1,6 +1,6 @@
 //
-//  {{cookiecutter.short_name}}Source.h
-//  {{cookiecutter.short_name}}
+//  {{cookiecutter.plugin_name}}Source.h
+//  {{cookiecutter.plugin_name}}
 //
 //  Created by {{cookiecutter.author}}
 //
@@ -11,4 +11,4 @@
 */
 
 // QSObject types for this plug-in
-#define QS{{cookiecutter.short_name}}Type @"QS{{cookiecutter.short_name}}Type"
+#define {{cookiecutter.plugin_name}}Type @"{{cookiecutter.plugin_name}}Type"
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.swift b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.swift
similarity index 80%
rename from {{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.swift
rename to {{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.swift
index c0c44f1..c0b645b 100644
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}.swift
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}.swift
@@ -1,11 +1,11 @@
-//  QS{{cookiecutter.short_name}}.swift
-//  QS{{cookiecutter.short_name}}
+//  {{cookiecutter.plugin_name}}.swift
+//  {{cookiecutter.plugin_name}}
 //
 //  Created by {{cookiecutter.author}}
 
 //
-//  QS{{cookiecutter.short_name}}.swift
-//  QS{{cookiecutter.short_name}}
+//  {{cookiecutter.plugin_name}}.swift
+//  {{cookiecutter.plugin_name}}
 //
 //  Created by Nathan Henrie on 2022-03-03.
 //  Copyright © 2022 Quicksilver. All rights reserved.
@@ -14,7 +14,7 @@
 //import Foundation
 //import Cocoa
 
-class QS{{cookiecutter.short_name}}SwiftAction : QSActionProvider {
+class {{cookiecutter.plugin_name}}SwiftAction : QSActionProvider {
     @objc func performSwiftActionOnObject(_ dObject: QSObject) -> QSObject {
         print("Performing a Swift action with direct obj only")
         return QSObject(string: "here it comes!")
@@ -25,14 +25,14 @@ class QS{{cookiecutter.short_name}}SwiftAction : QSActionProvider {
         return QSObject(string: "there it went!")
     }
 
-    // Please see the below method in QS{{cookiecutter.short_name}}Action.m
+    // Please see the below method in {{cookiecutter.plugin_name}}Action.m
     // - (QSObject *)performActionInSwiftFromObjC:(QSObject *)dObject
     @objc func performSwiftActionFromObjC(_ dObject: QSObject) -> QSObject {
         print("Performing a Swift action from ObjC with direct obj only")
         return QSObject(string: "here it comes!")
     }
 
-    // Please see the below method in QS{{cookiecutter.short_name}}Action.m
+    // Please see the below method in {{cookiecutter.plugin_name}}Action.m
     // - (QSObject *)performActionInSwiftFromObjC:(QSObject *)dObject using:(QSObject *)iObject
     @objc func performSwiftActionFromObjC(_ dObject: QSObject, using iObject: QSObject) -> QSObject {
         print("Performing a Swift action from ObjC with direct and indirect objects")
@@ -60,8 +60,8 @@ class QS{{cookiecutter.short_name}}SwiftAction : QSActionProvider {
     }
 }
 
-    // Please see the below method in QS{{cookiecutter.short_name}}Action.m
-class QS{{cookiecutter.short_name}}SwiftSource : QSObjectSource {
+    // Please see the below method in {{cookiecutter.plugin_name}}Action.m
+class {{cookiecutter.plugin_name}}SwiftSource : QSObjectSource {
 //    - (BOOL)indexIsValidFromDate:(NSDate *)indexDate forEntry:(NSDictionary *)theEntry
     @objc func indexIsValidFromDate(_ indexDate: NSDate, forEntry theEntry: NSDictionary) -> Bool {
         print("checking that index");
@@ -74,7 +74,7 @@ class QS{{cookiecutter.short_name}}SwiftSource : QSObjectSource {
     @objc func objectsForEntry(_ theEntry: NSDictionary) -> [QSObject] {
         print("here sourcing stuff");
 
-        let newObject = QSObject(type: "QS{{cookiecutter.short_name}}Type", value: "this is my value!", name: "Test {{cookiecutter.short_name}} Swifty Object")!
+        let newObject = QSObject(type: "{{cookiecutter.plugin_name}}Type", value: "this is my value!", name: "Test {{cookiecutter.plugin_name}} Swifty Object")!
         return [newObject]
     }
 
@@ -88,7 +88,7 @@ class QS{{cookiecutter.short_name}}SwiftSource : QSObjectSource {
      // a nicer or more "correct" icon that takes a while to create or obtain
      - (BOOL)loadIconForObject:(QSObject *)object
      {
-     id data=[object objectForType:QS{{cookiecutter.short_name}}Type];
+     id data=[object objectForType:{{cookiecutter.plugin_name}}Type];
      [object setIcon:nil];
      return YES;
      }
diff --git a/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Action.h b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Action.h
new file mode 100644
index 0000000..9e2cce0
--- /dev/null
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Action.h
@@ -0,0 +1,11 @@
+//
+//  {{cookiecutter.plugin_name}}Action.h
+//  {{cookiecutter.plugin_name}}
+//
+//  Created by {{cookiecutter.author}}
+//
+
+@interface {{cookiecutter.plugin_name}}Action : QSActionProvider
+{
+}
+@end
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Action.m b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Action.m
similarity index 66%
rename from {{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Action.m
rename to {{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Action.m
index c217d74..d446d0d 100644
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Action.m
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Action.m
@@ -1,15 +1,15 @@
 //
-//  {{cookiecutter.short_name}} Plug-in
-//  QS{{cookiecutter.short_name}}Action.m
+//  {{cookiecutter.plugin_name}} Plug-in
+//  {{cookiecutter.plugin_name}}Action.m
 //
 //  Created by {{cookiecutter.author}}
 //
 
-#import "QS{{cookiecutter.short_name}}.h"
-#import "QS{{cookiecutter.short_name}}Action.h"
-#import <QS{{cookiecutter.short_name}}-Swift.h>
+#import "{{cookiecutter.plugin_name}}.h"
+#import "{{cookiecutter.plugin_name}}Action.h"
+#import <{{cookiecutter.plugin_name}}-Swift.h>
 
-@implementation QS{{cookiecutter.short_name}}Action
+@implementation {{cookiecutter.plugin_name}}Action
 
 #pragma mark Action Methods
 
@@ -25,19 +25,19 @@ - (QSObject *)performActionOnObject:(QSObject *)dObject using:(QSObject *)iObjec
 	return nil;
 }
 
-// Call a method defined in QS{{cookiecutter.short_name}}.swift
+// Call a method defined in {{cookiecutter.plugin_name}}.swift
 // Please remove this method if not using Swift!
 - (QSObject *)performActionInSwiftFromObjC:(QSObject *)dObject
 {
-  QS{{cookiecutter.short_name}}SwiftAction* plugin = [[QS{{cookiecutter.short_name}}SwiftAction alloc]init];
+  {{cookiecutter.plugin_name}}SwiftAction* plugin = [[{{cookiecutter.plugin_name}}SwiftAction alloc]init];
   return [plugin performSwiftActionFromObjC:dObject];
 }
 
-// Call a method defined in QS{{cookiecutter.short_name}}.swift also using the third pane
+// Call a method defined in {{cookiecutter.plugin_name}}.swift also using the third pane
 // Please remove this method if not using Swift!
 - (QSObject *)performActionInSwiftFromObjC:(QSObject *)dObject using:(QSObject *)iObject
 {
-  QS{{cookiecutter.short_name}}SwiftAction* plugin = [[QS{{cookiecutter.short_name}}SwiftAction alloc]init];
+  {{cookiecutter.plugin_name}}SwiftAction* plugin = [[{{cookiecutter.plugin_name}}SwiftAction alloc]init];
   return [plugin performSwiftActionFromObjC:dObject using:iObject];
 }
 
diff --git a/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Source.h b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Source.h
new file mode 100644
index 0000000..fb4fb19
--- /dev/null
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Source.h
@@ -0,0 +1,11 @@
+//
+//  {{cookiecutter.plugin_name}}Source.h
+//  {{cookiecutter.plugin_name}}
+//
+//  Created by {{cookiecutter.author}}
+//
+
+@interface {{cookiecutter.plugin_name}}Source : QSObjectSource
+{
+}
+@end
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Source.m b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Source.m
similarity index 62%
rename from {{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Source.m
rename to {{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Source.m
index 70674f3..b5aab2b 100644
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Source.m
+++ b/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}/{{cookiecutter.plugin_name}}Source.m
@@ -1,14 +1,14 @@
 //
-//  {{cookiecutter.short_name}} Plug-in
-//  QS{{cookiecutter.short_name}}Source.m
+//  {{cookiecutter.plugin_name}} Plug-in
+//  {{cookiecutter.plugin_name}}Source.m
 //
 //  Created by {{cookiecutter.author}}
 //
 
-#import "QS{{cookiecutter.short_name}}.h"
-#import "QS{{cookiecutter.short_name}}Source.h"
+#import "{{cookiecutter.plugin_name}}.h"
+#import "{{cookiecutter.plugin_name}}Source.h"
 
-@implementation QS{{cookiecutter.short_name}}Source
+@implementation {{cookiecutter.plugin_name}}Source
 
 #pragma mark Catalog Entry Methods
 
@@ -26,10 +26,10 @@ - (NSArray *) objectsForEntry:(NSDictionary *)theEntry
 	NSMutableArray *objects=[NSMutableArray arrayWithCapacity:1];
 	QSObject *newObject;
 	
-	newObject = [QSObject makeObjectWithIdentifier:@"QS{{cookiecutter.short_name}}Test"];
-	[newObject setName:@"Test {{cookiecutter.short_name}} Object"];
-	[newObject setObject:@"data" forType:QS{{cookiecutter.short_name}}Type];
-	[newObject setPrimaryType:QS{{cookiecutter.short_name}}Type];
+	newObject = [QSObject makeObjectWithIdentifier:@"{{cookiecutter.plugin_name}}Test"];
+	[newObject setName:@"Test {{cookiecutter.plugin_name}} Object"];
+	[newObject setObject:@"data" forType:{{cookiecutter.plugin_name}}Type];
+	[newObject setPrimaryType:{{cookiecutter.plugin_name}}Type];
 	[objects addObject:newObject];
 
 	return objects;
@@ -47,7 +47,7 @@ - (void)setQuickIconForObject:(QSObject *)object
 // a nicer or more "correct" icon that takes a while to create or obtain
 - (BOOL)loadIconForObject:(QSObject *)object
 {
-	id data=[object objectForType:QS{{cookiecutter.short_name}}Type];
+	id data=[object objectForType:{{cookiecutter.plugin_name}}Type];
 	[object setIcon:nil];
 	return YES;
 }
diff --git a/{{cookiecutter.short_name}}/Documentation.mdown b/{{cookiecutter.short_name}}/Documentation.mdown
deleted file mode 100644
index 0765467..0000000
--- a/{{cookiecutter.short_name}}/Documentation.mdown
+++ /dev/null
@@ -1,5 +0,0 @@
-# {{cookiecutter.short_name}} #
-
-## {{cookiecutter.description}} ##
-
-Documentation for {{cookiecutter.short_name}}
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Action.h b/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Action.h
deleted file mode 100644
index ca48aec..0000000
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Action.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-//  QS{{cookiecutter.short_name}}Action.h
-//  {{cookiecutter.short_name}}
-//
-//  Created by {{cookiecutter.author}}
-//
-
-@interface QS{{cookiecutter.short_name}}Action : QSActionProvider
-{
-}
-@end
diff --git a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Source.h b/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Source.h
deleted file mode 100644
index c69a01f..0000000
--- a/{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}/QS{{cookiecutter.short_name}}Source.h
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-//  QS{{cookiecutter.short_name}}Source.h
-//  {{cookiecutter.short_name}}
-//
-//  Created by {{cookiecutter.author}}
-//
-
-@interface QS{{cookiecutter.short_name}}Source : QSObjectSource
-{
-}
-@end