diff --git a/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/AnalogIn.cpp b/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/AnalogIn-js.cpp
similarity index 100%
rename from targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/AnalogIn.cpp
rename to targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/AnalogIn-js.cpp
diff --git a/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/DigitalOut.cpp b/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/DigitalOut-js.cpp
similarity index 100%
rename from targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/DigitalOut.cpp
rename to targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/DigitalOut-js.cpp
diff --git a/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/I2C.cpp b/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/I2C-js.cpp
similarity index 100%
rename from targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/I2C.cpp
rename to targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/I2C-js.cpp
diff --git a/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/InterruptIn.cpp b/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/InterruptIn-js.cpp
similarity index 100%
rename from targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/InterruptIn.cpp
rename to targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/InterruptIn-js.cpp
diff --git a/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/PwmOut.cpp b/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/PwmOut-js.cpp
similarity index 100%
rename from targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/PwmOut.cpp
rename to targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/PwmOut-js.cpp
diff --git a/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/assert.cpp b/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/assert-js.cpp
similarity index 100%
rename from targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/assert.cpp
rename to targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/assert-js.cpp
diff --git a/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/gc.cpp b/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/gc-js.cpp
similarity index 100%
rename from targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/gc.cpp
rename to targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/gc-js.cpp
diff --git a/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/setInterval.cpp b/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/setInterval-js.cpp
similarity index 100%
rename from targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/setInterval.cpp
rename to targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/setInterval-js.cpp
diff --git a/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/setTimeout.cpp b/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/setTimeout-js.cpp
similarity index 100%
rename from targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/setTimeout.cpp
rename to targets/mbedos5/jerryscript-mbed/jerryscript-mbed-drivers/source/setTimeout-js.cpp
diff --git a/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-event-loop/EventLoop.h b/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-event-loop/EventLoop.h
index 2b810c1366..f230e9914a 100644
--- a/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-event-loop/EventLoop.h
+++ b/targets/mbedos5/jerryscript-mbed/jerryscript-mbed-event-loop/EventLoop.h
@@ -22,7 +22,7 @@
 #include "Callback.h"
 #include "mbed_assert.h"
 
-#include "mbed-events/EventQueue.h"
+#include "events/EventQueue.h"
 
 #include "jerryscript-mbed-util/logging.h"
 #include "jerryscript-mbed-event-loop/BoundCallback.h"
diff --git a/targets/mbedos5/mbed-events.lib b/targets/mbedos5/mbed-events.lib
deleted file mode 100644
index 2fdfa9da44..0000000000
--- a/targets/mbedos5/mbed-events.lib
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/ARMmbed/mbed-events/#a4ba1b08ef90e2b3b6d442696f4d80a8587494e3
diff --git a/targets/mbedos5/mbed-os.lib b/targets/mbedos5/mbed-os.lib
index 60a60347c9..bb39175869 100644
--- a/targets/mbedos5/mbed-os.lib
+++ b/targets/mbedos5/mbed-os.lib
@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-os/#bdab10dc0f90748b6989c8b577771bb403ca6bd8
+https://github.com/ARMmbed/mbed-os/#d5de476f74dd4de27012eb74ede078f6330dfc3f
diff --git a/targets/mbedos5/source/main.cpp b/targets/mbedos5/source/main.cpp
deleted file mode 100644
index 2ac49e98c1..0000000000
--- a/targets/mbedos5/source/main.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright JS Foundation and other contributors, http://js.foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Provides jsmbed_js_launch()
-#include "jerryscript-mbed-launcher/launcher.h"
-
-// Provides JSMBED_USE_WRAPPER()
-#include "jerryscript-mbed-library-registry/registry.h"
-
-// Provides the base wrapper registration symbol that JSMBED_USE_WRAPPER uses.
-// This means all of the base handlers will be registered.
-#include "jerryscript-mbed-drivers/lib_drivers.h"
-
-#include "jerryscript-mbed-event-loop/EventLoop.h"
-
-#include "Callback.h"
-#include "Serial.h"
-
-using mbed::js::EventLoop;
-using mbed::Callback;
-
-int main() {
-    mbed::Serial pc(USBTX, USBRX);
-    pc.baud(115200);
-
-    JERRY_USE_MBED_LIBRARY(base);
-
-    // Incude more wrapper packages here if you want to use them. For exmaple:
-    // JERRY_USE_MBED_LIBRARY(lwip_interface);
-    // JERRY_USE_MBED_LIBRARY(esp8266_interface);
-    // JERRY_USE_MBED_LIBRARY(simple_mbed_client);
-
-    jsmbed_js_launch();
-
-    return 0;
-}