diff --git a/demos/java/lateBindingDemo.props b/demos/java/example6LateBindingMutualInfo.props
similarity index 100%
rename from demos/java/lateBindingDemo.props
rename to demos/java/example6LateBindingMutualInfo.props
diff --git a/demos/java/lateBindingDemo.sh b/demos/java/example6LateBindingMutualInfo.sh
similarity index 100%
rename from demos/java/lateBindingDemo.sh
rename to demos/java/example6LateBindingMutualInfo.sh
diff --git a/demos/java/infodynamics/demos/lateBindingMutualInfo.java b/demos/java/infodynamics/demos/Example6DLateBindingMutualInfo.java
similarity index 100%
rename from demos/java/infodynamics/demos/lateBindingMutualInfo.java
rename to demos/java/infodynamics/demos/Example6DLateBindingMutualInfo.java
diff --git a/demos/octave/example6DynamicCallingMutualInfo.m b/demos/octave/example6DynamicCallingMutualInfo.m
index 9325c7e..a018ce7 100755
--- a/demos/octave/example6DynamicCallingMutualInfo.m
+++ b/demos/octave/example6DynamicCallingMutualInfo.m
@@ -37,12 +37,14 @@ data = load(datafile);
 variable1 = data(:, variable1Columns);
 variable2 = data(:, variable2Columns);
 
+%---------------------
 % 3. Dynamically instantiate an object of the given class:
 % (in fact, all java object creation in octave/matlab is dynamic - it has to be,
 %  since the languages are interpreted. This makes our life slightly easier at this
 %  point than it is in demos/java/lateBindingDemo where we have to handle this manually)
 miCalc = javaObject(implementingClass);
 
+%---------------------
 % 4. Start using the MI calculator, paying attention to only
 %  call common methods defined in the interface type
 %  infodynamics.measures.continuous.MutualInfoCalculatorMultiVariate