diff --git a/src/com/hannonhill/umt/service/Migrator.java b/src/com/hannonhill/umt/service/Migrator.java
index 2a330c6..c5e2ff2 100644
--- a/src/com/hannonhill/umt/service/Migrator.java
+++ b/src/com/hannonhill/umt/service/Migrator.java
@@ -25,7 +25,7 @@ public class Migrator
 {
 
     /**
-     * Re-edits each page to align the links to make them tracked by Cascade Server
+     * Re-edits each page to align the links to make them tracked by Cascade CMS
      */
     public static void alignLinks(ProjectInformation projectInformation)
     {
diff --git a/src/com/hannonhill/umt/service/RestApi.java b/src/com/hannonhill/umt/service/RestApi.java
index c3d1db5..cf1259f 100644
--- a/src/com/hannonhill/umt/service/RestApi.java
+++ b/src/com/hannonhill/umt/service/RestApi.java
@@ -96,7 +96,7 @@ public static List<String> getSiteNames(String cascadeUrl, String username, Stri
     }
 
     /**
-     * Creates a page in Cascade Server based on the information provided in the projectInformation and the
+     * Creates a page in Cascade CMS based on the information provided in the projectInformation and the
      * actual file from which the Page needs to be created.
      */
     public static CascadeAssetInformation createPage(java.nio.file.Path pageFile, ProjectInformation projectInformation) throws Exception
@@ -174,7 +174,7 @@ else if (overwriteBehavior.equals(ProjectInformation.OVERWRITE_BEHAVIOR_OVERWRIT
     }
 
     /**
-     * Creates a file asset in Cascade Server with contents from the <code>filesystemFile</code> if one does
+     * Creates a file asset in Cascade CMS with contents from the <code>filesystemFile</code> if one does
      * not exist. The path of the file is figured out using webViewUrl in linkFile.xml in current or ancestor
      * folders. If file with that path already exists, it is left as it is.
      */
diff --git a/src/com/hannonhill/umt/struts/AnalyzeInformationAction.java b/src/com/hannonhill/umt/struts/AnalyzeInformationAction.java
index ed4e9b2..a904417 100644
--- a/src/com/hannonhill/umt/struts/AnalyzeInformationAction.java
+++ b/src/com/hannonhill/umt/struts/AnalyzeInformationAction.java
@@ -5,7 +5,6 @@
  */
 package com.hannonhill.umt.struts;
 
-import java.io.File;
 import java.nio.file.FileSystems;
 import java.util.HashSet;
 
@@ -14,7 +13,7 @@
 
 /**
  * This action is responsible for analyzing the project information - the contents of the selected xml folder
- * and Cascade Server's Site's contents.
+ * and Cascade CMS' Site's contents.
  * 
  * @author Artur Tomusiak
  * @since 1.0
diff --git a/src/com/hannonhill/umt/struts/ProjectPropertiesAction.java b/src/com/hannonhill/umt/struts/ProjectPropertiesAction.java
index 4929f6f..9d41360 100644
--- a/src/com/hannonhill/umt/struts/ProjectPropertiesAction.java
+++ b/src/com/hannonhill/umt/struts/ProjectPropertiesAction.java
@@ -249,17 +249,17 @@ private void verifyConnectivity()
         }
         catch (ServiceException e)
         {
-            addActionError("Could not locate Cascade Server with given URL.");
+            addActionError("Could not locate Cascade CMS with given URL.");
             return;
         }
         catch (RemoteException e)
         {
-            addActionError("A problem occured when connecting to Cascade Server: " + e.getMessage());
+            addActionError("A problem occurred when connecting to Cascade CMS: " + e.getMessage());
             return;
         }
         catch (Exception e)
         {
-            addActionError("An error occured when reading a site with given Site Name: " + e.getMessage());
+            addActionError("An error occurred when reading a site with given Site Name: " + e.getMessage());
             return;
         }
 
diff --git a/src/com/hannonhill/umt/util/PathUtil.java b/src/com/hannonhill/umt/util/PathUtil.java
index b730fd9..3488663 100644
--- a/src/com/hannonhill/umt/util/PathUtil.java
+++ b/src/com/hannonhill/umt/util/PathUtil.java
@@ -242,7 +242,7 @@ public static String convertToFullCascadeInstanceURL(String url)
     }
 
     /**
-     * Generates a link to the page in Cascade Server
+     * Generates a link to the page in Cascade CMS
      * 
      * @param cascadePage
      * @param cascadeUrl
diff --git a/tomcat/webapps/ROOT/jsps/AssignContentType.jsp b/tomcat/webapps/ROOT/jsps/AssignContentType.jsp
index c85af89..4451aec 100644
--- a/tomcat/webapps/ROOT/jsps/AssignContentType.jsp
+++ b/tomcat/webapps/ROOT/jsps/AssignContentType.jsp
@@ -15,7 +15,7 @@
 	<body>
 		<div class="mt-header">
       <div class="container">
-        <h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
+          <h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
       </div>
     </div>
     <div id="page" class="container">
diff --git a/tomcat/webapps/ROOT/jsps/AssignFields.jsp b/tomcat/webapps/ROOT/jsps/AssignFields.jsp
index 2580517..677c3c2 100644
--- a/tomcat/webapps/ROOT/jsps/AssignFields.jsp
+++ b/tomcat/webapps/ROOT/jsps/AssignFields.jsp
@@ -15,7 +15,7 @@
 	<body>
 		<div class="mt-header">
       <div class="container">
-        <h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
+		  <h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
       </div>
     </div>
     <div id="page" class="container">
diff --git a/tomcat/webapps/ROOT/jsps/AssignRootLevelFolders.jsp b/tomcat/webapps/ROOT/jsps/AssignRootLevelFolders.jsp
index 34593b4..72a32ae 100644
--- a/tomcat/webapps/ROOT/jsps/AssignRootLevelFolders.jsp
+++ b/tomcat/webapps/ROOT/jsps/AssignRootLevelFolders.jsp
@@ -15,7 +15,7 @@
 	<body>
 		<div class="mt-header">
       <div class="container">
-        <h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
+		  <h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
       </div>
     </div>
     <div id="page" class="container">
diff --git a/tomcat/webapps/ROOT/jsps/Migration.jsp b/tomcat/webapps/ROOT/jsps/Migration.jsp
index 155645d..4e7a171 100644
--- a/tomcat/webapps/ROOT/jsps/Migration.jsp
+++ b/tomcat/webapps/ROOT/jsps/Migration.jsp
@@ -16,7 +16,7 @@
 	<body>
 		<div class="mt-header">
       <div class="container">
-        <h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
+		  <h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
       </div>
     </div>
     <div id="page" class="container">
diff --git a/tomcat/webapps/ROOT/jsps/MigrationSummary.jsp b/tomcat/webapps/ROOT/jsps/MigrationSummary.jsp
index 26c3236..25e9a97 100644
--- a/tomcat/webapps/ROOT/jsps/MigrationSummary.jsp
+++ b/tomcat/webapps/ROOT/jsps/MigrationSummary.jsp
@@ -15,7 +15,7 @@
 	<body>
 		<div class="mt-header">
       <div class="container">
-        <h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
+		  <h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
       </div>
     </div>
     <div id="page" class="container">
@@ -29,9 +29,9 @@
 					</div>
 					
 					<form action="/MigrationSummary" method="POST">
-						<h3>Cascade Server Information</h3>
+						<h3>Cascade CMS Information</h3>
 						<div class="row">
-							<div class="span3">Cascade Server URL</div>
+							<div class="span3">Cascade CMS URL</div>
 							<div class="span7"><strong><s:property value="projectInformation.url"/></strong></div>
 						</div>
 						<div class="row">
diff --git a/tomcat/webapps/ROOT/jsps/ProjectProperties.jsp b/tomcat/webapps/ROOT/jsps/ProjectProperties.jsp
index 59e1859..0538b61 100644
--- a/tomcat/webapps/ROOT/jsps/ProjectProperties.jsp
+++ b/tomcat/webapps/ROOT/jsps/ProjectProperties.jsp
@@ -34,7 +34,7 @@
               <div class="control-group">
                 <label class="control-label" for="url">Cascade CMS URL</label>
                 <div class="controls">
-                  <input class="span4" type="text" id="url" placeholder="http://" name="url" value="<s:property value="url"/>" />
+                  <input class="span4" type="text" id="url" placeholder="https://" name="url" value="<s:property value="url"/>" />
                 </div>
               </div>
               <div class="control-group">
diff --git a/tomcat/webapps/ROOT/jsps/UploadZip.jsp b/tomcat/webapps/ROOT/jsps/UploadZip.jsp
index 4988730..634b96b 100644
--- a/tomcat/webapps/ROOT/jsps/UploadZip.jsp
+++ b/tomcat/webapps/ROOT/jsps/UploadZip.jsp
@@ -15,7 +15,7 @@
 	<body>
 		<div class="mt-header">
       <div class="container">
-        <h1 class="brand">Cascade Server <span>Universal Migration Tool</span></h1>
+		  <h1 class="brand">Cascade CMS <span>Universal Migration Tool</span></h1>
       </div>
     </div>
     <div id="page" class="container">