diff --git a/app/.DS_Store b/app/.DS_Store
index aa08d42..4d27b46 100644
Binary files a/app/.DS_Store and b/app/.DS_Store differ
diff --git a/app/controllers/.DS_Store b/app/controllers/.DS_Store
index f2009e6..7c446e1 100644
Binary files a/app/controllers/.DS_Store and b/app/controllers/.DS_Store differ
diff --git a/app/controllers/ExperimentalAnalysis.java b/app/controllers/ExperimentalAnalysis.java
index 5713f97..827083f 100644
--- a/app/controllers/ExperimentalAnalysis.java
+++ b/app/controllers/ExperimentalAnalysis.java
@@ -203,7 +203,7 @@ public String validate() {
                     String vmId = serviceClient.createVM(vmImageName, userName, password, String.valueOf(memory), String.valueOf(numberOfVCPUs), session());
                 } catch (Exception e) {
                     log.error("Error calling createVM in data capsule API.", e);
-                    return "Data Capsule Creation failed. Internal Error occurred!!";
+                    return "Capsule Creation failed. Internal Error occurred!!";
                 }
             }
 
diff --git a/app/views/.DS_Store b/app/views/.DS_Store
index abff000..f7fe2a9 100644
Binary files a/app/views/.DS_Store and b/app/views/.DS_Store differ
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
index 9842433..53f5c8c 100755
--- a/app/views/main.scala.html
+++ b/app/views/main.scala.html
@@ -92,7 +92,7 @@
                         @if(PlayConfWrapper.isDataCapsuleEnable) {
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                    Data Capsule<b class="caret"></b></a>
+                                    Capsule<b class="caret"></b></a>
                                 <ul class="dropdown-menu">
                                     <li><a href="https://wiki.htrc.illinois.edu/display/COM/HTRC+Data+Capsule">
                                         Documentation</a>
@@ -100,17 +100,17 @@
                                     <li class="divider"></li>
                                     @if(userId == null) {
                                         <li><a href="#" onclick="loggingRequiredWarning('@routes.ExperimentalAnalysis.listVMs()')" >
-                                            Show Data Capsules</a></li>
+                                            Show Capsules</a></li>
                                     } else {
-                                        <li><a href="@routes.ExperimentalAnalysis.listVMs()">Show Data Capsules</a></li>
+                                        <li><a href="@routes.ExperimentalAnalysis.listVMs()">Show Capsules</a></li>
                                     }
                                     <li class="divider"></li>
                                     @if(userId == null) {
                                         <li><a href="#" onclick="loggingRequiredWarning('@routes.ExperimentalAnalysis.createVMForm()')" >
-                                            Create Data Capsule</a></li>
+                                            Create Capsule</a></li>
                                     } else {
                                         <li><a href="@routes.ExperimentalAnalysis.createVMForm()">
-                                            Create Data Capsule</a></li>
+                                            Create Capsule</a></li>
                                     }
                                 </ul>
                             </li>
diff --git a/app/views/vmcreate.scala.html b/app/views/vmcreate.scala.html
index 51ca4b8..8385f85 100644
--- a/app/views/vmcreate.scala.html
+++ b/app/views/vmcreate.scala.html
@@ -5,7 +5,7 @@
     <div class="container">
         <div class="panel panel-default panel-htrc">
             <div class="panel-heading">
-                <strong>Data Capsule Creation (All fields are required) </strong>
+                <strong>Capsule Creation (All fields are required) </strong>
             </div>
             <div class="panel-body">
             @helper.form(routes.ExperimentalAnalysis.createVM(), 'class -> "form-horizontal"){
@@ -36,14 +36,14 @@
                     <label for="userName" class="col-sm-2 control-label">VNC Login User Name</label>
                     <div class="col-sm-10">
                         <input type="text" class="form-control" id="userName" name="userName" placeholder="User Name" required="true" value="@form.data().get("userName")">
-                        Note: This is different from the login user name of Data Capsule.
+                        Note: This is different from the login user name of Capsule.
                     </div>
                 </div>
                 <div class="form-group">
                     <label for="password" class="col-sm-2 control-label">VNC Login Password </label>
                     <div class="col-sm-10">
                         <input type="password" class="form-control" id="password" name="password" placeholder="Password" required="true">
-                        Note: This is different from the login password of Data Capsule. Password must be less than 8 characters. This is due to a VNC limitation.
+                        Note: This is different from the login password of Capsule. Password must be less than 8 characters. This is due to a VNC limitation.
                     </div>
                 </div>
                 <div class="form-group">
@@ -108,7 +108,7 @@
                 </div>
                 <div class="form-group">
                     <div class="col-sm-offset-2 col-sm-10">
-                        <button type="submit" class="btn btn-primary btn-sm">Create Data Capsule</button>
+                        <button type="submit" class="btn btn-primary btn-sm">Create Capsule</button>
                     </div>
                 </div>
             }
diff --git a/app/views/vmlist.scala.html b/app/views/vmlist.scala.html
index 7ac954c..db1a334 100644
--- a/app/views/vmlist.scala.html
+++ b/app/views/vmlist.scala.html
@@ -7,7 +7,7 @@
         <div class="container">
             <div class="panel panel-default panel-htrc panel-with-table">
                 <div class="panel-heading">
-                    <strong>Data Capsule</strong>
+                    <strong>Capsule</strong>
                     <a href="@routes.ExperimentalAnalysis.createVMForm()" class="btn btn-small pull-right" id="create-vm" style="padding-top : 5 px">
                         <i class="icon-plus"></i>
                     </a>
@@ -44,11 +44,11 @@
                                         } else {
                                             @if(vm.getState == "SHUTDOWN") {
                                                 <a href="@routes.ExperimentalAnalysis.startVM(vm.getVmId)" class="btn btn-success btn-xs" id="startvm">
-                                                    Start Data Capsule
+                                                    Start Capsule
                                                 </a>
                                             } else {
                                                 <a href="@routes.ExperimentalAnalysis.stopVM(vm.getVmId)" class="btn btn-info btn-xs" id="stopvm">
-                                                    Stop Data Capsule
+                                                    Stop Capsule
                                                 </a>
                                                 @if(vm.getMode == "MAINTENANCE") {
                                                     <a href="#" class="btn btn-info btn-xs" id="switchmode-maintainance" onclick="modalMessage ( 'Switch to Secure Mode',
@@ -70,7 +70,7 @@
 
                                         }
                                         <a href="#" class="btn btn-danger btn-xs" id="deletevms" onclick="modalMessage('Delete VM', 'Do you want to delete VM ID:  @vm.getVmId ?', '@routes.ExperimentalAnalysis.deleteVM(vm.getVmId)')">
-                                            <i class="icon-trash icon-white"></i> Delete Data Capsule
+                                            <i class="icon-trash icon-white"></i> Delete Capsule
                                         </a>
 
 
@@ -84,7 +84,7 @@
                     } else {
                         <p style="padding: 8px;">There are no Data Capsules.</p>
                     }
-                    <p class="alert alert-info" style="margin: 10px; padding: 5px;">To log in to a Data Capsule, you should use a VNC client. You can
+                    <p class="alert alert-info" style="margin: 10px; padding: 5px;">To log in to a Capsule, you should use a VNC client. You can
                         input the host name and VNC port information shown by clicking the
                         vmid link. For more information, please refer the <a href="http://wiki.htrc.illinois.edu/display/COM/HTRC+Data+Capsule"><b>documentation</b></a>.</p>
                 </div>
diff --git a/app/views/vmstatus.scala.html b/app/views/vmstatus.scala.html
index 99ca62f..a0f7909 100644
--- a/app/views/vmstatus.scala.html
+++ b/app/views/vmstatus.scala.html
@@ -6,7 +6,7 @@
         <div class="container">
             <div class="panel panel-default panel-htrc panel-with-table">
                 <div class="panel-heading">
-                    <strong>Data Capsule Status</strong>
+                    <strong>Capsule Status</strong>
                     <span>
                         <a href="@routes.ExperimentalAnalysis.listVMs()" class="btn btn-info btn-xs pull-right">Back to List</a>
                     </span>
@@ -27,15 +27,15 @@
                                 <td>@vmStatus.getState</td>
                             </tr>
                             <tr>
-                                <td><b>Data Capsule Initial Logging User ID:</b></td>
+                                <td><b>Capsule Initial Logging User ID:</b></td>
                                 <td>@vmStatus.getVmIntialLogingId</td>
                             </tr>
                             <tr>
-                                <td><b>Data Capsule Initial Logging Password:</b></td>
+                                <td><b>Capsule Initial Logging Password:</b></td>
                                 <td>@vmStatus.getVmInitialLogingPassword</td>
                             </tr>
                             <tr>
-                                <td><b>Data Capsule Mode:</b></td>
+                                <td><b>Capsule Mode:</b></td>
                                 <td>@vmStatus.getMode</td>
                             </tr>
                             <tr>