diff --git a/src/cloud/occi/lib/ui/public/js/plugins/compute.js b/src/cloud/occi/lib/ui/public/js/plugins/compute.js
index 2018ec19f9..605bbec9e3 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/compute.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/compute.js
@@ -551,11 +551,11 @@ function updateVMInfo(request,vm){
'+tr(vm_info.STATE)+' | \
\
\
- '+tr("CPU")+' | \
+ '+tr("Used CPU")+' | \
'+vm_info.CPU+' | \
\
\
- '+tr("Memory")+' | \
+ '+tr("Used Memory")+' | \
'+vm_info.MEMORY+' | \
\
\
diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js
index bcc32957be..c2616a605c 100644
--- a/src/sunstone/public/js/plugins/hosts-tab.js
+++ b/src/sunstone/public/js/plugins/hosts-tab.js
@@ -705,7 +705,7 @@ function updateHostInfo(request,host){
\
\
\
- ' + tr("Max Mem") + ' | \
+ ' + tr("Total Mem") + ' | \
'+humanize_size(host_info.HOST_SHARE.MAX_MEM)+' | \
\
\
@@ -717,7 +717,7 @@ function updateHostInfo(request,host){
'+humanize_size(host_info.HOST_SHARE.MEM_USAGE)+' | \
\
\
- ' + tr("Max CPU") + ' | \
+ ' + tr("Total CPU") + ' | \
'+host_info.HOST_SHARE.MAX_CPU+' | \
\
\
diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index 234becbd72..86ff58de67 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -71,9 +71,9 @@ var vms_tab_content = '\
'+tr("Group")+' | \
'+tr("Name")+' | \
'+tr("Status")+' | \
- '+tr("CPU")+' | \
- '+tr("Memory")+' | \
- '+tr("Hostname")+' | \
+ '+tr("Used CPU")+' | \
+ '+tr("Used Memory")+' | \
+ '+tr("Host")+' | \
'+tr("IPs")+' | \
'+tr("Start Time")+' | \
'+tr("VNC Access")+' | \
@@ -877,7 +877,7 @@ function generateHistoryTable(vm){
\
\
'+tr("Sequence")+' | \
- '+tr("Hostname")+' | \
+ '+tr("Host")+' | \
'+tr("Reason")+' | \
'+tr("State change time")+' | \
'+tr("Total time")+' | \
@@ -982,7 +982,7 @@ function updateVMInfo(request,vm){
'+tr(OpenNebula.Helper.resource_state("vm_lcm",vm_info.LCM_STATE))+' | \
\
\
- '+tr("Hostname")+' | \
+ '+tr("Host")+' | \
'+ hostname +' | \
\
\