diff --git a/Example01_simple_message_flow.mp b/Example01_SimpleMessageFlow_EventCoordination.mp
similarity index 100%
rename from Example01_simple_message_flow.mp
rename to Example01_SimpleMessageFlow_EventCoordination.mp
diff --git a/Example01a_unreliable_message_flow.mp b/Example01a_UnreliableMessageFlow_VirtualEvents.mp
similarity index 100%
rename from Example01a_unreliable_message_flow.mp
rename to Example01a_UnreliableMessageFlow_VirtualEvents.mp
diff --git a/Example02_Data_flow.mp b/Example02_DataFlow_EventSharing.mp
similarity index 100%
rename from Example02_Data_flow.mp
rename to Example02_DataFlow_EventSharing.mp
diff --git a/Example03_ATM_withdrawal.mp b/Example03_ATMWithdrawal_BehaviorOfEnvironment.mp
similarity index 100%
rename from Example03_ATM_withdrawal.mp
rename to Example03_ATMWithdrawal_BehaviorOfEnvironment.mp
diff --git a/Example04_Stack_behavior.mp b/Example04b_QueueBehavior_UserDefinedRelations.mp
similarity index 100%
rename from Example04_Stack_behavior.mp
rename to Example04b_QueueBehavior_UserDefinedRelations.mp
diff --git a/Example05_Car_Race.mp b/Example05_CarRace_NestedComposition.mp
similarity index 100%
rename from Example05_Car_Race.mp
rename to Example05_CarRace_NestedComposition.mp
diff --git a/Example06_Assertion_Checking.mp b/Example06_UnreliableChannel_AssertionChecking.mp
similarity index 100%
rename from Example06_Assertion_Checking.mp
rename to Example06_UnreliableChannel_AssertionChecking.mp
diff --git a/Example07_Unconstrained_Stack.mp b/Example07_UnconstrainedStack_TraceAnnotation.mp
similarity index 100%
rename from Example07_Unconstrained_Stack.mp
rename to Example07_UnconstrainedStack_TraceAnnotation.mp
diff --git a/Example09_Employee_Employer.mp b/Example08_EmployeeEmployer_CoordinationAcrossHierarchyLevels.mp
similarity index 100%
rename from Example09_Employee_Employer.mp
rename to Example08_EmployeeEmployer_CoordinationAcrossHierarchyLevels.mp
diff --git a/Example10_Pipe_Filter.mp b/Example09_PipeFilter_TraceAnnotationQueries.mp
similarity index 100%
rename from Example10_Pipe_Filter.mp
rename to Example09_PipeFilter_TraceAnnotationQueries.mp
diff --git a/Example11_Publish_Subscribe.mp b/Example10_PublishSubscribe_EventReshuffling.mp
similarity index 100%
rename from Example11_Publish_Subscribe.mp
rename to Example10_PublishSubscribe_EventReshuffling.mp
diff --git a/Example12_network_topology_ring.mp b/Example11_RingTopology_UserDefinedRelations.mp
similarity index 100%
rename from Example12_network_topology_ring.mp
rename to Example11_RingTopology_UserDefinedRelations.mp
diff --git a/Example18_Workflow_pattern.mp b/Example12_CardiacArrestWorkflow_VirtualEvents.mp
similarity index 100%
rename from Example18_Workflow_pattern.mp
rename to Example12_CardiacArrestWorkflow_VirtualEvents.mp
diff --git a/Example19_Consumers_Suppliers.mp b/Example13_ConsumersSuppliers_DependencyTracking.mp
similarity index 100%
rename from Example19_Consumers_Suppliers.mp
rename to Example13_ConsumersSuppliers_DependencyTracking.mp
diff --git a/Example23_number_attributes.mp b/Example14_ShoppingSpree_NumberAttributes.mp
similarity index 100%
rename from Example23_number_attributes.mp
rename to Example14_ShoppingSpree_NumberAttributes.mp
diff --git a/Example25_interval_attributes.mp b/Example15_BackpackWeight_IntervalAttributes.mp
similarity index 100%
rename from Example25_interval_attributes.mp
rename to Example15_BackpackWeight_IntervalAttributes.mp
diff --git a/Example24_Bayesian_probability.mp b/Example18_RedGreen_BayesianProbabilityCalculationsType2.mp
similarity index 100%
rename from Example24_Bayesian_probability.mp
rename to Example18_RedGreen_BayesianProbabilityCalculationsType2.mp
diff --git a/Example29_stack1_Bayesian_probability.mp b/Example19_StackBehavior_BayesianProbabilityCalculationsType2.mp
similarity index 100%
rename from Example29_stack1_Bayesian_probability.mp
rename to Example19_StackBehavior_BayesianProbabilityCalculationsType2.mp
diff --git a/Example30_Local_Report.mp b/Example21_DataFlow_LocalReport.mp
similarity index 100%
rename from Example30_Local_Report.mp
rename to Example21_DataFlow_LocalReport.mp
diff --git a/Example08_Operational_Process.mp b/Operational_Process.mp
similarity index 100%
rename from Example08_Operational_Process.mp
rename to Operational_Process.mp