diff --git a/asyncio_micro/metadata.txt b/uasyncio/metadata.txt
similarity index 94%
rename from asyncio_micro/metadata.txt
rename to uasyncio/metadata.txt
index bc3d83e4..bc22759b 100644
--- a/asyncio_micro/metadata.txt
+++ b/uasyncio/metadata.txt
@@ -1,6 +1,6 @@
 srctype = micropython-lib
 type = module
-version = 0.5
+version = 0.6
 author = Paul Sokolovsky
 long_desc = Lightweight asyncio-like library built around native Python coroutines, not around un-Python devices like callback mess.
 depends = heapq, errno, select, logging
diff --git a/asyncio_micro/setup.py b/uasyncio/setup.py
similarity index 81%
rename from asyncio_micro/setup.py
rename to uasyncio/setup.py
index f0e017f2..2bf389e2 100644
--- a/asyncio_micro/setup.py
+++ b/uasyncio/setup.py
@@ -5,9 +5,9 @@ sys.path.pop(0)
 from setuptools import setup
 
 
-setup(name='micropython-asyncio_micro',
-      version='0.5',
-      description='asyncio_micro module for MicroPython',
+setup(name='micropython-uasyncio',
+      version='0.6',
+      description='uasyncio module for MicroPython',
       long_description='Lightweight asyncio-like library built around native Python coroutines, not around un-Python devices like callback mess.',
       url='https://github.com/micropython/micropython/issues/405',
       author='Paul Sokolovsky',
@@ -15,5 +15,5 @@ setup(name='micropython-asyncio_micro',
       maintainer='MicroPython Developers',
       maintainer_email='micro-python@googlegroups.com',
       license='MIT',
-      py_modules=['asyncio_micro'],
+      py_modules=['uasyncio'],
       install_requires=['micropython-heapq', 'micropython-errno', 'micropython-select', 'micropython-logging'])
diff --git a/asyncio_micro/test_call_soon.py b/uasyncio/test_call_soon.py
similarity index 83%
rename from asyncio_micro/test_call_soon.py
rename to uasyncio/test_call_soon.py
index 42a169cf..99ccfefb 100644
--- a/asyncio_micro/test_call_soon.py
+++ b/uasyncio/test_call_soon.py
@@ -1,4 +1,4 @@
-import asyncio_micro as asyncio
+import uasyncio as asyncio
 import time
 
 
diff --git a/asyncio_micro/test_http_client.py b/uasyncio/test_http_client.py
similarity index 95%
rename from asyncio_micro/test_http_client.py
rename to uasyncio/test_http_client.py
index e83cf859..0b4ff83b 100644
--- a/asyncio_micro/test_http_client.py
+++ b/uasyncio/test_http_client.py
@@ -1,4 +1,4 @@
-import asyncio_micro as asyncio
+import uasyncio as asyncio
 
 @asyncio.coroutine
 def print_http_headers(url):
diff --git a/asyncio_micro/test_http_server.py b/uasyncio/test_http_server.py
similarity index 94%
rename from asyncio_micro/test_http_server.py
rename to uasyncio/test_http_server.py
index c2210767..51654d1d 100644
--- a/asyncio_micro/test_http_server.py
+++ b/uasyncio/test_http_server.py
@@ -1,4 +1,4 @@
-import asyncio_micro as asyncio
+import uasyncio as asyncio
 
 @asyncio.coroutine
 def serve(reader, writer):
diff --git a/asyncio_micro/asyncio_micro.py b/uasyncio/uasyncio.py
similarity index 100%
rename from asyncio_micro/asyncio_micro.py
rename to uasyncio/uasyncio.py