diff --git a/opigno_module.install b/opigno_module.install
index 5fb8a11..3baa861 100644
--- a/opigno_module.install
+++ b/opigno_module.install
@@ -1458,3 +1458,18 @@ function opigno_module_update_8030() {
   $data = $storage->read('views.view.module_list');
   $config_storage->write('views.view.module_list', $data);
 }
+
+/**
+ * Increase size of the "name" field for "opigno_activity" and "opigno_module".
+ */
+function opigno_module_update_8031() {
+  $definition_update_manager = \Drupal::entityDefinitionUpdateManager();
+
+  $field_storage_definition = $definition_update_manager->getFieldStorageDefinition('name', 'opigno_activity');
+  $field_storage_definition->setSettings(['max_length' => 255]);
+  $definition_update_manager->updateFieldStorageDefinition($field_storage_definition);
+
+  $field_storage_definition = $definition_update_manager->getFieldStorageDefinition('name', 'opigno_module');
+  $field_storage_definition->setSettings(['max_length' => 255]);
+  $definition_update_manager->updateFieldStorageDefinition($field_storage_definition);
+}
diff --git a/src/Entity/OpignoActivity.php b/src/Entity/OpignoActivity.php
index d04ee22..77b21c4 100644
--- a/src/Entity/OpignoActivity.php
+++ b/src/Entity/OpignoActivity.php
@@ -268,7 +268,7 @@ class OpignoActivity extends RevisionableContentEntityBase implements OpignoActi
       ->setRevisionable(TRUE)
       ->setTranslatable(TRUE)
       ->setSettings([
-        'max_length' => 50,
+        'max_length' => 255,
         'text_processing' => 0,
       ])
       ->setDefaultValue('')
@@ -384,18 +384,4 @@ class OpignoActivity extends RevisionableContentEntityBase implements OpignoActi
     return $fields;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function preSave(EntityStorageInterface $storage) {
-    parent::preSave($storage);
-
-    $name = $this->getName();
-    if (strlen($name) > 50) {
-      // Truncate activity name to database field length.
-      $name = mb_substr($name, 0, 50);
-      $this->setName($name);
-    }
-  }
-
 }
diff --git a/src/Entity/OpignoModule.php b/src/Entity/OpignoModule.php
index 6abbe3c..e14228e 100644
--- a/src/Entity/OpignoModule.php
+++ b/src/Entity/OpignoModule.php
@@ -648,7 +648,7 @@ class OpignoModule extends RevisionableContentEntityBase implements OpignoModule
       ->setTranslatable(TRUE)
       ->setRequired(TRUE)
       ->setSettings([
-        'max_length' => 50,
+        'max_length' => 255,
         'text_processing' => 0,
       ])
       ->setDefaultValue(NULL)