diff --git a/doc/upstream-training/source/00-00-introduction.rst b/doc/upstream-training/source/00-00-introduction.rst
index 1f0e6efa..a346496e 100644
--- a/doc/upstream-training/source/00-00-introduction.rst
+++ b/doc/upstream-training/source/00-00-introduction.rst
@@ -11,7 +11,7 @@ About the training
 
 - It is about
 
-  - Open Collaboration
+  - Open collaboration
   - Learn about the community
   - Learn how to participate in OpenStack
   - Interactive, hands-on class
diff --git a/doc/upstream-training/source/00-01-openstack-as-software.rst b/doc/upstream-training/source/00-01-openstack-as-software.rst
index 4378ab9f..2494927a 100644
--- a/doc/upstream-training/source/00-01-openstack-as-software.rst
+++ b/doc/upstream-training/source/00-01-openstack-as-software.rst
@@ -37,7 +37,7 @@ The OpenStack Package
 OpenStack from Telecom/NFV perspective
 ======================================
 
-- NFV = Network Function Virtualisation
+- NFV = Network Function Virtualization
 
 .. image:: ./_assets/etsi-nfv-arch-framework.png
    :width: 75%
@@ -47,10 +47,10 @@ OpenStack from Telecom/NFV perspective
 
 - Virtual Infrastructure Manager (VIM) + NFV Infratsructure (NFVI)
 
-  - Most of the OpenStack Services
+  - Most of the OpenStack services
 
 - Virtual Network Functions Manager (VNFM)
 
-  - Heat
-  - Murano
-  - Mistral
+  - Orchestration service
+  - Application Catalog service
+  - Workflow service
diff --git a/doc/upstream-training/source/00-02-openstack-as-community.rst b/doc/upstream-training/source/00-02-openstack-as-community.rst
index d7688c19..6b8138a2 100644
--- a/doc/upstream-training/source/00-02-openstack-as-community.rst
+++ b/doc/upstream-training/source/00-02-openstack-as-community.rst
@@ -22,7 +22,9 @@ Four "open"s
 - Open Design
 - Open Development
 - Open Community
-- Find more information on the `Governance wiki <http://governance.openstack.org/reference/opens.html>`_
+- More information: Governance page
+
+  - http://governance.openstack.org/reference/opens.html
 
 Framework
 =========
@@ -40,7 +42,7 @@ Framework
 
   - Wiki
   - IRC
-  - etherpad
+  - Etherpad
 
 Life in and around OpenStack
 ============================