diff --git a/R/blackBoxDS.R b/R/blackBoxDS.R
index 63cf0160..40c882a0 100644
--- a/R/blackBoxDS.R
+++ b/R/blackBoxDS.R
@@ -367,7 +367,7 @@ if(sum(round(rank(blackbox.output.df[,3])-rank(blackbox.output.df[,4]),2)==0)!=n
     paste0("FAILED: inconsistent values across different transformations in black box,
             try a different seed. Altenatively this could reflect modification of the
             clientside code which is not recommended. Finally, it can also occur
-            if the R session on one or more of the opal data servers runs out
+            if the R session on one or more of the Armadillo/Opal data servers runs out
             of memory")
   stop(error.message, call. = FALSE)
 }else{
diff --git a/R/blackBoxRanksDS.R b/R/blackBoxRanksDS.R
index 522307a8..c2380242 100644
--- a/R/blackBoxRanksDS.R
+++ b/R/blackBoxRanksDS.R
@@ -257,7 +257,7 @@ if(sum(round(rank(blackbox.ranks.df[,5])-rank(blackbox.ranks.df[,8]),2)==0)!=num
     paste0("FAILED: inconsistent ranking across different transformations in black box,
             try a different seed. Altenatively this could reflect modification of the
             clientside code which is not recommended. Finally, it can also occur
-            if the R session on one or more of the opal data servers runs out
+            if the R session on one or more of the Armadillo/Opal data servers runs out
             of memory")
   stop(error.message, call. = FALSE)
 }else{
diff --git a/R/meanSdGpDS.R b/R/meanSdGpDS.R
index eecf0dde..d84eca03 100644
--- a/R/meanSdGpDS.R
+++ b/R/meanSdGpDS.R
@@ -116,7 +116,7 @@ meanSdGpDS <- function (x, index){
   ansmat.count<-table(group)
   
   # Set filter for cell sizes that are too small
-  # the minimum number of observations that are allowed (the below function gets the value from opal)
+  # the minimum number of observations that are allowed (the below function gets the value from the server)
   any.invalid.cell<-(sum(ansmat.count<nfilter.tab&ansmat.count>0)>=1)
   if(!any.invalid.cell)
   {
diff --git a/R/ranksSecureDS4.R b/R/ranksSecureDS4.R
index 97cd47ce..1bf3159d 100644
--- a/R/ranksSecureDS4.R
+++ b/R/ranksSecureDS4.R
@@ -71,7 +71,7 @@ if((length(sR8.df$global.ranks.input.from.sR5)!=lenx)||
   error.message<-
     paste0("FAILED: ranking components of different lengths. This could reflect
             modification of the clientside code which is not recommended. It can
-            also occur if the R session on one or more of the opal data servers
+            also occur if the R session on one or more of the Armadillo/Opal data servers
             runs out of memory")
   stop(error.message, call. = FALSE)
 }  
@@ -96,7 +96,7 @@ if(ranks.consistent==0)
     paste0("FAILED: inconsistent ranking across different components of ranking matrix,
             try a different seed. Altenatively this could reflect modification of the
             clientside code which is not recommended. Finally, it can also occur
-            if the R session on one or more of the opal data servers runs out
+            if the R session on one or more of the Armadillo/Opal data servers runs out
             of memory")
   stop(error.message, call. = FALSE)
 }
diff --git a/R/table1DDS.R b/R/table1DDS.R
index 94bff957..de23a79c 100644
--- a/R/table1DDS.R
+++ b/R/table1DDS.R
@@ -15,7 +15,7 @@
 #'
 table1DDS  <- function(xvect){
 
-  # the minimum number of observations that are allowed (the below function gets the value from opal)
+  # the minimum number of observations that are allowed (the below function gets the value from the server)
   
   #############################################################
   # MODULE 1: CAPTURE THE nfilter SETTINGS