diff --git a/apps/code/app.cpp b/apps/code/app.cpp
index e0aa39738..4c017e220 100644
--- a/apps/code/app.cpp
+++ b/apps/code/app.cpp
@@ -61,7 +61,7 @@ void App::Snapshot::setOpt(const char * name, const char * value) {
     const char * scriptContent = separator;
     Code::ScriptTemplate script(scriptName, scriptContent);
     m_scriptStore.addScriptFromTemplate(&script);
-    m_scriptStore.scriptNamed(scriptName).toggleImportationStatus(); // set Importation Status to 1
+    ScriptStore::ScriptNamed(scriptName).toggleImportationStatus(); // set Importation Status to 1
     return;
   }
   if (strcmp(name, "lock-on-console") == 0) {
diff --git a/apps/code/script_store.cpp b/apps/code/script_store.cpp
index 25b9dce67..64bec153a 100644
--- a/apps/code/script_store.cpp
+++ b/apps/code/script_store.cpp
@@ -13,7 +13,7 @@ constexpr char ScriptStore::k_scriptExtension[];
 
 
 bool ScriptStore::ScriptNameIsFree(const char * baseName) {
-  return Ion::Storage::sharedStorage()->recordBaseNamedWithExtension(baseName, k_scriptExtension).isNull();
+  return ScriptBaseNamed(baseName).isNull();
 }
 
 ScriptStore::ScriptStore()
@@ -123,7 +123,7 @@ void ScriptStore::scanScriptsForFunctionsAndVariables(void * context, ScanCallba
 }
 
 const char * ScriptStore::contentOfScript(const char * name) {
-  Script script = scriptNamed(name);
+  Script script = ScriptNamed(name);
   if (script.isNull()) {
     return nullptr;
   }
diff --git a/apps/code/script_store.h b/apps/code/script_store.h
index 46273c57d..864fed483 100644
--- a/apps/code/script_store.h
+++ b/apps/code/script_store.h
@@ -23,8 +23,11 @@ public:
   Script scriptAtIndex(int index) {
     return Script(Ion::Storage::sharedStorage()->recordWithExtensionAtIndex(k_scriptExtension, index));
   }
-  Script scriptNamed(const char * name) {
-    return Script(Ion::Storage::sharedStorage()->recordNamed(name));
+  static Script ScriptNamed(const char * fullName) {
+    return Script(Ion::Storage::sharedStorage()->recordNamed(fullName));
+  }
+  static Script ScriptBaseNamed(const char * baseName) {
+    return Script(Ion::Storage::sharedStorage()->recordBaseNamedWithExtension(baseName, k_scriptExtension));
   }
   int numberOfScripts() {
     return Ion::Storage::sharedStorage()->numberOfRecordsWithExtension(k_scriptExtension);
diff --git a/apps/code/variable_box_controller.cpp b/apps/code/variable_box_controller.cpp
index 4526e0946..d8652258d 100644
--- a/apps/code/variable_box_controller.cpp
+++ b/apps/code/variable_box_controller.cpp
@@ -148,7 +148,7 @@ bool VariableBoxController::addNodesFromImportMaybe(mp_parse_node_struct_t * par
       }
     } else {
       // Try fetching the nodes from a script
-      Script importedScript = m_scriptStore->scriptNamed("polynomial.py"); //TODO LEA
+      Script importedScript = ScriptStore::ScriptBaseNamed(importationSourceName);
       if (!importedScript.isNull()) {
         loadGlobalAndImportedVariableInScriptAsImported(importedScript, textToAutocomplete, textToAutocompleteLength);
       }