diff --git a/RHEL6/input/checks/accounts_umask_bashrc.xml b/RHEL6/input/checks/accounts_umask_bashrc.xml
index 880f00fb413426c6674e10feca336c3342df742d..3857f4cada6f12d34f8c5a79cf23b23d213482f2 100644
--- a/RHEL6/input/checks/accounts_umask_bashrc.xml
+++ b/RHEL6/input/checks/accounts_umask_bashrc.xml
@@ -1,36 +1,27 @@
 <def-group>
-  <definition class="compliance"
-  id="accounts_umask_bash_users" version="1">
+  <definition class="compliance" id="accounts_umask_bashrc" version="1">
     <metadata>
-      <title>Ensure that Users Have Sensible Umask Values set for
-      bash</title>
+      <title>Ensure that Users Have Sensible Umask Values set for bash</title>
       <affected family="unix">
         <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
-      <description>The default umask for all users should be set
-      correctly for the bash shell</description>
+      <description>The default umask for users of the bash shell</description>
     </metadata>
     <criteria>
-      <criterion test_ref="test_20087" />
+      <criterion test_ref="test_accounts_umask_bashrc" />
     </criteria>
   </definition>
-  <ind:textfilecontent54_test check="all"
-  check_existence="all_exist"
+  <ind:textfilecontent54_test check="all" check_existence="all_exist"
   comment="Tests the value of the ^[\s]*umask[\s]+([^#]*) expression in the /etc/bashrc file"
-  id="test_20087" version="1">
-    <ind:object object_ref="obj_20087" />
-    <ind:state state_ref="state_20087" />
+  id="test_accounts_umask_bashrc" version="1">
+    <ind:object object_ref="obj_accounts_umask_bashrc" />
+    <ind:state state_ref="state_accounts_umask_bashrc" />
   </ind:textfilecontent54_test>
-  <ind:textfilecontent54_state id="state_20087"
-  version="1">
-    <ind:subexpression operation="equals" var_check="all"
-    var_ref="var_20087" />
+  <ind:textfilecontent54_state id="state_accounts_umask_bashrc" version="1">
+    <ind:subexpression operation="equals" var_check="all" var_ref="var_accounts_user_umask" />
   </ind:textfilecontent54_state>
-  <external_variable comment="External variable for definition 20087 - 20090"
-  datatype="string" id="var_20087"
-  version="1" />
-  <ind:textfilecontent54_object id="obj_20087"
-  version="1">
+  <external_variable comment="umask for user shell" datatype="string" id="var_accounts_user_umask" version="1" />
+  <ind:textfilecontent54_object id="obj_accounts_umask_bashrc" version="1">
     <ind:path>/etc</ind:path>
     <ind:filename>bashrc</ind:filename>
     <ind:pattern operation="pattern match">^[\s]*umask[\s]+([^#\s]*)</ind:pattern>
diff --git a/RHEL6/input/checks/accounts_umask_cshrc.xml b/RHEL6/input/checks/accounts_umask_cshrc.xml
index 5f80721f9808e9527b974926868c03232f916c58..bdafcb226f0d93476a28a4d14130d173bab184d7 100644
--- a/RHEL6/input/checks/accounts_umask_cshrc.xml
+++ b/RHEL6/input/checks/accounts_umask_cshrc.xml
@@ -1,36 +1,28 @@
 <def-group>
   <definition class="compliance"
-  id="accounts_umask_csh" version="1">
+  id="accounts_umask_cshrc" version="1">
     <metadata>
-      <title>Ensure that Users Have Sensible Umask Values set for
-      csh</title>
+      <title>Ensure that Users Have Sensible Umask Values set for csh</title>
       <affected family="unix">
         <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
-      <description>The default umask for all users should be set
-      correctly for the csh shell</description>
+      <description>The default umask for users of the csh shell</description>
     </metadata>
     <criteria>
-      <criterion test_ref="test_20088" />
+      <criterion test_ref="test_accounts_umask_cshrc" />
     </criteria>
   </definition>
-  <ind:textfilecontent54_test check="all"
-  check_existence="all_exist"
+  <ind:textfilecontent54_test check="all" check_existence="all_exist"
   comment="Tests the value of the ^[\s]*umask[\s]+([^#]*) expression in the /etc/csh.cshrc file"
-  id="test_20088" version="1">
-    <ind:object object_ref="obj_20088" />
-    <ind:state state_ref="state_20089" />
+  id="test_accounts_umask_cshrc" version="1">
+    <ind:object object_ref="obj_accounts_umask_cshrc" />
+    <ind:state state_ref="state_accounts_umask_cshrc" />
   </ind:textfilecontent54_test>
-  <ind:textfilecontent54_state id="state_20089"
-  version="1">
-    <ind:subexpression operation="equals" var_check="all"
-    var_ref="var_20089" />
+  <ind:textfilecontent54_state id="state_accounts_umask_cshrc" version="1">
+    <ind:subexpression operation="equals" var_check="all" var_ref="var_accounts_user_umask" />
   </ind:textfilecontent54_state>
-  <external_variable comment="External variable for definition 20087 - 20090"
-  datatype="string" id="var_20089"
-  version="1" />
-  <ind:textfilecontent54_object id="obj_20088"
-  version="1">
+  <external_variable comment="umask for user shell" datatype="string" id="var_accounts_user_umask" version="1" />
+  <ind:textfilecontent54_object id="obj_accounts_umask_cshrc" version="1">
     <ind:path>/etc</ind:path>
     <ind:filename>csh.cshrc</ind:filename>
     <ind:pattern operation="pattern match">^[\s]*umask[\s]+([^#\s]*)</ind:pattern>
diff --git a/RHEL6/input/checks/accounts_umask_etc_profile.xml b/RHEL6/input/checks/accounts_umask_etc_profile.xml
index a679aa3571bfb7c61add2b344d37930c9955fe95..4125baa07aacb4bcac5ee13d863608e7793164e4 100644
--- a/RHEL6/input/checks/accounts_umask_etc_profile.xml
+++ b/RHEL6/input/checks/accounts_umask_etc_profile.xml
@@ -11,25 +11,21 @@
       correctly</description>
     </metadata>
     <criteria>
-      <criterion test_ref="test_20090" />
+      <criterion test_ref="test_accounts_umask_etc_profile" />
     </criteria>
   </definition>
   <ind:textfilecontent54_test check="all"
   check_existence="all_exist"
   comment="Tests the value of the ^[\s]*umask[\s]+([^#]*) expression in the /etc/profile file"
-  id="test_20090" version="1">
-    <ind:object object_ref="obj_20090" />
-    <ind:state state_ref="state_20090" />
+  id="test_accounts_umask_etc_profile" version="1">
+    <ind:object object_ref="obj_accounts_umask_etc_profile" />
+    <ind:state state_ref="state_accounts_umask_etc_profile" />
   </ind:textfilecontent54_test>
-  <ind:textfilecontent54_state id="state_20090"
-  version="1">
-    <ind:subexpression operation="equals" var_check="all"
-    var_ref="var_20090" />
+  <ind:textfilecontent54_state id="state_accounts_umask_etc_profile" version="1">
+    <ind:subexpression operation="equals" var_check="all" var_ref="var_accounts_user_umask" />
   </ind:textfilecontent54_state>
-  <external_variable comment="External variable for definition 20087 - 20090"
-  datatype="string" id="var_20090"
-  version="1" />
-  <ind:textfilecontent54_object id="obj_20090"
+  <external_variable comment="user umask" datatype="string" id="var_accounts_user_umask" version="1" />
+  <ind:textfilecontent54_object id="obj_accounts_umask_etc_profile"
   version="1">
     <ind:path>/etc</ind:path>
     <ind:filename>profile</ind:filename>
diff --git a/RHEL6/input/checks/accounts_umask_login_defs.xml b/RHEL6/input/checks/accounts_umask_login_defs.xml
index 58b5eb64a00097aff93b6b5c7caf24f962511e1d..8e19cbfca56b715c6da5d949188bef77cc021c67 100644
--- a/RHEL6/input/checks/accounts_umask_login_defs.xml
+++ b/RHEL6/input/checks/accounts_umask_login_defs.xml
@@ -7,30 +7,23 @@
       <affected family="unix">
         <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
-      <description>The default umask for all users should be set
-      correctly</description>
+      <description>The default umask for all users specified in /etc/login.defs</description>
     </metadata>
     <criteria>
-      <criterion test_ref="test_20089" />
+      <criterion test_ref="test_accounts_umask_login_defs" />
     </criteria>
   </definition>
-  <ind:textfilecontent54_test check="all"
-  check_existence="all_exist"
+  <ind:textfilecontent54_test check="all" check_existence="all_exist"
   comment="Tests the value of the ^[\s]*umask[\s]+([^#]*) expression in the /etc/login.defs file"
-  id="test_20089" version="1">
-    <ind:object object_ref="obj_20089" />
-    <ind:state state_ref="state_20088" />
+  id="test_accounts_umask_login_defs" version="1">
+    <ind:object object_ref="obj_accounts_umask_login_defs" />
+    <ind:state state_ref="state_accounts_umask_login_defs" />
   </ind:textfilecontent54_test>
-  <ind:textfilecontent54_state id="state_20088"
-  version="1">
-    <ind:subexpression operation="equals" var_check="all"
-    var_ref="var_20088" />
+  <ind:textfilecontent54_state id="state_accounts_umask_login_defs" version="1">
+    <ind:subexpression operation="equals" var_check="all" var_ref="var_accounts_user_umask" />
   </ind:textfilecontent54_state>
-  <external_variable comment="External variable for definition 20087 - 20090"
-  datatype="string" id="var_20088"
-  version="1" />
-  <ind:textfilecontent54_object id="obj_20089"
-  version="1">
+  <external_variable comment="user umask" datatype="string" id="var_accounts_user_umask" version="1" />
+  <ind:textfilecontent54_object id="obj_accounts_umask_login_defs" version="1">
     <ind:path>/etc</ind:path>
     <ind:filename>login.defs</ind:filename>
     <ind:pattern operation="pattern match">^[\s]*UMASK[\s]+([^#\s]*)</ind:pattern>
diff --git a/RHEL6/input/profiles/common.xml b/RHEL6/input/profiles/common.xml
index d1bb6ee01e6f806e41cf7858943472f09a77ce73..d80e69a19a5147ac294c858feb8cd6cc222074f3 100644
--- a/RHEL6/input/profiles/common.xml
+++ b/RHEL6/input/profiles/common.xml
@@ -254,7 +254,9 @@ these should likely be moved out of common.
 <!-- Minimum number of characters not present in old password -->
 <refine-value idref="password_history_retain_number" selector="5"/>
 <!-- Passwords to remember -->
-<refine-value idref="umask_user_value" selector="077"/>
+
+<refine-value idref="var_accounts_user_umask" selector="077"/>
+
 <!-- Sensible umask -->
 <refine-value idref="login_banner_text" selector="usgcb_default"/>
 <!-- login banner verbiage -->
diff --git a/RHEL6/input/profiles/stig-rhel6-server.xml b/RHEL6/input/profiles/stig-rhel6-server.xml
index 9b31b377573aaaba1e6e0f4146d0b501460fd3cf..a478b8815644b500ba89e00163dcbb990ee4f7a7 100644
--- a/RHEL6/input/profiles/stig-rhel6-server.xml
+++ b/RHEL6/input/profiles/stig-rhel6-server.xml
@@ -68,8 +68,7 @@
 <select idref="user_umask_cshrc" selected="true" />
 <select idref="user_umask_profile" selected="true" />
 <select idref="user_umask_logindefs" selected="true" />
-<refine-value idref="umask_user_value" selector="077"/>
-
+<refine-value idref="var_accounts_user_umask" selector="077" />
 
 <select idref="set_daemon_umask" selected="true" />
 <refine-value idref="var_umask_for_daemons" selector="027"/>
diff --git a/RHEL6/input/profiles/test.xml b/RHEL6/input/profiles/test.xml
index 0399f6aba867a52544d2bf61bd4f4ff6faa61e97..e2a2ff68321a29445aa34f1bef290b34ddc4d711 100644
--- a/RHEL6/input/profiles/test.xml
+++ b/RHEL6/input/profiles/test.xml
@@ -43,13 +43,11 @@
 <refine-value idref="var_auditd_admin_space_left_action" selector="single"/>
 <refine-value idref="var_auditd_action_mail_acct" selector="root"/>
 
-
 <select idref="user_umask_bashrc" selected="true" />
 <select idref="user_umask_cshrc" selected="true" />
 <select idref="user_umask_profile" selected="true" />
 <select idref="user_umask_logindefs" selected="true" />
-<refine-value idref="umask_user_value" selector="077"/>
-
+<refine-value idref="var_accounts_user_umask" selector="077" />
 
 <select idref="set_daemon_umask" selected="true"/>
 <refine-value idref="var_umask_for_daemons" selector="027"/>
diff --git a/RHEL6/input/system/accounts/session.xml b/RHEL6/input/system/accounts/session.xml
index 02d63d9ee0f2fafb51f3e518617d9358bbd1c89c..4f26816b908df60d886bd12adcbd55f8e24341cb 100644
--- a/RHEL6/input/system/accounts/session.xml
+++ b/RHEL6/input/system/accounts/session.xml
@@ -193,7 +193,7 @@ correct the line:
 <pre>umask 077</pre>
 </li>
 -->
-<Value id="umask_user_value" type="string"
+<Value id="var_accounts_user_umask" type="string"
 operator="equals" interactive="0">
 <title>Sensible umask</title>
 <description>Enter default user umask</description>
@@ -213,7 +213,7 @@ as follows:
 <pre>umask 077<!-- <sub idref="umask_user_value" /> --></pre>
 </description>
 <rationale>The umask value influences the permissions assigned to files when they are created.
-A misconfigured umask value could result in files with excessive permissions that can be read and/or
+A misconfigured umask value could result in files with excessive permissions that can be read or
 written to by unauthorized users.</rationale>
 <ocil clause="the above command returns no output, or if the umask is configured incorrectly">
 Verify the <tt>umask</tt> setting is configured correctly in the <tt>/etc/bashrc</tt> file by
@@ -226,7 +226,7 @@ umask 077</pre>
 </ocil>
 
 <ident cce="26917-5" />
-<oval id="accounts_umask_bash_users" value="umask_user_value"/>
+<oval id="accounts_umask_bashrc" value="var_accounts_user_umask"/>
 <ref nist="" disa="366"/>
 <tested by="swells" on="20120929"/>
 </Rule>
@@ -239,7 +239,7 @@ add or correct the <tt>umask</tt> setting in <tt>/etc/csh.cshrc</tt> to read as
 <pre>umask 077<!-- <sub idref="umask_user_value" /> --></pre>
 </description>
 <rationale>The umask value influences the permissions assigned to files when they are created.
-A misconfigured umask value could result in files with excessive permissions that can be read and/or
+A misconfigured umask value could result in files with excessive permissions that can be read or
 written to by unauthorized users.</rationale>
 <ocil clause="the above command returns no output, or if the umask is configured incorrectly">
 Verify the <tt>umask</tt> setting is configured correctly in the <tt>/etc/csh.cshrc</tt> file by
@@ -250,7 +250,7 @@ All output must show the value of <tt>umask</tt> set to 077, as shown in the bel
 umask 077</pre>
 </ocil>
 <ident cce="27034-8" />
-<oval id="accounts_umask_csh" value="umask_user_value"/>
+<oval id="accounts_umask_cshrc" value="var_accounts_user_umask"/>
 <ref nist="" disa="366"/>
 <tested by="swells" on="20120929"/>
 </Rule>
@@ -263,7 +263,7 @@ add or correct the <tt>umask</tt> setting in <tt>/etc/profile</tt> to read as fo
 <pre>umask 077<!--<sub idref="umask_user_value" /> --></pre>
 </description>
 <rationale>The umask value influences the permissions assigned to files when they are created.
-A misconfigured umask value could result in files with excessive permissions that can be read and/or
+A misconfigured umask value could result in files with excessive permissions that can be read or
 written to by unauthorized users.</rationale>
 <ident cce="26669-2" />
 <ocil clause="the above command returns no output, or if the umask is configured incorrectly">
@@ -274,7 +274,7 @@ All output must show the value of <tt>umask</tt> set to 077, as shown in the bel
 <pre># grep "umask" /etc/profile
 umask 077</pre>
 </ocil>
-<oval id="accounts_umask_etc_profile" value="umask_user_value" />
+<oval id="accounts_umask_etc_profile" value="var_accounts_user_umask" />
 <tested by="swells" on="20120929"/>
 <ref nist="" disa="366"/>
 </Rule>
@@ -298,7 +298,7 @@ All output must show the value of <tt>umask</tt> set to 077, as shown in the bel
 umask 077</pre>
 </ocil>
 <ident cce="26371-5" />
-<oval id="accounts_umask_login_defs" value="umask_user_value" />
+<oval id="accounts_umask_login_defs" value="var_accounts_user_umask" />
 <ref nist="" disa="366"/>
 <tested by="swells" on="20120929" />
 </Rule>