diff --git a/ui/index.jsp b/ui/index.jsp
index c9564c2590a..6230aa8daae 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -22,8 +22,8 @@ long milliseconds = new Date().getTime();
     <link rel="stylesheet" href="css/main.css" type="text/css" />
 
 	<!-- Common libraries -->
-    <script type="text/javascript" src="scripts/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" src="scripts/jquery-ui-1.8.2.custom.min.js"></script>
+    <script type="text/javascript" src="scripts/jquery.min.js"></script>
+    <script type="text/javascript" src="scripts/jquery-ui.custom.min.js"></script>
     <script type="text/javascript" src="scripts/date.js"></script>
     <script type="text/javascript" src="scripts/jquery.cookies.js"></script>
     <script type="text/javascript" src="scripts/jquery.timers.js"></script>
@@ -31,31 +31,31 @@ long milliseconds = new Date().getTime();
 
     <!-- cloud.com scripts -->
     <script type="text/javascript" src="scripts/cloud.logger.js?t=<%=milliseconds%>"></script>
-	<script type="text/javascript" src="scripts/cloud.core2.callbacks.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.js?t=<%=milliseconds%>"></script>
-	<script type="text/javascript" src="scripts/cloud.core2.init.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.instance.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.event.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.alert.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.account.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.volume.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.snapshot.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.ipaddress.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.template.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.iso.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.router.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.dashboard.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.domain.js?t=<%=milliseconds%>"></script>    
-    <script type="text/javascript" src="scripts/cloud.core2.serviceoffering.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.diskoffering.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.globalsetting.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.resource.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.zone.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.pod.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.cluster.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.host.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.primarystorage.js?t=<%=milliseconds%>"></script>
-    <script type="text/javascript" src="scripts/cloud.core2.systemvm.js?t=<%=milliseconds%>"></script>
+	<script type="text/javascript" src="scripts/cloud.core.callbacks.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.js?t=<%=milliseconds%>"></script>
+	<script type="text/javascript" src="scripts/cloud.core.init.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.instance.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.event.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.alert.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.account.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.volume.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.snapshot.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.ipaddress.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.template.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.iso.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.router.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.dashboard.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.domain.js?t=<%=milliseconds%>"></script>    
+    <script type="text/javascript" src="scripts/cloud.core.serviceoffering.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.diskoffering.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.globalsetting.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.resource.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.zone.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.pod.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.cluster.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.host.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.primarystorage.js?t=<%=milliseconds%>"></script>
+    <script type="text/javascript" src="scripts/cloud.core.systemvm.js?t=<%=milliseconds%>"></script>
 	
 	<!-- Favicon -->
 	<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
diff --git a/ui/scripts/cloud.core2.account.js b/ui/scripts/cloud.core.account.js
similarity index 100%
rename from ui/scripts/cloud.core2.account.js
rename to ui/scripts/cloud.core.account.js
diff --git a/ui/scripts/cloud.core2.alert.js b/ui/scripts/cloud.core.alert.js
similarity index 100%
rename from ui/scripts/cloud.core2.alert.js
rename to ui/scripts/cloud.core.alert.js
diff --git a/ui/scripts/cloud.core2.callbacks.js b/ui/scripts/cloud.core.callbacks.js
similarity index 100%
rename from ui/scripts/cloud.core2.callbacks.js
rename to ui/scripts/cloud.core.callbacks.js
diff --git a/ui/scripts/cloud.core2.cluster.js b/ui/scripts/cloud.core.cluster.js
similarity index 100%
rename from ui/scripts/cloud.core2.cluster.js
rename to ui/scripts/cloud.core.cluster.js
diff --git a/ui/scripts/cloud.core2.dashboard.js b/ui/scripts/cloud.core.dashboard.js
similarity index 100%
rename from ui/scripts/cloud.core2.dashboard.js
rename to ui/scripts/cloud.core.dashboard.js
diff --git a/ui/scripts/cloud.core2.diskoffering.js b/ui/scripts/cloud.core.diskoffering.js
similarity index 100%
rename from ui/scripts/cloud.core2.diskoffering.js
rename to ui/scripts/cloud.core.diskoffering.js
diff --git a/ui/scripts/cloud.core2.domain.js b/ui/scripts/cloud.core.domain.js
similarity index 100%
rename from ui/scripts/cloud.core2.domain.js
rename to ui/scripts/cloud.core.domain.js
diff --git a/ui/scripts/cloud.core2.event.js b/ui/scripts/cloud.core.event.js
similarity index 100%
rename from ui/scripts/cloud.core2.event.js
rename to ui/scripts/cloud.core.event.js
diff --git a/ui/scripts/cloud.core2.globalsetting.js b/ui/scripts/cloud.core.globalsetting.js
similarity index 100%
rename from ui/scripts/cloud.core2.globalsetting.js
rename to ui/scripts/cloud.core.globalsetting.js
diff --git a/ui/scripts/cloud.core2.host.js b/ui/scripts/cloud.core.host.js
similarity index 100%
rename from ui/scripts/cloud.core2.host.js
rename to ui/scripts/cloud.core.host.js
diff --git a/ui/scripts/cloud.core2.init.js b/ui/scripts/cloud.core.init.js
similarity index 100%
rename from ui/scripts/cloud.core2.init.js
rename to ui/scripts/cloud.core.init.js
diff --git a/ui/scripts/cloud.core2.instance.js b/ui/scripts/cloud.core.instance.js
similarity index 100%
rename from ui/scripts/cloud.core2.instance.js
rename to ui/scripts/cloud.core.instance.js
diff --git a/ui/scripts/cloud.core2.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
similarity index 100%
rename from ui/scripts/cloud.core2.ipaddress.js
rename to ui/scripts/cloud.core.ipaddress.js
diff --git a/ui/scripts/cloud.core2.iso.js b/ui/scripts/cloud.core.iso.js
similarity index 100%
rename from ui/scripts/cloud.core2.iso.js
rename to ui/scripts/cloud.core.iso.js
diff --git a/ui/scripts/cloud.core2.js b/ui/scripts/cloud.core.js
similarity index 100%
rename from ui/scripts/cloud.core2.js
rename to ui/scripts/cloud.core.js
diff --git a/ui/scripts/cloud.core2.pod.js b/ui/scripts/cloud.core.pod.js
similarity index 100%
rename from ui/scripts/cloud.core2.pod.js
rename to ui/scripts/cloud.core.pod.js
diff --git a/ui/scripts/cloud.core2.primarystorage.js b/ui/scripts/cloud.core.primarystorage.js
similarity index 100%
rename from ui/scripts/cloud.core2.primarystorage.js
rename to ui/scripts/cloud.core.primarystorage.js
diff --git a/ui/scripts/cloud.core2.resource.js b/ui/scripts/cloud.core.resource.js
similarity index 100%
rename from ui/scripts/cloud.core2.resource.js
rename to ui/scripts/cloud.core.resource.js
diff --git a/ui/scripts/cloud.core2.router.js b/ui/scripts/cloud.core.router.js
similarity index 100%
rename from ui/scripts/cloud.core2.router.js
rename to ui/scripts/cloud.core.router.js
diff --git a/ui/scripts/cloud.core2.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js
similarity index 100%
rename from ui/scripts/cloud.core2.serviceoffering.js
rename to ui/scripts/cloud.core.serviceoffering.js
diff --git a/ui/scripts/cloud.core2.snapshot.js b/ui/scripts/cloud.core.snapshot.js
similarity index 100%
rename from ui/scripts/cloud.core2.snapshot.js
rename to ui/scripts/cloud.core.snapshot.js
diff --git a/ui/scripts/cloud.core2.systemvm.js b/ui/scripts/cloud.core.systemvm.js
similarity index 100%
rename from ui/scripts/cloud.core2.systemvm.js
rename to ui/scripts/cloud.core.systemvm.js
diff --git a/ui/scripts/cloud.core2.template.js b/ui/scripts/cloud.core.template.js
similarity index 100%
rename from ui/scripts/cloud.core2.template.js
rename to ui/scripts/cloud.core.template.js
diff --git a/ui/scripts/cloud.core2.volume.js b/ui/scripts/cloud.core.volume.js
similarity index 100%
rename from ui/scripts/cloud.core2.volume.js
rename to ui/scripts/cloud.core.volume.js
diff --git a/ui/scripts/cloud.core2.zone.js b/ui/scripts/cloud.core.zone.js
similarity index 100%
rename from ui/scripts/cloud.core2.zone.js
rename to ui/scripts/cloud.core.zone.js
diff --git a/ui/scripts/jquery-ui-1.8.2.custom.min.js b/ui/scripts/jquery-ui.custom.min.js
similarity index 100%
rename from ui/scripts/jquery-ui-1.8.2.custom.min.js
rename to ui/scripts/jquery-ui.custom.min.js
diff --git a/ui/scripts/jquery-1.4.2.min.js b/ui/scripts/jquery.min.js
similarity index 100%
rename from ui/scripts/jquery-1.4.2.min.js
rename to ui/scripts/jquery.min.js