diff --git a/apps/code/catalog.de.i18n b/apps/code/catalog.de.i18n
index 9bbfab17e..ad2357110 100644
--- a/apps/code/catalog.de.i18n
+++ b/apps/code/catalog.de.i18n
@@ -56,11 +56,6 @@ PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
 PythonImportTime = "Import time module"
 PythonImportTurtle = "Import turtle module"
-PythonImportFromCmath = "Import cmath module"
-PythonImportFromKandinsky = "Import kandinsky module"
-PythonImportFromMath = "Import math module"
-PythonImportFromRandom = "Import random module"
-PythonImportFromTurtle = "Import turtle module"
 PythonIndex = "Index of the first occurrence"
 PythonInput = "Prompt a value"
 PythonInsert = "Insert an item"
diff --git a/apps/code/catalog.en.i18n b/apps/code/catalog.en.i18n
index 1192d134e..cd6e5e087 100644
--- a/apps/code/catalog.en.i18n
+++ b/apps/code/catalog.en.i18n
@@ -56,11 +56,6 @@ PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
 PythonImportTime = "Import time module"
 PythonImportTurtle = "Import turtle module"
-PythonImportFromCmath = "Import cmath module"
-PythonImportFromKandinsky = "Import kandinsky module"
-PythonImportFromRandom = "Import random module"
-PythonImportFromMath = "Import math module"
-PythonImportFromTurtle = "Import turtle module"
 PythonIndex = "Index of the first occurrence"
 PythonInput = "Prompt a value"
 PythonInsert = "Insert an item"
diff --git a/apps/code/catalog.es.i18n b/apps/code/catalog.es.i18n
index 1192d134e..cd6e5e087 100644
--- a/apps/code/catalog.es.i18n
+++ b/apps/code/catalog.es.i18n
@@ -56,11 +56,6 @@ PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
 PythonImportTime = "Import time module"
 PythonImportTurtle = "Import turtle module"
-PythonImportFromCmath = "Import cmath module"
-PythonImportFromKandinsky = "Import kandinsky module"
-PythonImportFromRandom = "Import random module"
-PythonImportFromMath = "Import math module"
-PythonImportFromTurtle = "Import turtle module"
 PythonIndex = "Index of the first occurrence"
 PythonInput = "Prompt a value"
 PythonInsert = "Insert an item"
diff --git a/apps/code/catalog.fr.i18n b/apps/code/catalog.fr.i18n
index d0d988a62..0899bb7dc 100644
--- a/apps/code/catalog.fr.i18n
+++ b/apps/code/catalog.fr.i18n
@@ -56,11 +56,6 @@ PythonImportRandom = "Importation du module random"
 PythonImportMath = "Importation du module math"
 PythonImportTurtle = "Importation du module turtle"
 PythonImportTime = "Importation du module time"
-PythonImportFromCmath = "Importation du module cmath"
-PythonImportFromKandinsky = "Importation du module kandinsky"
-PythonImportFromRandom = "Importation du module random"
-PythonImportFromMath = "Importation du module math"
-PythonImportFromTurtle = "Importation du module turtle"
 PythonIndex = "Indice de la première occurrence"
 PythonInput = "Entrer une valeur"
 PythonInsert = "Insérer un élément"
diff --git a/apps/code/catalog.pt.i18n b/apps/code/catalog.pt.i18n
index b9364571c..4862fa9e3 100644
--- a/apps/code/catalog.pt.i18n
+++ b/apps/code/catalog.pt.i18n
@@ -56,11 +56,6 @@ PythonImportRandom = "Import random module"
 PythonImportMath = "Import math module"
 PythonImportTime = "Import time module"
 PythonImportTurtle = "Import turtle module"
-PythonImportFromCmath = "Import cmath module"
-PythonImportFromKandinsky = "Import kandinsky module"
-PythonImportFromRandom = "Import random module"
-PythonImportFromMath = "Import math module"
-PythonImportFromTurtle = "Import turtle module"
 PythonIndex = "Index of the first occurrence"
 PythonInput = "Prompt a value"
 PythonInsert = "Insert an item"
diff --git a/apps/code/python_toolbox.cpp b/apps/code/python_toolbox.cpp
index 85022e2b7..fffcdc795 100644
--- a/apps/code/python_toolbox.cpp
+++ b/apps/code/python_toolbox.cpp
@@ -48,7 +48,7 @@ const ToolboxMessageTree loopsAndTestsChildren[] = {
 
 const ToolboxMessageTree MathModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportMath, I18n::Message::PythonImportMath, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromMath, I18n::Message::PythonImportFromMath, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromMath, I18n::Message::PythonImportMath, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandMathFunction, I18n::Message::PythonMathFunction, false, I18n::Message::PythonCommandMathFunctionWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandConstantE, I18n::Message::PythonConstantE, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandConstantPi, I18n::Message::PythonConstantPi, false),
@@ -94,7 +94,7 @@ const ToolboxMessageTree MathModuleChildren[] = {
 
 const ToolboxMessageTree KandinskyModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportKandinsky, I18n::Message::PythonImportKandinsky, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromKandinsky, I18n::Message::PythonImportFromKandinsky, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromKandinsky, I18n::Message::PythonImportKandinsky, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKandinskyFunction, I18n::Message::PythonKandinskyFunction, false, I18n::Message::PythonCommandKandinskyFunctionWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGetPixel, I18n::Message::PythonGetPixel),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSetPixel, I18n::Message::PythonSetPixel),
@@ -105,7 +105,7 @@ const ToolboxMessageTree KandinskyModuleChildren[] = {
 
 const ToolboxMessageTree RandomModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportRandom, I18n::Message::PythonImportRandom, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromRandom, I18n::Message::PythonImportFromRandom, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromRandom, I18n::Message::PythonImportRandom, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandRandomFunction, I18n::Message::PythonRandomFunction, false, I18n::Message::PythonCommandRandomFunctionWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGetrandbits, I18n::Message::PythonGetrandbits),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSeed, I18n::Message::PythonSeed),
@@ -118,7 +118,7 @@ const ToolboxMessageTree RandomModuleChildren[] = {
 
 const ToolboxMessageTree CMathModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportCmath, I18n::Message::PythonImportCmath, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromCmath, I18n::Message::PythonImportFromCmath, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromCmath, I18n::Message::PythonImportCmath, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandCmathFunction, I18n::Message::PythonCmathFunction, false, I18n::Message::PythonCommandCmathFunctionWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandConstantE, I18n::Message::PythonConstantE, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandConstantPi, I18n::Message::PythonConstantPi, false),
@@ -134,7 +134,7 @@ const ToolboxMessageTree CMathModuleChildren[] = {
 
 const ToolboxMessageTree TurtleModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportTurtle, I18n::Message::PythonImportTurtle, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromTurtle, I18n::Message::PythonImportFromTurtle, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromTurtle, I18n::Message::PythonImportTurtle, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandTurtleFunction, I18n::Message::PythonTurtleFunction, false, I18n::Message::PythonCommandTurtleFunctionWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonTurtleCommandForward, I18n::Message::PythonTurtleForward),
   ToolboxMessageTree::Leaf(I18n::Message::PythonTurtleCommandBackward, I18n::Message::PythonTurtleBackward),
@@ -290,12 +290,12 @@ const ToolboxMessageTree catalogChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonTurtleCommandForward, I18n::Message::PythonTurtleForward),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFmod, I18n::Message::PythonFmod),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFrExp, I18n::Message::PythonFrExp),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromCmath, I18n::Message::PythonImportFromCmath, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromCmath, I18n::Message::PythonImportCmath, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromIon, I18n::Message::PythonImportIon, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromKandinsky, I18n::Message::PythonImportFromKandinsky, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromMath, I18n::Message::PythonImportFromMath, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromRandom, I18n::Message::PythonImportFromRandom, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromTurtle, I18n::Message::PythonImportFromTurtle, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromKandinsky, I18n::Message::PythonImportKandinsky, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromMath, I18n::Message::PythonImportMath, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromRandom, I18n::Message::PythonImportRandom, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromTurtle, I18n::Message::PythonImportTurtle, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromTime, I18n::Message::PythonImportTime, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGamma, I18n::Message::PythonGamma),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGetPixel, I18n::Message::PythonGetPixel),