diff --git a/apps/code/editor_controller.cpp b/apps/code/editor_controller.cpp
index d571e580c..b048e0e21 100644
--- a/apps/code/editor_controller.cpp
+++ b/apps/code/editor_controller.cpp
@@ -39,7 +39,7 @@ void EditorController::setScript(Script script) {
 bool EditorController::handleEvent(Ion::Events::Event event) {
   if (event == Ion::Events::OK || event == Ion::Events::Back) {
     Script::ErrorStatus err = m_script.writeContent(m_areaBuffer, strlen(m_areaBuffer)+1);
-    if (err == Script::ErrorStatus::NoEnoughSpaceAvailable || err == Script::ErrorStatus::RecordDoesNotExist) {
+    if (err == Script::ErrorStatus::NotEnoughSpaceAvailable || err == Script::ErrorStatus::RecordDoesNotExist) {
       assert(false); // This should not happen as we set the text area according to the available space in the Kallax
     } else {
       stackController()->pop();
diff --git a/apps/code/menu_controller.cpp b/apps/code/menu_controller.cpp
index 75fbde1e7..b7cf2fd94 100644
--- a/apps/code/menu_controller.cpp
+++ b/apps/code/menu_controller.cpp
@@ -320,7 +320,7 @@ bool MenuController::textFieldDidFinishEditing(TextField * textField, const char
   } else if (error == Script::ErrorStatus::NonCompliantName) {
     app()->displayWarning(I18n::Message::NonCompliantName);
   } else {
-    assert(error == Script::ErrorStatus::NoEnoughSpaceAvailable);
+    assert(error == Script::ErrorStatus::NotEnoughSpaceAvailable);
     app()->displayWarning(I18n::Message::NameTooLong);
   }
   return false;
diff --git a/ion/include/ion/storage.h b/ion/include/ion/storage.h
index 324799719..63e3c265a 100644
--- a/ion/include/ion/storage.h
+++ b/ion/include/ion/storage.h
@@ -25,7 +25,7 @@ public:
       None = 0,
       NameTaken = 1,
       NonCompliantName = 2,
-      NoEnoughSpaceAvailable = 3,
+      NotEnoughSpaceAvailable = 3,
       RecordDoesNotExist = 4
     };
     struct Data
diff --git a/ion/src/shared/storage.cpp b/ion/src/shared/storage.cpp
index 94bc6ff6d..a4b67977c 100644
--- a/ion/src/shared/storage.cpp
+++ b/ion/src/shared/storage.cpp
@@ -41,7 +41,7 @@ Storage::Record::ErrorStatus Storage::createRecord(const char * name, const void
   }
   size_t recordSize = sizeOfRecord(name, size);
   if (recordSize >= k_maxRecordSize || recordSize > availableSize()) {
-   return Record::ErrorStatus::NoEnoughSpaceAvailable;
+   return Record::ErrorStatus::NotEnoughSpaceAvailable;
   }
   if (isNameTaken(name)) {
     return Record::ErrorStatus::NameTaken;
@@ -126,7 +126,7 @@ Storage::Record::ErrorStatus Storage::setNameOfRecord(Record record, const char
       record_size_t previousRecordSize = sizeOfRecordStarting(p);
       size_t newRecordSize = previousRecordSize-previousNameSize+nameSize;
       if (newRecordSize >= k_maxRecordSize || !slideBuffer(p+sizeof(record_size_t)+previousNameSize, nameSize-previousNameSize)) {
-        return Record::ErrorStatus::NoEnoughSpaceAvailable;
+        return Record::ErrorStatus::NotEnoughSpaceAvailable;
       }
       overrideSizeAtPosition(p, newRecordSize);
       overrideNameAtPosition(p+sizeof(record_size_t), name);
@@ -157,7 +157,7 @@ Storage::Record::ErrorStatus Storage::setValueOfRecord(Record record, Record::Da
       const char * name = nameOfRecordStarting(p);
       size_t newRecordSize = sizeOfRecord(name, data.size);
       if (newRecordSize >= k_maxRecordSize || !slideBuffer(p+previousRecordSize, newRecordSize-previousRecordSize)) {
-        return Record::ErrorStatus::NoEnoughSpaceAvailable;
+        return Record::ErrorStatus::NotEnoughSpaceAvailable;
       }
       record_size_t nameSize = strlen(name)+1;
       overrideSizeAtPosition(p, newRecordSize);