diff --git a/README.md b/README.md
index ac0f183..1fbb9b4 100755
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ patterns are based on the regular entity url's/aliases.
 
 For instance, if you want to show the teaser at a specific URL. Go to your 
 admin -> "Configuration" -> "Search and metadata" -> "View mode page". 
-Here you can add a path pattern like /%/summary and select the view_mode teaser.
+Here you can add a path pattern like /%/summary and select the view mode teaser.
 - If you have a content page which regular entity url/alias is "/my/great/page".
 - You can now visit "/my/great/page/summary" which will render the teaser of
   that page.
diff --git a/src/AliasTypeInterface.php b/src/AliasTypeInterface.php
index 5b6d282..56b4e87 100755
--- a/src/AliasTypeInterface.php
+++ b/src/AliasTypeInterface.php
@@ -6,7 +6,7 @@ use Drupal\Component\Plugin\DerivativeInspectionInterface;
 use Drupal\Core\Plugin\ContextAwarePluginInterface;
 
 /**
- * Provides an interface for view_mode_page alias types.
+ * Provides an interface for view mode page alias types.
  */
 interface AliasTypeInterface extends ContextAwarePluginInterface, DerivativeInspectionInterface {
 
diff --git a/src/AliasTypeManager.php b/src/AliasTypeManager.php
index d9ef8ea..2dc7f26 100755
--- a/src/AliasTypeManager.php
+++ b/src/AliasTypeManager.php
@@ -8,7 +8,7 @@ use Drupal\Core\Plugin\DefaultPluginManager;
 use Drupal\Component\Plugin\FallbackPluginManagerInterface;
 
 /**
- * Manages view_mode_page alias type plugins.
+ * Manages view mode page alias type plugins.
  */
 class AliasTypeManager extends DefaultPluginManager implements FallbackPluginManagerInterface {
 
diff --git a/src/Entity/ViewmodepagePattern.php b/src/Entity/ViewmodepagePattern.php
index 1b33e38..d3fa581 100755
--- a/src/Entity/ViewmodepagePattern.php
+++ b/src/Entity/ViewmodepagePattern.php
@@ -12,11 +12,11 @@ use Drupal\Core\Plugin\DefaultSingleLazyPluginCollection;
 use Drupal\view_mode_page\ViewmodepagePatternInterface;
 
 /**
- * Defines the Viewmodepage pattern entity.
+ * Defines the View mode page pattern entity.
  *
  * @ConfigEntityType(
  *   id = "view_mode_page_pattern",
- *   label = @Translation("Viewmodepage pattern"),
+ *   label = @Translation("View mode page pattern"),
  *   handlers = {
  *     "list_builder" = "Drupal\view_mode_page\Form\PatternListBuilder",
  *     "form" = {
@@ -58,14 +58,14 @@ use Drupal\view_mode_page\ViewmodepagePatternInterface;
  */
 class ViewmodepagePattern extends ConfigEntityBase implements ViewmodepagePatternInterface {
   /**
-   * The Viewmodepage pattern ID.
+   * The View mode page pattern ID.
    *
    * @var string
    */
   protected $id;
 
   /**
-   * The Viewmodepage pattern label.
+   * The View mode page pattern label.
    *
    * @var string
    */
@@ -74,7 +74,7 @@ class ViewmodepagePattern extends ConfigEntityBase implements ViewmodepagePatter
   /**
    * The pattern type.
    *
-   * A string denoting the type of view_mode_page pattern this is. For a
+   * A string denoting the type of view mode page pattern this is. For a
    * node path this would be 'node', for users it would be 'user', and so on.
    * This allows for arbitrary non-entity patterns to be possible if applicable.
    *
@@ -97,7 +97,7 @@ class ViewmodepagePattern extends ConfigEntityBase implements ViewmodepagePatter
   protected $pattern;
 
   /**
-   * A string denoting the type of view_mode is used for rendering.
+   * A string denoting the type of view mode is used for rendering.
    *
    * @var string
    */
diff --git a/src/Form/PatternEditForm.php b/src/Form/PatternEditForm.php
index 9fd388d..8c9760c 100755
--- a/src/Form/PatternEditForm.php
+++ b/src/Form/PatternEditForm.php
@@ -12,7 +12,7 @@ use Drupal\view_mode_page\AliasTypeManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Edit form for view_mode_page patterns.
+ * Edit form for view mode page patterns.
  */
 class PatternEditForm extends EntityForm {
 
@@ -24,7 +24,7 @@ class PatternEditForm extends EntityForm {
   protected $manager;
 
   /**
-   * The viewmodepage pattern interface.
+   * The View mode page pattern interface.
    *
    * @var \Drupal\view_mode_page\ViewmodepagePatternInterface
    */
diff --git a/src/Form/PatternListBuilder.php b/src/Form/PatternListBuilder.php
index e6de663..c5a7ad4 100755
--- a/src/Form/PatternListBuilder.php
+++ b/src/Form/PatternListBuilder.php
@@ -6,7 +6,7 @@ use Drupal\Core\Config\Entity\DraggableListBuilder;
 use Drupal\Core\Entity\EntityInterface;
 
 /**
- * Provides a listing of Viewmodepage pattern entities.
+ * Provides a listing of View mode page pattern entities.
  */
 class PatternListBuilder extends DraggableListBuilder {
 
diff --git a/src/PathProcessor/DynamicPathProcessor.php b/src/PathProcessor/DynamicPathProcessor.php
index 73aa419..7b9a0f2 100755
--- a/src/PathProcessor/DynamicPathProcessor.php
+++ b/src/PathProcessor/DynamicPathProcessor.php
@@ -40,7 +40,7 @@ class DynamicPathProcessor implements InboundPathProcessorInterface, OutboundPat
   protected $entityTypeManager;
 
   /**
-   * The viewmodepage pattern repository.
+   * The View mode page pattern repository.
    *
    * @var \Drupal\view_mode_page\Repository\ViewmodepagePatternRepository
    */
@@ -61,7 +61,7 @@ class DynamicPathProcessor implements InboundPathProcessorInterface, OutboundPat
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager interface.
    * @param \Drupal\view_mode_page\Repository\ViewmodepagePatternRepository $pattern_repository
-   *   The viewmodepage pattern repository.
+   *   The View mode page pattern repository.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
    */
diff --git a/src/Plugin/view_mode_page/AliasType/EntityAliasTypeBase.php b/src/Plugin/view_mode_page/AliasType/EntityAliasTypeBase.php
index fee3d88..09d588b 100755
--- a/src/Plugin/view_mode_page/AliasType/EntityAliasTypeBase.php
+++ b/src/Plugin/view_mode_page/AliasType/EntityAliasTypeBase.php
@@ -12,7 +12,7 @@ use Drupal\view_mode_page\AliasTypeInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * A view_mode_page alias type plugin for entities with canonical links.
+ * A view mode page alias type plugin for entities with canonical links.
  *
  * @AliasType(
  *   id = "canonical_entities",
diff --git a/src/Repository/ViewmodepagePatternRepository.php b/src/Repository/ViewmodepagePatternRepository.php
index 42c3153..2dc56dd 100755
--- a/src/Repository/ViewmodepagePatternRepository.php
+++ b/src/Repository/ViewmodepagePatternRepository.php
@@ -31,7 +31,7 @@ class ViewmodepagePatternRepository {
    * Find all patterns.
    *
    * @return \Drupal\view_mode_page\ViewmodepagePatternInterface[]
-   *   The viewmodepage pattern interface.
+   *   The View mode page pattern interface.
    */
   public function findAll() {
     static $patterns;
diff --git a/src/ViewmodepagePatternInterface.php b/src/ViewmodepagePatternInterface.php
index 1e983d4..10c1826 100755
--- a/src/ViewmodepagePatternInterface.php
+++ b/src/ViewmodepagePatternInterface.php
@@ -6,7 +6,7 @@ use Drupal\Core\Config\Entity\ConfigEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
 
 /**
- * Provides an interface for defining Viewmodepage pattern entities.
+ * Provides an interface for defining View mode page pattern entities.
  */
 interface ViewmodepagePatternInterface extends ConfigEntityInterface {
 
@@ -38,18 +38,18 @@ interface ViewmodepagePatternInterface extends ConfigEntityInterface {
   public function setPattern($pattern);
 
   /**
-   * Gets the type of view_mode.
+   * Gets the type of view mode.
    *
    * @return string
-   *   Returns the type of view_mode.
+   *   Returns the type of view mode.
    */
   public function getViewMode();
 
   /**
-   * Gets the label of view_mode.
+   * Gets the label of view mode.
    *
    * @return string
-   *   Returns the label of view_mode.
+   *   Returns the label of view mode.
    */
   public function getViewModeLabel();
 
diff --git a/view_mode_page.links.action.yml b/view_mode_page.links.action.yml
index bf9b1b2..2410e78 100755
--- a/view_mode_page.links.action.yml
+++ b/view_mode_page.links.action.yml
@@ -1,5 +1,5 @@
 entity.view_mode_page_pattern.add_form:
   route_name: 'entity.view_mode_page_pattern.add_form'
-  title: 'Add view_mode pattern'
+  title: 'Add view mode pattern'
   appears_on:
     - entity.view_mode_page_pattern.collection
diff --git a/view_mode_page.links.menu.yml b/view_mode_page.links.menu.yml
index c9bf753..6e482f9 100755
--- a/view_mode_page.links.menu.yml
+++ b/view_mode_page.links.menu.yml
@@ -1,5 +1,5 @@
 entity.view_mode_page_pattern.collection:
   title: 'View mode page'
-  description: 'Configure paths which should display an entity in a given view_mode.'
+  description: 'Configure paths which should display an entity in a given view mode.'
   parent: system.admin_config_search
   route_name: entity.view_mode_page_pattern.collection
diff --git a/view_mode_page.module b/view_mode_page.module
index 8ec2b90..0aa87dd 100755
--- a/view_mode_page.module
+++ b/view_mode_page.module
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains view_mode_page module.
+ * Contains view mode_page module.
  *
  * @TODO: Custom title (optionally) per pattern path
  * @TODO: Set canonical (optionally) per pattern path
@@ -17,7 +17,7 @@ function view_mode_page_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
     case 'help.page.view_mode_page':
       $output = '';
-      $output .= '<p>' . t('Makes it possible to create (additional) paths where entities will be shown in a given view_mode') . '</p>';
+      $output .= '<p>' . t('Makes it possible to create (additional) paths where entities will be shown in a given view mode') . '</p>';
       return $output;
 
     case 'entity.view_mode_page_pattern.collection':
@@ -31,7 +31,7 @@ function view_mode_page_help($route_name, RouteMatchInterface $route_match) {
 /**
  * Implements hook_block_build_alter().
  *
- * Adds additional cache_contexts to the system_main_block, to prevent incorrect caching of a single view_mode (when using a path alias).
+ * Adds additional cache_contexts to the system_main_block, to prevent incorrect caching of a single view mode (when using a path alias).
  *
  * @param array $build
  * @param \Drupal\Core\Block\BlockPluginInterface $block