diff --git a/pom.xml b/pom.xml
index 477f0f2..93408fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>tiny-mfa-plugin</artifactId>
-	<version>1.6</version>
+	<version>1.7</version>
 	<name>tiny-mfa-plugin</name>
 	<dependencies>
 		<dependency>
diff --git a/src/main/import/install/mfa-iiq-objects-import.xml b/src/main/import/install/mfa-iiq-objects-import.xml
index 4f4d623..7ffa02a 100644
--- a/src/main/import/install/mfa-iiq-objects-import.xml
+++ b/src/main/import/install/mfa-iiq-objects-import.xml
@@ -120,10 +120,10 @@ Map response = new HashMap();
 response.put("result", false);
 
 //derive proper classloader via plugins cache
-ClassLoader clsLoader = sailpoint.server.Environment.getEnvironment().getPluginsCache().getClassLoader("tiny-mfa-plugin");
+ClassLoader clsLoader = sailpoint.server.Environment.getEnvironment().getPluginsCache().getClassLoader("tiny_mfa_plugin");
 if(clsLoader != null) {
   try {
-    ClassLoader clsLoader = sailpoint.server.Environment.getEnvironment().getPluginsCache().getClassLoader("tiny-mfa-plugin");
+    ClassLoader clsLoader = sailpoint.server.Environment.getEnvironment().getPluginsCache().getClassLoader("tiny_mfa_plugin");
     System.out.println("setting parameters");
 
     //method has two parameters of type String
diff --git a/src/main/java/de/whisperedshouts/identityiq/rest/TinyMfaService.java b/src/main/java/de/whisperedshouts/identityiq/rest/TinyMfaService.java
index 95afbf1..670f89e 100644
--- a/src/main/java/de/whisperedshouts/identityiq/rest/TinyMfaService.java
+++ b/src/main/java/de/whisperedshouts/identityiq/rest/TinyMfaService.java
@@ -73,7 +73,7 @@ public class TinyMfaService extends BasePluginResource {
 
   @Override
   public String getPluginName() {
-    return "tiny-mfa-plugin";
+    return "tiny_mfa_plugin";
   }
   
   /**
diff --git a/src/main/manifest.xml b/src/main/manifest.xml
index 7a95d53..1906962 100644
--- a/src/main/manifest.xml
+++ b/src/main/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE Plugin PUBLIC "sailpoint.dtd" "sailpoint.dtd">
-<Plugin name="tiny-mfa-plugin" displayName="Tiny MFA Plugin" version="1.6" disabled="false" certificationLevel="None" minSystemVersion="7.1" maxSystemVersion="7.2">
+<Plugin name="tiny_mfa_plugin" displayName="Tiny MFA Plugin" version="1.7" disabled="false" certificationLevel="None" minSystemVersion="7.1" maxSystemVersion="7.3">
   <Attributes>
     <Map>     
       <entry key="minUpgradableVersion" value="1.5"/>     
diff --git a/src/main/ui/js/app.js b/src/main/ui/js/app.js
index 2fe8fcb..89c4a6f 100644
--- a/src/main/ui/js/app.js
+++ b/src/main/ui/js/app.js
@@ -6,22 +6,22 @@
 		$routeProvider
 
 		.when('/', {
-			templateUrl : PluginHelper.getPluginFileUrl('tiny-mfa-plugin', 'ui/partials/home.html'),
+			templateUrl : PluginHelper.getPluginFileUrl('tiny_mfa_plugin', 'ui/partials/home.html'),
 			controller  : 'HomeController'
 		})
 
 		.when('/home', {
-			templateUrl : PluginHelper.getPluginFileUrl('tiny-mfa-plugin', 'ui/partials/home.html'),
+			templateUrl : PluginHelper.getPluginFileUrl('tiny_mfa_plugin', 'ui/partials/home.html'),
 			controller  : 'HomeController'
 		})
 		
 		.when('/qrcode', {
-			templateUrl : PluginHelper.getPluginFileUrl('tiny-mfa-plugin', 'ui/partials/qrcode.html'),
+			templateUrl : PluginHelper.getPluginFileUrl('tiny_mfa_plugin', 'ui/partials/qrcode.html'),
 			controller  : 'QRCodeController'
 		})
 		
 		.when('/validate', {
-			templateUrl : PluginHelper.getPluginFileUrl('tiny-mfa-plugin', 'ui/partials/validate.html'),
+			templateUrl : PluginHelper.getPluginFileUrl('tiny_mfa_plugin', 'ui/partials/validate.html'),
 			controller  : 'ValidateController'
 		})
 
diff --git a/src/main/ui/js/buttonInject.js b/src/main/ui/js/buttonInject.js
index f8e9646..a735670 100644
--- a/src/main/ui/js/buttonInject.js
+++ b/src/main/ui/js/buttonInject.js
@@ -1,5 +1,5 @@
 jQuery(document).ready(function(){
-	var tinyMfaPluginUrl = SailPoint.CONTEXT_PATH + '/plugins/pluginPage.jsf?pn=tiny-mfa-plugin';
+	var tinyMfaPluginUrl = SailPoint.CONTEXT_PATH + '/plugins/pluginPage.jsf?pn=tiny_mfa_plugin';
 	jQuery("ul.navbar-right li:first")
         .before(
             '<li class="dropdown">' +
diff --git a/src/main/ui/page.xhtml b/src/main/ui/page.xhtml
index ee9923d..3da95f5 100755
--- a/src/main/ui/page.xhtml
+++ b/src/main/ui/page.xhtml
@@ -8,10 +8,10 @@
     	<meta name="description" content="Tiny MFA Plugin Page" />
     	<meta name="author" content="Mario Enrico Ragucci" />
     	<!-- Libraries -->
-    	<script type="text/javascript" src="#{plugins.requestContextPath}/plugin/tiny-mfa-plugin/ui/js/lib/angular.min.js"></script>  
-    	<script type="text/javascript" src="#{plugins.requestContextPath}/plugin/tiny-mfa-plugin/ui/js/lib/angular-route.min.js"></script>
-      <script type="text/javascript" src="#{plugins.requestContextPath}/plugin/tiny-mfa-plugin/ui/js/lib/kjua.min.js"></script>
-    	<link rel="stylesheet" type="text/css" href="#{plugins.requestContextPath}/plugin/tiny-mfa-plugin/ui/css/app.css"></link>
+    	<script type="text/javascript" src="#{plugins.requestContextPath}/plugin/tiny_mfa_plugin/ui/js/lib/angular.min.js"></script>  
+    	<script type="text/javascript" src="#{plugins.requestContextPath}/plugin/tiny_mfa_plugin/ui/js/lib/angular-route.min.js"></script>
+      <script type="text/javascript" src="#{plugins.requestContextPath}/plugin/tiny_mfa_plugin/ui/js/lib/kjua.min.js"></script>
+    	<link rel="stylesheet" type="text/css" href="#{plugins.requestContextPath}/plugin/tiny_mfa_plugin/ui/css/app.css"></link>
 	</head>
 
 	<body>
@@ -19,8 +19,8 @@
 		  <div class="row content">
 		    <div class="col-sm-9">
 		      <div data-ng-view=""></div>		
-		    	<script src="#{plugins.requestContextPath}/plugin/tiny-mfa-plugin/ui/js/app.js"></script>
-		    	<script src="#{plugins.requestContextPath}/plugin/tiny-mfa-plugin/ui/js/controllers.js"></script>
+		    	<script src="#{plugins.requestContextPath}/plugin/tiny_mfa_plugin/ui/js/app.js"></script>
+		    	<script src="#{plugins.requestContextPath}/plugin/tiny_mfa_plugin/ui/js/controllers.js"></script>
 		    </div>
 		  </div>
 		</div>