diff --git a/.gitignore b/.gitignore
index a42c4eaa189d27f5d931f7f780083bbb3973f48a..a26e73e25994deb8ca53008bdf30dd74635b2306 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@ vendor
 classes/log/error_log.txt
 composer.phar
 .idea/
-lib/*/docs/examples/*_test.json
diff --git a/lib/emitter/docs/examples/AssignmentGraded.json b/lib/emitter/docs/examples/assignment_graded.json
similarity index 100%
rename from lib/emitter/docs/examples/AssignmentGraded.json
rename to lib/emitter/docs/examples/assignment_graded.json
diff --git a/lib/emitter/docs/examples/AssignmentSubmitted.json b/lib/emitter/docs/examples/assignment_submitted.json
similarity index 100%
rename from lib/emitter/docs/examples/AssignmentSubmitted.json
rename to lib/emitter/docs/examples/assignment_submitted.json
diff --git a/lib/emitter/docs/examples/AttemptCompleted.json b/lib/emitter/docs/examples/attempt_completed.json
similarity index 100%
rename from lib/emitter/docs/examples/AttemptCompleted.json
rename to lib/emitter/docs/examples/attempt_completed.json
diff --git a/lib/emitter/docs/examples/AttemptStarted.json b/lib/emitter/docs/examples/attempt_started.json
similarity index 100%
rename from lib/emitter/docs/examples/AttemptStarted.json
rename to lib/emitter/docs/examples/attempt_started.json
diff --git a/lib/emitter/docs/examples/Attended.json b/lib/emitter/docs/examples/attended.json
similarity index 100%
rename from lib/emitter/docs/examples/Attended.json
rename to lib/emitter/docs/examples/attended.json
diff --git a/lib/emitter/docs/examples/CourseCompleted.json b/lib/emitter/docs/examples/course_completed.json
similarity index 100%
rename from lib/emitter/docs/examples/CourseCompleted.json
rename to lib/emitter/docs/examples/course_completed.json
diff --git a/lib/emitter/docs/examples/CourseViewed.json b/lib/emitter/docs/examples/course_viewed.json
similarity index 100%
rename from lib/emitter/docs/examples/CourseViewed.json
rename to lib/emitter/docs/examples/course_viewed.json
diff --git a/lib/emitter/docs/examples/DiscussionViewed.json b/lib/emitter/docs/examples/discussion_viewed.json
similarity index 100%
rename from lib/emitter/docs/examples/DiscussionViewed.json
rename to lib/emitter/docs/examples/discussion_viewed.json
diff --git a/lib/emitter/docs/examples/EnrolmentCreated.json b/lib/emitter/docs/examples/enrolment_created.json
similarity index 100%
rename from lib/emitter/docs/examples/EnrolmentCreated.json
rename to lib/emitter/docs/examples/enrolment_created.json
diff --git a/lib/emitter/docs/examples/EventEnrol.json b/lib/emitter/docs/examples/event_enrol.json
similarity index 100%
rename from lib/emitter/docs/examples/EventEnrol.json
rename to lib/emitter/docs/examples/event_enrol.json
diff --git a/lib/emitter/docs/examples/EventUnenrol.json b/lib/emitter/docs/examples/event_unenrol.json
similarity index 100%
rename from lib/emitter/docs/examples/EventUnenrol.json
rename to lib/emitter/docs/examples/event_unenrol.json
diff --git a/lib/emitter/docs/examples/ModuleViewed.json b/lib/emitter/docs/examples/module_viewed.json
similarity index 100%
rename from lib/emitter/docs/examples/ModuleViewed.json
rename to lib/emitter/docs/examples/module_viewed.json
diff --git a/lib/emitter/docs/examples/QuestionAnswered.json b/lib/emitter/docs/examples/question_answered.json
similarity index 100%
rename from lib/emitter/docs/examples/QuestionAnswered.json
rename to lib/emitter/docs/examples/question_answered.json
diff --git a/lib/emitter/docs/examples/ScormEvent.json b/lib/emitter/docs/examples/scorm_event.json
similarity index 100%
rename from lib/emitter/docs/examples/ScormEvent.json
rename to lib/emitter/docs/examples/scorm_event.json
diff --git a/lib/emitter/docs/examples/ScormLaunched.json b/lib/emitter/docs/examples/scorm_launched.json
similarity index 100%
rename from lib/emitter/docs/examples/ScormLaunched.json
rename to lib/emitter/docs/examples/scorm_launched.json
diff --git a/lib/emitter/docs/examples/ScormScorerawSubmitted.json b/lib/emitter/docs/examples/scorm_score_raw_submitted.json
similarity index 100%
rename from lib/emitter/docs/examples/ScormScorerawSubmitted.json
rename to lib/emitter/docs/examples/scorm_score_raw_submitted.json
diff --git a/lib/emitter/docs/examples/ScormStatusSubmitted.json b/lib/emitter/docs/examples/scorm_status_submitted.json
similarity index 100%
rename from lib/emitter/docs/examples/ScormStatusSubmitted.json
rename to lib/emitter/docs/examples/scorm_status_submitted.json
diff --git a/lib/emitter/docs/examples/UserLoggedin.json b/lib/emitter/docs/examples/user_loggedin.json
similarity index 100%
rename from lib/emitter/docs/examples/UserLoggedin.json
rename to lib/emitter/docs/examples/user_loggedin.json
diff --git a/lib/emitter/docs/examples/UserLoggedout.json b/lib/emitter/docs/examples/user_loggedout.json
similarity index 100%
rename from lib/emitter/docs/examples/UserLoggedout.json
rename to lib/emitter/docs/examples/user_loggedout.json
diff --git a/lib/emitter/docs/examples/UserRegistered.json b/lib/emitter/docs/examples/user_registered.json
similarity index 100%
rename from lib/emitter/docs/examples/UserRegistered.json
rename to lib/emitter/docs/examples/user_registered.json
diff --git a/lib/expander/docs/examples/AssignmentGraded.json b/lib/expander/docs/examples/assignment_graded.json
similarity index 100%
rename from lib/expander/docs/examples/AssignmentGraded.json
rename to lib/expander/docs/examples/assignment_graded.json
diff --git a/lib/expander/docs/examples/AssignmentSubmitted.json b/lib/expander/docs/examples/assignment_submitted.json
similarity index 100%
rename from lib/expander/docs/examples/AssignmentSubmitted.json
rename to lib/expander/docs/examples/assignment_submitted.json
diff --git a/lib/expander/docs/examples/AttemptEvent.json b/lib/expander/docs/examples/attempt_event.json
similarity index 100%
rename from lib/expander/docs/examples/AttemptEvent.json
rename to lib/expander/docs/examples/attempt_event.json
diff --git a/lib/expander/docs/examples/CourseCompleted.json b/lib/expander/docs/examples/course_completed.json
similarity index 100%
rename from lib/expander/docs/examples/CourseCompleted.json
rename to lib/expander/docs/examples/course_completed.json
diff --git a/lib/expander/docs/examples/DiscussionEvent.json b/lib/expander/docs/examples/discussion_event.json
similarity index 100%
rename from lib/expander/docs/examples/DiscussionEvent.json
rename to lib/expander/docs/examples/discussion_event.json
diff --git a/lib/expander/docs/examples/Event.json b/lib/expander/docs/examples/event.json
similarity index 100%
rename from lib/expander/docs/examples/Event.json
rename to lib/expander/docs/examples/event.json
diff --git a/lib/expander/docs/examples/FacetofaceAttended.json b/lib/expander/docs/examples/facetoface_attended.json
similarity index 100%
rename from lib/expander/docs/examples/FacetofaceAttended.json
rename to lib/expander/docs/examples/facetoface_attended.json
diff --git a/lib/expander/docs/examples/FacetofaceEvent.json b/lib/expander/docs/examples/facetoface_event.json
similarity index 100%
rename from lib/expander/docs/examples/FacetofaceEvent.json
rename to lib/expander/docs/examples/facetoface_event.json
diff --git a/lib/expander/docs/examples/FeedbackSubitted.json b/lib/expander/docs/examples/feedback_submitted.json
similarity index 98%
rename from lib/expander/docs/examples/FeedbackSubitted.json
rename to lib/expander/docs/examples/feedback_submitted.json
index 670bb1a67fb3dca6c4b80c2f407783a22c666b45..c3b4365c5f3e0ca5efdb34d48869c7f0fede477e 100644
--- a/lib/expander/docs/examples/FeedbackSubitted.json
+++ b/lib/expander/docs/examples/feedback_submitted.json
@@ -116,6 +116,6 @@
                 "type": "object"
             }
         },
-        "timemodified": 1497229712
+        "timemodified": 1498820609
     }
 }
\ No newline at end of file
diff --git a/lib/expander/docs/examples/ModuleEvent.json b/lib/expander/docs/examples/module_event.json
similarity index 100%
rename from lib/expander/docs/examples/ModuleEvent.json
rename to lib/expander/docs/examples/module_event.json
diff --git a/lib/expander/docs/examples/ScormLaunched.json b/lib/expander/docs/examples/scorm_launched.json
similarity index 100%
rename from lib/expander/docs/examples/ScormLaunched.json
rename to lib/expander/docs/examples/scorm_launched.json
diff --git a/lib/expander/docs/examples/ScormSubmitted.json b/lib/expander/docs/examples/scorm_submitted.json
similarity index 100%
rename from lib/expander/docs/examples/ScormSubmitted.json
rename to lib/expander/docs/examples/scorm_submitted.json
diff --git a/lib/translator/docs/examples/AssignmentGraded.json b/lib/translator/docs/examples/assignment_graded.json
similarity index 98%
rename from lib/translator/docs/examples/AssignmentGraded.json
rename to lib/translator/docs/examples/assignment_graded.json
index afd1c1ec0bfa9c70111a078e1a95e68da825d481..e2e5d475031d698af2ebae86b6ebf912949e830c 100644
--- a/lib/translator/docs/examples/AssignmentGraded.json
+++ b/lib/translator/docs/examples/assignment_graded.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/AssignmentSubmitted.json b/lib/translator/docs/examples/assignment_submitted.json
similarity index 98%
rename from lib/translator/docs/examples/AssignmentSubmitted.json
rename to lib/translator/docs/examples/assignment_submitted.json
index 8fb492b1ea500a0cc77ee1bfa74d30cbf2c0ea06..138af9bdf4edf0ee93205790796661260f819ca5 100644
--- a/lib/translator/docs/examples/AssignmentSubmitted.json
+++ b/lib/translator/docs/examples/assignment_submitted.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/AttemptAbandoned.json b/lib/translator/docs/examples/attempt_abandoned.json
similarity index 98%
rename from lib/translator/docs/examples/AttemptAbandoned.json
rename to lib/translator/docs/examples/attempt_abandoned.json
index eab5984b302a5d344c364e572f5883942bc903d7..ca97a275fcf9456c4d8c3b47a92e9e207732963d 100644
--- a/lib/translator/docs/examples/AttemptAbandoned.json
+++ b/lib/translator/docs/examples/attempt_abandoned.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/AttemptReviewed.json b/lib/translator/docs/examples/attempt_reviewed.json
similarity index 98%
rename from lib/translator/docs/examples/AttemptReviewed.json
rename to lib/translator/docs/examples/attempt_reviewed.json
index 4523ce56911611540760f4d57a1bfefb575278e9..7d909bacce4e956f7c8672d94ce08ebb6a76714b 100644
--- a/lib/translator/docs/examples/AttemptReviewed.json
+++ b/lib/translator/docs/examples/attempt_reviewed.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/AttemptStarted.json b/lib/translator/docs/examples/attempt_started.json
similarity index 98%
rename from lib/translator/docs/examples/AttemptStarted.json
rename to lib/translator/docs/examples/attempt_started.json
index 27d7deff148b7caececa30e01bdc1fb8b7961118..3c158a50135d68f8b484dbb0889764e4bf553bed 100644
--- a/lib/translator/docs/examples/AttemptStarted.json
+++ b/lib/translator/docs/examples/attempt_started.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/CourseCompleted.json b/lib/translator/docs/examples/course_completed.json
similarity index 97%
rename from lib/translator/docs/examples/CourseCompleted.json
rename to lib/translator/docs/examples/course_completed.json
index 955589cbfbbc00d15e13b1e32bc1cd39a85cff7a..132c423404e6a70ed122745089b802eca2b86aea 100644
--- a/lib/translator/docs/examples/CourseCompleted.json
+++ b/lib/translator/docs/examples/course_completed.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/CourseViewed.json b/lib/translator/docs/examples/course_viewed.json
similarity index 97%
rename from lib/translator/docs/examples/CourseViewed.json
rename to lib/translator/docs/examples/course_viewed.json
index a0be8d68595bd1fe3f4170258f238a0753aee8b5..16ca2738106e26be31ea2dc2c0649738e437f1df 100644
--- a/lib/translator/docs/examples/CourseViewed.json
+++ b/lib/translator/docs/examples/course_viewed.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/DiscussionViewed.json b/lib/translator/docs/examples/discussion_viewed.json
similarity index 98%
rename from lib/translator/docs/examples/DiscussionViewed.json
rename to lib/translator/docs/examples/discussion_viewed.json
index 860c1d12cb95b3155b50979846f6c19a8c4176e9..dc5fa14a439b317dc8efc9d69572b84dafb43f46 100644
--- a/lib/translator/docs/examples/DiscussionViewed.json
+++ b/lib/translator/docs/examples/discussion_viewed.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/EnrolmentCreated.json b/lib/translator/docs/examples/enrolment_created.json
similarity index 98%
rename from lib/translator/docs/examples/EnrolmentCreated.json
rename to lib/translator/docs/examples/enrolment_created.json
index 5aa788c76e28f83e0dbb629c12362c46fbc135d9..3f6217d8667726d664488ae2e5a900ddede76263 100644
--- a/lib/translator/docs/examples/EnrolmentCreated.json
+++ b/lib/translator/docs/examples/enrolment_created.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/FacetofaceAttend.json b/lib/translator/docs/examples/facetoface_attend.json
similarity index 98%
rename from lib/translator/docs/examples/FacetofaceAttend.json
rename to lib/translator/docs/examples/facetoface_attend.json
index fbcb198879f260f89d8c9b672c07800be2aa58f0..578ec28311d59b5d04f643c77d1a9ec06995a6f8 100644
--- a/lib/translator/docs/examples/FacetofaceAttend.json
+++ b/lib/translator/docs/examples/facetoface_attend.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/FacetofaceEnrol.json b/lib/translator/docs/examples/facetoface_enrol.json
similarity index 98%
rename from lib/translator/docs/examples/FacetofaceEnrol.json
rename to lib/translator/docs/examples/facetoface_enrol.json
index 2d7f93547e9186ff706d3a33a0bc8d08e0ac4a31..dede05bb66ece98b231fa4434576f7aa9cf062ba 100644
--- a/lib/translator/docs/examples/FacetofaceEnrol.json
+++ b/lib/translator/docs/examples/facetoface_enrol.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/FacetofaceUnenrol.json b/lib/translator/docs/examples/facetoface_unenrol.json
similarity index 98%
rename from lib/translator/docs/examples/FacetofaceUnenrol.json
rename to lib/translator/docs/examples/facetoface_unenrol.json
index cc59c2a04ac4c125817c2ca56ca8edd45794c347..0bdb2cb74b83a19e0fdd104606e28af3462ebbfd 100644
--- a/lib/translator/docs/examples/FacetofaceUnenrol.json
+++ b/lib/translator/docs/examples/facetoface_unenrol.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/FeedbackQuestionSubmitted.json b/lib/translator/docs/examples/feedback_question_submitted.json
similarity index 99%
rename from lib/translator/docs/examples/FeedbackQuestionSubmitted.json
rename to lib/translator/docs/examples/feedback_question_submitted.json
index 8123a6ceb7e8d7ac3cb5629f7e2b7d81bee77958..9ee7cfc1d8e5f680dfd4631feccb401fe7bad0ef 100644
--- a/lib/translator/docs/examples/FeedbackQuestionSubmitted.json
+++ b/lib/translator/docs/examples/feedback_question_submitted.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/FeedbackSubmitted.json b/lib/translator/docs/examples/feedback_submitted.json
similarity index 98%
rename from lib/translator/docs/examples/FeedbackSubmitted.json
rename to lib/translator/docs/examples/feedback_submitted.json
index 2232bd3d00d715511156ee8f9c13422f1154ae2b..0c2f6b47691f98cf582f32ca2dcdb0ee22bdac3f 100644
--- a/lib/translator/docs/examples/FeedbackSubmitted.json
+++ b/lib/translator/docs/examples/feedback_submitted.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/ModuleViewed.json b/lib/translator/docs/examples/module_viewed.json
similarity index 98%
rename from lib/translator/docs/examples/ModuleViewed.json
rename to lib/translator/docs/examples/module_viewed.json
index 9c2a274f60585bdce904cdd5c3e5da4aed516028..7de7c5c7f48c641bd428aa1cae594ebc41023d1a 100644
--- a/lib/translator/docs/examples/ModuleViewed.json
+++ b/lib/translator/docs/examples/module_viewed.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/QuestionSubmitted.json b/lib/translator/docs/examples/question_submitted.json
similarity index 99%
rename from lib/translator/docs/examples/QuestionSubmitted.json
rename to lib/translator/docs/examples/question_submitted.json
index b14f30818cdf3ffc84d44e4d1b729aa0a382f772..1bd6a2a0f86181530479a174e2c1b779798b4fcf 100644
--- a/lib/translator/docs/examples/QuestionSubmitted.json
+++ b/lib/translator/docs/examples/question_submitted.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/ScormEvent.json b/lib/translator/docs/examples/scorm_event.json
similarity index 98%
rename from lib/translator/docs/examples/ScormEvent.json
rename to lib/translator/docs/examples/scorm_event.json
index cb2b12267a7645e9eccb60f352b95cbd5fc04e9b..fe65e0492ebe81c49d34f4474aa01c1855caa731 100644
--- a/lib/translator/docs/examples/ScormEvent.json
+++ b/lib/translator/docs/examples/scorm_event.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/ScormLaunched.json b/lib/translator/docs/examples/scorm_launched.json
similarity index 98%
rename from lib/translator/docs/examples/ScormLaunched.json
rename to lib/translator/docs/examples/scorm_launched.json
index 042bd45396563e27fbdad3e7ff81f9af2872d023..3e3cb5c2dcc10e7a1d77300918c8c010d9c834d7 100644
--- a/lib/translator/docs/examples/ScormLaunched.json
+++ b/lib/translator/docs/examples/scorm_launched.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/ScormScorerawSubmitted.json b/lib/translator/docs/examples/scorm_score_raw_submitted.json
similarity index 98%
rename from lib/translator/docs/examples/ScormScorerawSubmitted.json
rename to lib/translator/docs/examples/scorm_score_raw_submitted.json
index ee1da0f3106fb26c8e24bc99efa40da88d6832dd..295e201cfde95bec9ac880a959dbc3ccb4fd79e1 100644
--- a/lib/translator/docs/examples/ScormScorerawSubmitted.json
+++ b/lib/translator/docs/examples/scorm_score_raw_submitted.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/ScormStatusSubmitted.json b/lib/translator/docs/examples/scorm_status_submitted.json
similarity index 98%
rename from lib/translator/docs/examples/ScormStatusSubmitted.json
rename to lib/translator/docs/examples/scorm_status_submitted.json
index 67d417a27895cf659318516a9252ca7a659317f0..561915a31678e8a8327e5cd4d12540202a3223bb 100644
--- a/lib/translator/docs/examples/ScormStatusSubmitted.json
+++ b/lib/translator/docs/examples/scorm_status_submitted.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/UserLoggedin.json b/lib/translator/docs/examples/user_loggedin.json
similarity index 97%
rename from lib/translator/docs/examples/UserLoggedin.json
rename to lib/translator/docs/examples/user_loggedin.json
index 5336b8d0de1626309d0996059c991b862b9978b5..4f76e5324491df5b78c22ad95999d846044b989a 100644
--- a/lib/translator/docs/examples/UserLoggedin.json
+++ b/lib/translator/docs/examples/user_loggedin.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/UserLoggedout.json b/lib/translator/docs/examples/user_loggedout.json
similarity index 97%
rename from lib/translator/docs/examples/UserLoggedout.json
rename to lib/translator/docs/examples/user_loggedout.json
index ddeaa573d565b98ed7e2e2dcef916fa2538d3620..c1ac6f6358e5ce8b80b2d72e3243abc5d7a5beec 100644
--- a/lib/translator/docs/examples/UserLoggedout.json
+++ b/lib/translator/docs/examples/user_loggedout.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/lib/translator/docs/examples/UserRegistered.json b/lib/translator/docs/examples/user_registered.json
similarity index 97%
rename from lib/translator/docs/examples/UserRegistered.json
rename to lib/translator/docs/examples/user_registered.json
index b8737cc81ebfe997819f208536c3e14e4fcfc356..9a75d891f16d888c95f507e48e7c602299c7969e 100644
--- a/lib/translator/docs/examples/UserRegistered.json
+++ b/lib/translator/docs/examples/user_registered.json
@@ -13,7 +13,7 @@
     "context_info": {
         "https:\/\/moodle.org\/": "1.0.0"
     },
-    "time": "2015-06-10T14:31:41+00:00",
+    "time": "2015-06-10T22:31:41+08:00",
     "app_url": "http:\/\/www.example.com",
     "app_name": "Test site_fullname",
     "app_description": "Test site_summary",
diff --git a/tests/lib/emitter/event_test.php b/tests/lib/emitter/event_test.php
index 45d7fbd70d5bdfbef7118c5a9a0e52886299bd88..c0985ab9d5cb939f2925525e2794db8267ef7e18 100644
--- a/tests/lib/emitter/event_test.php
+++ b/tests/lib/emitter/event_test.php
@@ -223,7 +223,7 @@ abstract class event_test extends \advanced_testcase {
 
     protected function create_example_file($output) {
         $classarray = explode('\\', get_class($this));
-        $eventname = str_replace('Test', '', array_pop($classarray));
+        $eventname = str_replace('_test', '', array_pop($classarray));
         $examplefile = __DIR__ . '/../../../lib/emitter/docs/examples/' . $eventname . '.json';
         file_put_contents($examplefile, json_encode($output, JSON_PRETTY_PRINT));
     }
diff --git a/tests/lib/expander/event_test.php b/tests/lib/expander/event_test.php
index 7276449d546fef39dc770fd1d2dc498f8bfbeabe..a84d52473eb133cd8800b3686927f242fa108209 100644
--- a/tests/lib/expander/event_test.php
+++ b/tests/lib/expander/event_test.php
@@ -111,7 +111,7 @@ class event_test extends \advanced_testcase {
 
     protected function create_example_file($output) {
         $classarray = explode('\\', get_class($this));
-        $eventname = str_replace('Test', '', array_pop($classarray));
+        $eventname = str_replace('_test', '', array_pop($classarray));
         $examplefile = __DIR__ . '/../../../lib/expander/docs/examples/' . $eventname . '.json';
         file_put_contents($examplefile, json_encode($output, JSON_PRETTY_PRINT));
     }
diff --git a/tests/lib/translator/event_test.php b/tests/lib/translator/event_test.php
index 31417fddf995df42aeedc1d91b25bc8897a5eb47..14349b6a79ed756c041ee24fb25fe3c44e891c8a 100644
--- a/tests/lib/translator/event_test.php
+++ b/tests/lib/translator/event_test.php
@@ -185,7 +185,7 @@ abstract class event_test extends \advanced_testcase {
 
     protected function create_example_file($output) {
         $classarray = explode('\\', get_class($this));
-        $eventname = str_replace('Test', '', array_pop($classarray));
+        $eventname = str_replace('_test', '', array_pop($classarray));
         $examplefile = __DIR__ . '/../../../lib/translator/docs/examples/' . $eventname . '.json';
         file_put_contents($examplefile, json_encode($output, JSON_PRETTY_PRINT));
     }