diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index dcd6548b498..32fc475e638 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -352,7 +352,6 @@ if ($result)
 	{
 		$obj = $db->fetch_object($result);
 
-
 		print "\n";
 
 		print '<tr class="oddeven">';
@@ -383,10 +382,7 @@ if ($result)
     		print '</td>';
 		}
 
-		if (! empty($conf->multicompany->enabled) && !$user->entity)
-		{
-		    print '<td></td>';
-		}
+	    print '<td></td>';
 
 		// Actions
 		print '<td align="center">';
@@ -416,7 +412,6 @@ else
     dol_print_error($db);
 }
 
-
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index f8d4669b8e5..765edad6687 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -100,3 +100,4 @@ UseAboutPage=Disable the about page
 UseDocFolder=Disable the documentation folder
 UseSpecificReadme=Use a specific ReadMe
 RealPathOfModule=Real path of module
+ContentCantBeEmpty=Content of file can't be empty
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 24596255043..869e5cbe965 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -94,6 +94,8 @@ if (empty($newmask))	// This should no happen
 
 if ($dirins && $action == 'initmodule' && $modulename)
 {
+    $modulename = ucfirst($modulename);     // Force first letter in uppercase
+
 	if (preg_match('/[^a-z0-9_]/i', $modulename))
 	{
 		$error++;
@@ -150,6 +152,7 @@ if ($dirins && $action == 'initmodule' && $modulename)
 		dol_delete_file($destdir.'/img/object_myobject.png');
 		dol_delete_file($destdir.'/class/myobject.class.php');
 		dol_delete_file($destdir.'/class/api_mymodule.class.php');
+		dol_delete_file($destdir.'/doc/*example*');
 	}
 
 	// Edit PHP files
diff --git a/htdocs/modulebuilder/template/doc/Specifications_full_en.notindoc.asciidoc b/htdocs/modulebuilder/template/doc/Specifications_full_en.example.asciidoc
similarity index 100%
rename from htdocs/modulebuilder/template/doc/Specifications_full_en.notindoc.asciidoc
rename to htdocs/modulebuilder/template/doc/Specifications_full_en.example.asciidoc