diff --git a/.orchestra/config/components.yml b/.orchestra/config/components.yml
index 0769dad89502d7c840464f5b0b804a8785aa197f..51a310a4a7479411aa7012c7a457c184c655a4ec 100644
--- a/.orchestra/config/components.yml
+++ b/.orchestra/config/components.yml
@@ -11,8 +11,8 @@ add_to_path:
   - $ORCHESTRA_DOTDIR/support
 environment:
   - JOBS: #@ str(data.values.parallelism)
-  #! TODO: maybe patching RPATH should not be a concern of Orchestra itself, but rather a post-install phase
-  #!       Otherwise, it should be Orchestra to provide an RPATH_PLACEHOLDER, not the other way around
+  #! TODO: maybe patching RPATH should not be a concern of orchestra itself, but rather a post-install phase
+  #!       Otherwise, it should be orchestra to provide an RPATH_PLACEHOLDER, not the other way around
   - RPATH_PLACEHOLDER: #@ options["rpath_placeholder"]
   - QML2_IMPORT_PATH: $ORCHESTRA_ROOT/qml
   - QT_PLUGIN_PATH: $ORCHESTRA_ROOT/plugins
diff --git a/.orchestra/config/components/ui/qt_creator.yml b/.orchestra/config/components/ui/qt_creator.yml
index a1f0f9c6d6b854f1185ada94212453f59299f6c3..895ad511d43cfbaf33d06778902185f0d350947b 100644
--- a/.orchestra/config/components/ui/qt_creator.yml
+++ b/.orchestra/config/components/ui/qt_creator.yml
@@ -21,7 +21,7 @@
 #@yaml/text-templated-strings
 ---
 #@ def _configure_base(extra_qmake_args=[]):
-#! TODO: In legacy Orchestra QMAKE_RPATHDIR has +="" in debug and release but ="" in optimized. Is it intentional?
+#! TODO: In legacy orchestra QMAKE_RPATHDIR has +="" in debug and release but ="" in optimized. Is it intentional?
 - |
   mkdir -p "$BUILD_DIR"
   cd "$BUILD_DIR";
diff --git a/README.md b/README.md
index 2c715eebf00f5912e27f59ab0fb802b62c22754b..3423858198d08f5e685121672e03d5e39341d73a 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# rev.ng Orchestra config
+# rev.ng orchestra config
 
-This repository contains the Orchestra configuration for rev.ng.
+This repository contains the orchestra configuration for rev.ng.
 
 To get started:
 
-* install Orchestra (follow the  instructions in its repo)
+* install orchestra (follow the  instructions in its repo)
 * run `orchestra components` to generate the default user configuration
 * edit `.orchestra/config/user_remotes.yml` to add your remotes, like so:
   ```
diff --git a/docs/writing_components.md b/docs/writing_components.md
index dd04728a7b887af20e8916d3e9b7c1272e54352b..3c186fe9f9accf39c75bc8632c37d7af81b710e9 100644
--- a/docs/writing_components.md
+++ b/docs/writing_components.md
@@ -1,10 +1,10 @@
 # Writing a component
 
 This document explains the conventions used in this configuration.
-Before reading it you should read Orchestra documentation
-and understand the configuration format used by Orchestra.
+Before reading it you should read orchestra documentation
+and understand the configuration format used by orchestra.
 
-TL;DR: an Orchestra configuration is a collection of **components** and other options.
+TL;DR: an orchestra configuration is a collection of **components** and other options.
 Components consist mainly of a collection of builds.
 
 ```yaml