diff --git a/site/source/about/roadmap.rst b/site/source/about/roadmap.rst
index 9d82d74..0f0f7f9 100644
--- a/site/source/about/roadmap.rst
+++ b/site/source/about/roadmap.rst
@@ -57,7 +57,7 @@ Please pardon our dust...
 
 ..             <div class="cd-timeline-content">
 ..             <h2>laying the foundation</h2>
-..             <h3>EOS v0.2.0</h3>
+..             <h3>eOS v0.2.0</h3>
 ..                 <ul class="content-skills">
 ..                 <li>UI self-hosted on Embassy</li>
 ..                 <li>Automated dependency management</li>
@@ -82,7 +82,7 @@ Please pardon our dust...
 
 ..             <div class="cd-timeline-content">
 ..             <h2>forging lightning</h2>
-..             <h3>EOS v0.2.5</h3>
+..             <h3>eOS v0.2.5</h3>
 ..                 <ul class="content-skills">
 ..                 <li>Radical new dependency management and configuration system</li>
 ..                 </ul>
@@ -105,7 +105,7 @@ Please pardon our dust...
 
 ..             <div class="cd-timeline-content">
 ..             <h2>entering the fediverse</h2>
-..             <h3>EOS v0.2.10</h3>
+..             <h3>eOS v0.2.10</h3>
 ..                 <ul class="content-skills">
 ..                 <li>LAN support</li>
 ..                 <li>Service Actions</li>
@@ -145,7 +145,7 @@ Please pardon our dust...
 
 ..             <div class="cd-timeline-content">
 ..             <h2>rebirth of embassyOS</h2>
-..             <h3>EOS v0.3.0</h3>
+..             <h3>eOS v0.3.0</h3>
 ..             <ul class="content-skills">
 ..                 <li>Complete OS overhaul</li>
 ..                 <li>External drive support</li>
@@ -168,7 +168,7 @@ Please pardon our dust...
 
 ..             <div class="cd-timeline-content">
 ..             <h2>coming soon...</h2>
-..             <h3>EOS v0.3.x</h3>
+..             <h3>eOS v0.3.x</h3>
 ..             <ul class="content-skills">
 ..                 <li>Additional storage features</li>
 ..                 <li>Additional networking options</li>
diff --git a/site/source/developer-docs/build-package-example/04_docker-build.rst b/site/source/developer-docs/build-package-example/04_docker-build.rst
index 1431442..c291ad4 100644
--- a/site/source/developer-docs/build-package-example/04_docker-build.rst
+++ b/site/source/developer-docs/build-package-example/04_docker-build.rst
@@ -36,7 +36,7 @@ In other words, the Dockerfile serves as a recipe for creating a Docker image, f
     ADD ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
     RUN chmod a+x /usr/local/bin/docker_entrypoint.sh
 
-5. Next, we set a working directory, and set the location of the entrypoint. Exposing ports is not necessary for EOS, but its often useful to leave this line for quick reference and clarity.
+5. Next, we set a working directory, and set the location of the entrypoint. Exposing ports is not necessary for eOS, but its often useful to leave this line for quick reference and clarity.
 
   .. code:: docker
 
diff --git a/site/source/learn/concepts/embassy.rst b/site/source/learn/concepts/embassy.rst
index cc6380f..b0af766 100644
--- a/site/source/learn/concepts/embassy.rst
+++ b/site/source/learn/concepts/embassy.rst
@@ -1,7 +1,7 @@
 .. _embassy-concepts:
 
 =====================
-Embassy Devices & EOS
+Embassy Devices & eOS
 =====================
 
 .. contents::
@@ -25,9 +25,9 @@ Embassy Pro is a plug 'n' play hardware device, based on the `Librem Mini <https
 
 embassyOS
 ---------
-embassyOS (EOS) is a Linux-based operating system custom built for self-hosting open source software.  EOS has a range of features that allow anyone to run their own server software without needing all of the traditionally required systems administration skills.  Features such as advanced dependency management, sensible default configuration with potential for customization, and a sleek GUI make for a smooth user experience with minimal reliance on the developers for people with all levels of technical expertise.
+embassyOS (eOS) is a Linux-based operating system custom built for self-hosting open source software.  eOS has a range of features that allow anyone to run their own server software without needing all of the traditionally required systems administration skills.  Features such as advanced dependency management, sensible default configuration with potential for customization, and a sleek GUI make for a smooth user experience with minimal reliance on the developers for people with all levels of technical expertise.
 
-Currently, 2 builds of EOS exist, one for the ARM architecture (Embassy One) and one for x86 (Embassy Pro).  We currently only support the Raspberry Pi and Librem Mini hardware platforms, however with some minor tweaking, our builds should work on many other ARM and x86 devices.  We hope to officially support more platforms soon, and we highly encourage hacking and community builds!  Drop in our :ref:`community channels<contact>` to learn more and collaborate!!
+Currently, 2 builds of eOS exist, one for the ARM architecture (Embassy One) and one for x86 (Embassy Pro).  We currently only support the Raspberry Pi and Librem Mini hardware platforms, however with some minor tweaking, our builds should work on many other ARM and x86 devices.  We hope to officially support more platforms soon, and we highly encourage hacking and community builds!  Drop in our :ref:`community channels<contact>` to learn more and collaborate!!
 
 .. _sounds:
 
@@ -105,7 +105,7 @@ Sometimes, a dependency can be satisfied in multiple ways. For example, Lightnin
 
 Web User Interface (UI)
 -----------------------
-A User Interface (UI) is the way in which the user interacts with some software.  Typically, this is achieved through a graphical interface (GUI).  A WebUI is a website that is served specifically for a user to issue commands or view data.  A great example of this is embassyOS itself, which serves a WebUI for the user to add/remove services, make configurations, etc.  This is your main point of contact with EOS.
+A User Interface (UI) is the way in which the user interacts with some software.  Typically, this is achieved through a graphical interface (GUI).  A WebUI is a website that is served specifically for a user to issue commands or view data.  A great example of this is embassyOS itself, which serves a WebUI for the user to add/remove services, make configurations, etc.  This is your main point of contact with eOS.
 
 .. _interfaces:
 
diff --git a/site/source/support/faq/faq-embassy.rst b/site/source/support/faq/faq-embassy.rst
index a5a01f0..2e743d7 100644
--- a/site/source/support/faq/faq-embassy.rst
+++ b/site/source/support/faq/faq-embassy.rst
@@ -10,7 +10,7 @@ Embassy FAQ
 
 Can I run embassyOS on a VPS or VM?
 -----------------------------------
-Possibly, but we currently advise against this. It is designed to be used on a RaspberryPi, and at the moment this is the only supported way to run EOS.
+Possibly, but we currently advise against this. It is designed to be used on a RaspberryPi, and at the moment this is the only supported way to run eOS.
 
 Is it possible to use embassyOS on my own hardware?
 ---------------------------------------------------
diff --git a/site/source/support/faq/faq-service-packaging.rst b/site/source/support/faq/faq-service-packaging.rst
index c45c3ec..f148b24 100644
--- a/site/source/support/faq/faq-service-packaging.rst
+++ b/site/source/support/faq/faq-service-packaging.rst
@@ -10,7 +10,7 @@ Packaging FAQ
 
 Do I need programming experience to package a service for embassyOS?
 --------------------------------------------------------------------
-It would be helpful, but is not a pre-requisite.  Linux, dev-ops, and/or systems administration experience would all be helpful as well.  Keep in mind that everyone has to start somewhere, and perhaps your journey to development begins with packaging a service for EOS!
+It would be helpful, but is not a pre-requisite.  Linux, dev-ops, and/or systems administration experience would all be helpful as well.  Keep in mind that everyone has to start somewhere, and perhaps your journey to development begins with packaging a service for eOS!
 
 What considerations are there when choosing a service for packaging?
 --------------------------------------------------------------------