diff --git a/events/include/events/Event.h b/events/include/events/Event.h
index cf7b981c97..8598fafef8 100755
--- a/events/include/events/Event.h
+++ b/events/include/events/Event.h
@@ -70,7 +70,7 @@ public:
             _event->equeue = &q->_equeue;
             _event->id = 0;
             _event->delay = duration(0);
-            _event->period = events::non_periodic;
+            _event->period = non_periodic;
 
             _event->post = &Event::event_post<F>;
             _event->dtor = &Event::event_dtor<F>;
@@ -154,11 +154,11 @@ public:
                 _event->period = p;            
             }
             else {
-                if (p != events::non_periodic) {
+                if (p != non_periodic) {
                     MBED_WARNING(MBED_ERROR_INVALID_ARGUMENT,
                                  "Invalid period specified, defaulting to non_periodic.");
                 }
-                _event->period = events::non_periodic;                
+                _event->period = non_periodic;                
             }
         }
     }
diff --git a/events/tests/TESTS/events/queue/main.cpp b/events/tests/TESTS/events/queue/main.cpp
index 67a62557ab..6c88823e47 100755
--- a/events/tests/TESTS/events/queue/main.cpp
+++ b/events/tests/TESTS/events/queue/main.cpp
@@ -518,7 +518,7 @@ void handler()
 
 void event_period_tests()
 {
-     // Test a non periodic event ie dispatched only once
+    // Test a non periodic event ie dispatched only once
     
     Event<void()> event1(&period_tests_queue, handler);