diff --git a/example_templates/CFBundleVersionExtensionAttribute.xml b/example_templates/ExtensionAttribute-CFBundleVersion.xml
similarity index 93%
rename from example_templates/CFBundleVersionExtensionAttribute.xml
rename to example_templates/ExtensionAttribute-CFBundleVersion.xml
index 05e38cd..bb49ba0 100755
--- a/example_templates/CFBundleVersionExtensionAttribute.xml
+++ b/example_templates/ExtensionAttribute-CFBundleVersion.xml
@@ -6,10 +6,12 @@
         <type>script</type>
         <platform>Mac</platform>
         <script>#!/bin/bash
+
 CFBundleVersion=$(defaults read /Applications/"%NAME%.app"/Contents/Info.plist CFBundleVersion)
+
 echo "&lt;result&gt;$CFBundleVersion&lt;/result&gt;"
 exit 0</script>
     </input_type>
     <inventory_display>Extension Attributes</inventory_display>
     <recon_display>Extension Attributes</recon_display>
-</computer_extension_attribute>
\ No newline at end of file
+</computer_extension_attribute>
diff --git a/example_templates/ExtensionAttribute.xml b/example_templates/ExtensionAttribute.xml
index 440c710..ebd3ade 100644
--- a/example_templates/ExtensionAttribute.xml
+++ b/example_templates/ExtensionAttribute.xml
@@ -5,13 +5,15 @@
     <input_type>
         <type>script</type>
         <platform>Mac</platform>
-        <script>#!/usr/bin/python
+        <script>#!/bin/bash
 
 # Do some stuff
+result="True"
 
 # Don't forget to encode reserved characters
-print '&lt;result&gt;%s&lt;/result&gt;' % 'True'</script>
+echo "&lt;result&gt;$result&lt;/result&gt;"
+exit 0</script>
     </input_type>
     <inventory_display>Extension Attributes</inventory_display>
     <recon_display>Extension Attributes</recon_display>
-</computer_extension_attribute>
\ No newline at end of file
+</computer_extension_attribute>
diff --git a/example_templates/PolicyTemplate.xml b/example_templates/PolicyTemplate.xml
index d5f18f7..1df6696 100755
--- a/example_templates/PolicyTemplate.xml
+++ b/example_templates/PolicyTemplate.xml
@@ -2,8 +2,8 @@
     <general>
         <!-- Enable ID or Name for a Site-based Policy
         <site>
-            <id>%SITE_ID%</id>
-            <name>%SITE_NAME%</name>
+            <id>%site_id%</id>
+            <name>%site_name%</name>
         </site> -->
         <name>Install Latest %PROD_NAME%</name>
         <enabled>true</enabled>
@@ -25,6 +25,8 @@
         <!--Icons added by JSSImporter-->
         <use_for_self_service>true</use_for_self_service>
         <install_button_text>Install %VERSION%</install_button_text>
+        <reinstall_button_text>Install %VERSION%</reinstall_button_text>
+        <self_service_display_name>Install Latest %PROD_NAME%</self_service_display_name>
         <self_service_description>%SELF_SERVICE_DESCRIPTION%</self_service_description>
     </self_service>
     <maintenance>
diff --git a/example_templates/CFBundleVersionSmartGroupTemplate.xml b/example_templates/SmartGroupTemplate-CFBundleVersion.xml
similarity index 100%
rename from example_templates/CFBundleVersionSmartGroupTemplate.xml
rename to example_templates/SmartGroupTemplate-CFBundleVersion.xml