diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeTemplateSuggestionsTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeTemplateSuggestionsTest.php
index 3acb894..ccb4870 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeTemplateSuggestionsTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeTemplateSuggestionsTest.php
@@ -36,13 +36,13 @@ function testNodeThemeHookSuggestions() {
     $this->assertEqual($suggestions, array('node__full', 'node__page', 'node__page__full', 'node__' . $node->id(), 'node__' . $node->id() . '__full'), 'Found expected node suggestions.');
 
     //Change the view_mode.
-    $view_mode = 'node.myCustomNodeView...123';
+    $view_mode = 'node.my_custom_view_mode';
     $build = \Drupal::entityManager()->getViewBuilder('node')->view($node, $view_mode);
 
     $variables['elements'] = $build;
     $suggestions = \Drupal::moduleHandler()->invokeAll('theme_suggestions_node', array($variables));
 
-    $this->assertEqual($suggestions, array('node__node_mycustomnodeview_123', 'node__page', 'node__page__node_mycustomnodeview_123', 'node__' . $node->id(), 'node__' . $node->id() . '__node_mycustomnodeview_123'), 'Found expected node suggestions.');
+    $this->assertEqual($suggestions, array('node__node_my_custom_view_mode', 'node__page', 'node__page__node_my_custom_view_mode', 'node__' . $node->id(), 'node__' . $node->id() . '__node_my_custom_view_mode'), 'Found expected node suggestions.');
   }
 
 }
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 8d3f384..56d1ade 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -639,7 +639,7 @@ function node_preprocess_block(&$variables) {
 function node_theme_suggestions_node(array $variables) {
   $suggestions = array();
   $node = $variables['elements']['#node'];
-  $sanitized_view_mode = strtolower(preg_replace('/[^a-zA-Z0-9]+/', '_', $variables['elements']['#view_mode']));
+  $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
 
   $suggestions[] = 'node__' . $sanitized_view_mode;
   $suggestions[] = 'node__' . $node->bundle();