diff --git a/byu_theme.theme b/byu_theme.theme
index cb98ce59..9624842f 100755
--- a/byu_theme.theme
+++ b/byu_theme.theme
@@ -24,7 +24,7 @@ function byu_theme_preprocess_page(&$variables) {
   $variables['byu_theme_root'] = $byu_theme_root;
   $user = \Drupal::currentUser()->id();
   $account = \Drupal\user\Entity\User::load($user);
-  $name = $account->getUsername();
+  $name = $account->getAccountName();
   if($user){
     $user = \Drupal\user\Entity\User::load(\Drupal::currentUser()->id());
     if($user->get('user_picture')->entity){
diff --git a/subtheme/subtheme.theme b/subtheme/subtheme.theme
index 32f8e71d..82b88f83 100755
--- a/subtheme/subtheme.theme
+++ b/subtheme/subtheme.theme
@@ -99,7 +99,7 @@ function subtheme_preprocess_page(&$variables) {
     $user = \Drupal::currentUser()->id();
     $account = \Drupal\user\Entity\User::load($user);
     //$info = $account->get('field_info')->value;
-    $name = $account->getUsername();
+    $name = $account->getAccountName();
     if($user){
         $user = \Drupal\user\Entity\User::load(\Drupal::currentUser()->id());
         if($user->get('user_picture')->entity){
@@ -139,7 +139,7 @@ function subtheme_preprocess_page(&$variables) {
     } else { // setting wasn't set yet
         $variables['#attached']['library'][] = 'subtheme/components-latest';
     }
-    
+
     /* --- Load Fonts ------- */
     $font_package = trim(theme_get_setting('font_package'));
     if($font_package == 'fonts-full' ) {
@@ -159,7 +159,7 @@ function subtheme_preprocess_page(&$variables) {
     if($sourcesans_use == TRUE ) {
         $variables['#attached']['library'][] = 'subtheme/sourcesans';
     }
-    
+
     /* ------ Load Helper Styles --------- */
     $byu_buttons = trim(theme_get_setting('byu_buttons'));
     if($byu_buttons == TRUE ) {
@@ -173,9 +173,9 @@ function subtheme_preprocess_page(&$variables) {
     if($byu_box_shadows == TRUE ) {
         $variables['#attached']['library'][] = 'subtheme/byu-box-shadows';
     }
-    
-    
-    
+
+
+
 
     $userOb = $variables['user'];
 //    $username = $userOb->account->name;
@@ -447,7 +447,7 @@ function subtheme_preprocess_html(&$variables) {
     $browserclasses = subtheme_browser_classes();
     $variables['attributes']['class'][] = implode(' ', $browserclasses);// Concatenate with spaces.
 
-    
+
 }
 //
 //function subtheme_theme_suggestions_node_alter(array &$suggestions, array $variables) {