diff --git a/lib/livebook/file_system/local.ex b/lib/livebook/file_system/local.ex
index c7c1c78d0..574726b1b 100644
--- a/lib/livebook/file_system/local.ex
+++ b/lib/livebook/file_system/local.ex
@@ -240,7 +240,7 @@ defimpl Livebook.FileSystem, for: Livebook.FileSystem.Local do
     if node(file_system.origin_pid) == node() do
       :ok
     else
-      {:error, "this local file system belongs to a different host"}
+      {:error, "this disk belongs to a different host"}
     end
   end
 
diff --git a/lib/livebook/file_system/s3.ex b/lib/livebook/file_system/s3.ex
index de4f5258f..fac6a8625 100644
--- a/lib/livebook/file_system/s3.ex
+++ b/lib/livebook/file_system/s3.ex
@@ -64,7 +64,7 @@ defmodule Livebook.FileSystem.S3 do
 
       _config ->
         {:error,
-         "S3 file system config is expected to have keys: :bucket_url, :access_key_id and :secret_access_key, but got #{inspect(config)}"}
+         "S3 configuration is expected to have keys: :bucket_url, :access_key_id and :secret_access_key, but got #{inspect(config)}"}
     end
   end
 
diff --git a/lib/livebook/live_markdown/import.ex b/lib/livebook/live_markdown/import.ex
index 373b97e6d..18f9e44a3 100644
--- a/lib/livebook/live_markdown/import.ex
+++ b/lib/livebook/live_markdown/import.ex
@@ -494,7 +494,7 @@ defmodule Livebook.LiveMarkdown.Import do
       file = Livebook.FileSystem.File.new(file_system, path)
       {:ok, %{type: :file, name: name, file: file}}
     else
-      {:error, "skipping file #{name}, since it points to an unknown file system"}
+      {:error, "skipping file #{name}, since it points to an unknown file storage"}
     end
   end
 
@@ -605,7 +605,7 @@ defmodule Livebook.LiveMarkdown.Import do
   defp take_stamp_data([{:stamp, data} | elements]), do: {data, elements}
   defp take_stamp_data(elements), do: {nil, elements}
 
-  @invalid_stamp_message "invalid notebook stamp, disabling default access to secrets and remote file systems "
+  @invalid_stamp_message "invalid notebook stamp, disabling default access to secrets and remote files "
   @personal_stamp_context "(you are either not the author of this notebook or changed its source outside of Livebook)"
   @org_stamp_context "(this may happen if you made changes to the notebook source outside of Livebook)"
 
diff --git a/lib/livebook/settings.ex b/lib/livebook/settings.ex
index 78b917605..0f3ad8936 100644
--- a/lib/livebook/settings.ex
+++ b/lib/livebook/settings.ex
@@ -104,7 +104,7 @@ defmodule Livebook.Settings do
   defp storage_to_fs(%{type: "s3"} = config) do
     case FileSystem.S3.from_config(config) do
       {:ok, fs} -> fs
-      {:error, message} -> raise ArgumentError, "invalid S3 file system: #{message}"
+      {:error, message} -> raise ArgumentError, "invalid S3 configuration: #{message}"
     end
   end
 
diff --git a/lib/livebook_web/live/file_select_component.ex b/lib/livebook_web/live/file_select_component.ex
index 68b5e3225..8a844ccad 100644
--- a/lib/livebook_web/live/file_select_component.ex
+++ b/lib/livebook_web/live/file_select_component.ex
@@ -269,7 +269,7 @@ defmodule LivebookWeb.FileSelectComponent do
         <button
           type="button"
           class="button-base button-gray pl-3 pr-2"
-          aria-label="switch file system"
+          aria-label="switch file storage"
           disabled={@file_system_select_disabled}
         >
           <span><%= file_system_name(@file.file_system) %></span>
diff --git a/lib/livebook_web/live/open_live/file_component.ex b/lib/livebook_web/live/open_live/file_component.ex
index 46402b1a3..64647a86d 100644
--- a/lib/livebook_web/live/open_live/file_component.ex
+++ b/lib/livebook_web/live/open_live/file_component.ex
@@ -27,7 +27,7 @@ defmodule LivebookWeb.OpenLive.FileComponent do
   @impl true
   def render(assigns) do
     ~H"""
-    <div class="h-80" role="region" aria-label="file system">
+    <div class="h-80" role="region" aria-label="file storage">
       <.live_component
         module={LivebookWeb.FileSelectComponent}
         id="home-file-select"
diff --git a/lib/livebook_web/live/session_live/add_file_entry_file_component.ex b/lib/livebook_web/live/session_live/add_file_entry_file_component.ex
index 16a6db54c..3afdb8310 100644
--- a/lib/livebook_web/live/session_live/add_file_entry_file_component.ex
+++ b/lib/livebook_web/live/session_live/add_file_entry_file_component.ex
@@ -57,7 +57,7 @@ defmodule LivebookWeb.SessionLive.AddFileEntryFileComponent do
       <div :if={@error_message} class="mb-6 error-box">
         <%= @error_message %>
       </div>
-      <div class="h-80" role="region" aria-label="file system">
+      <div class="h-80" role="region" aria-label="file storage">
         <.live_component
           module={LivebookWeb.FileSelectComponent}
           id="add-file-entry-select"
diff --git a/lib/livebook_web/live/session_live/files_list_component.ex b/lib/livebook_web/live/session_live/files_list_component.ex
index 42505e4a2..1fe4baa80 100644
--- a/lib/livebook_web/live/session_live/files_list_component.ex
+++ b/lib/livebook_web/live/session_live/files_list_component.ex
@@ -209,7 +209,7 @@ defmodule LivebookWeb.SessionLive.FilesListComponent do
              [
                %{
                  name: "delete_from_file_system",
-                 label: "Delete the corresponding file from the file system",
+                 label: "Delete the corresponding file from its storage",
                  default: true,
                  disabled: false
                }
diff --git a/test/livebook/live_markdown/import_test.exs b/test/livebook/live_markdown/import_test.exs
index 991e6c4c2..ed178d0fd 100644
--- a/test/livebook/live_markdown/import_test.exs
+++ b/test/livebook/live_markdown/import_test.exs
@@ -1249,7 +1249,7 @@ defmodule Livebook.LiveMarkdown.ImportTest do
 
       assert %Notebook{file_entries: []} = notebook
 
-      assert messages == ["skipping file document.pdf, since it points to an unknown file system"]
+      assert messages == ["skipping file document.pdf, since it points to an unknown file storage"]
     end
 
     test "imports :file file entries with quarantine when no stamp is given" do