diff --git a/structurizr-core/src/com/structurizr/view/View.java b/structurizr-core/src/com/structurizr/view/View.java
index 75578576..3fd6619e 100644
--- a/structurizr-core/src/com/structurizr/view/View.java
+++ b/structurizr-core/src/com/structurizr/view/View.java
@@ -35,7 +35,7 @@ public abstract class View {
         if (key != null && key.trim().length() > 0) {
             setKey(key);
         } else {
-            throw new IllegalArgumentException("A key must be specified");
+            throw new IllegalArgumentException("A key must be specified.");
         }
         setDescription(description);
     }
diff --git a/structurizr-examples/src/com/structurizr/example/core/MessageBusExample.java b/structurizr-examples/src/com/structurizr/example/core/MessageBusExample.java
index 8d3608dc..59b366c2 100644
--- a/structurizr-examples/src/com/structurizr/example/core/MessageBusExample.java
+++ b/structurizr-examples/src/com/structurizr/example/core/MessageBusExample.java
@@ -47,10 +47,10 @@ public static void main(String[] args) throws Exception {
 
         ViewSet views = workspace.getViews();
 
-        ContainerView containerView = views.createContainerView(mySoftwareSystem, "containers", null);
+        ContainerView containerView = views.createContainerView(mySoftwareSystem, "Containers", null);
         containerView.addAllElements();
 
-        DynamicView dynamicView = views.createDynamicView(mySoftwareSystem, "Business Event X", "This diagram shows what happens when business event X is received.");
+        DynamicView dynamicView = views.createDynamicView(mySoftwareSystem, "BusinessEventX", "This diagram shows what happens when business event X is received.");
         dynamicView.add(microserviceA, messageBus);
         dynamicView.startChildSequence();
         dynamicView.add(messageBus, microserviceB);
diff --git a/structurizr-examples/src/com/structurizr/example/core/financialrisksystem/FinancialRiskSystem.java b/structurizr-examples/src/com/structurizr/example/core/financialrisksystem/FinancialRiskSystem.java
index 6bcb1b59..2767c9c5 100644
--- a/structurizr-examples/src/com/structurizr/example/core/financialrisksystem/FinancialRiskSystem.java
+++ b/structurizr-examples/src/com/structurizr/example/core/financialrisksystem/FinancialRiskSystem.java
@@ -52,7 +52,7 @@ public static void main(String[] args) throws Exception {
 
         // create some views
         ViewSet viewSet = workspace.getViews();
-        SystemContextView contextView = viewSet.createSystemContextView(financialRiskSystem, "context", "An example System Context diagram for the Financial Risk System architecture kata.");
+        SystemContextView contextView = viewSet.createSystemContextView(financialRiskSystem, "Context", "An example System Context diagram for the Financial Risk System architecture kata.");
         contextView.addAllSoftwareSystems();
         contextView.addAllPeople();
 
diff --git a/structurizr-examples/src/com/structurizr/example/core/financialrisksystem/context.md b/structurizr-examples/src/com/structurizr/example/core/financialrisksystem/context.md
index 2c9ab03c..573dc953 100644
--- a/structurizr-examples/src/com/structurizr/example/core/financialrisksystem/context.md
+++ b/structurizr-examples/src/com/structurizr/example/core/financialrisksystem/context.md
@@ -1,6 +1,6 @@
 A global investment bank based in London, New York and Singapore trades (buys and sells) financial products with other banks (counterparties). When share prices on the stock markets move up or down, the bank either makes money or loses it. At the end of the working day, the bank needs to gain a view of how much risk they are exposed to (e.g. of losing money) by running some calculations on the data held about their trades. The bank has an existing Trade Data System (TDS) and Reference Data System (RDS) but need a new Risk System.
 
-![](embed:1)
+![](embed:Context)
 
 ## Trade Data System
 
diff --git a/structurizr-examples/src/com/structurizr/example/spring/petclinic/SpringPetClinic.java b/structurizr-examples/src/com/structurizr/example/spring/petclinic/SpringPetClinic.java
index 058eb267..9c08cf26 100644
--- a/structurizr-examples/src/com/structurizr/example/spring/petclinic/SpringPetClinic.java
+++ b/structurizr-examples/src/com/structurizr/example/spring/petclinic/SpringPetClinic.java
@@ -107,7 +107,7 @@ public static void main(String[] args) throws Exception {
         Component clinicService = webApplication.getComponentWithName("ClinicService");
         Component vetRepository = webApplication.getComponentWithName("VetRepository");
 
-        DynamicView dynamicView = viewSet.createDynamicView(springPetClinic, "View List Of Vets", "Shows how the \"view list of vets\" feature works.");
+        DynamicView dynamicView = viewSet.createDynamicView(springPetClinic, "viewListOfVets", "Shows how the \"view list of vets\" feature works.");
         dynamicView.add(clinicEmployee, "Requests list of vets from /vets", vetController);
         dynamicView.add(vetController, "Calls findVets", clinicService);
         dynamicView.add(clinicService, "Calls findAll", vetRepository);