Merge branch 'develop'

18 files changed, 19 insertions, 19 deletions

diff --git a/python-twisted/README.md b/python-twisted/README.md
index c74fb0d..0677eff 100644
--- a/python-twisted/README.md
+++ b/python-twisted/README.md
@@ -12,7 +12,7 @@ pubnub.start()
 
 #### Import
 ```
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 ```
 
 #### Init
diff --git a/python-twisted/examples/audit.py b/python-twisted/examples/audit.py
index b99a8a9..d5cd34b 100644
--- a/python-twisted/examples/audit.py
+++ b/python-twisted/examples/audit.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam'
diff --git a/python-twisted/examples/echo-client.py b/python-twisted/examples/echo-client.py
index 6f6d1c7..f329d47 100644
--- a/python-twisted/examples/echo-client.py
+++ b/python-twisted/examples/echo-client.py
@@ -8,7 +8,7 @@
 ## =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ## Import Libs
 ## =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 ## =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ## Configuration
diff --git a/python-twisted/examples/echo-server.py b/python-twisted/examples/echo-server.py
index 65f9c57..06ee81a 100644
--- a/python-twisted/examples/echo-server.py
+++ b/python-twisted/examples/echo-server.py
@@ -8,7 +8,7 @@
 ## =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ## Import Libs
 ## =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 ## =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ## Configuration
diff --git a/python-twisted/examples/grant.py b/python-twisted/examples/grant.py
index 053c1f9..3d6284f 100644
--- a/python-twisted/examples/grant.py
+++ b/python-twisted/examples/grant.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam'
diff --git a/python-twisted/examples/here-now.py b/python-twisted/examples/here-now.py
index 38b79f8..acf8cb0 100644
--- a/python-twisted/examples/here-now.py
+++ b/python-twisted/examples/here-now.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-twisted/examples/history.py b/python-twisted/examples/history.py
index 81974ec..d8c4063 100644
--- a/python-twisted/examples/history.py
+++ b/python-twisted/examples/history.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-twisted/examples/publish.py b/python-twisted/examples/publish.py
index 13b5357..a687c59 100644
--- a/python-twisted/examples/publish.py
+++ b/python-twisted/examples/publish.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-twisted/examples/revoke.py b/python-twisted/examples/revoke.py
index fab0497..3b87015 100644
--- a/python-twisted/examples/revoke.py
+++ b/python-twisted/examples/revoke.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam'
diff --git a/python-twisted/examples/subscribe.py b/python-twisted/examples/subscribe.py
index 9c73439..1704f7c 100644
--- a/python-twisted/examples/subscribe.py
+++ b/python-twisted/examples/subscribe.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-twisted/examples/subscribe_group.py b/python-twisted/examples/subscribe_group.py
index 67dbac5..2bfd40a 100644
--- a/python-twisted/examples/subscribe_group.py
+++ b/python-twisted/examples/subscribe_group.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import Pubnub
+from pubnub import Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-twisted/migration.md b/python-twisted/migration.md
index 49de5a9..924fa7c 100644
--- a/python-twisted/migration.md
+++ b/python-twisted/migration.md
@@ -7,10 +7,10 @@
 
 ```
 # Pre 3.5:
-from Pubnub import Pubnub
+from pubnub import Pubnub
 
 # New in 3.5+
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 ```
 
diff --git a/python-twisted/tests/benchmark.py b/python-twisted/tests/benchmark.py
index b6477c0..1d5f914 100644
--- a/python-twisted/tests/benchmark.py
+++ b/python-twisted/tests/benchmark.py
@@ -12,7 +12,7 @@
 import sys
 import datetime
 from twisted.internet import reactor
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-twisted/tests/delivery.py b/python-twisted/tests/delivery.py
index 30ce55f..46690f8 100644
--- a/python-twisted/tests/delivery.py
+++ b/python-twisted/tests/delivery.py
@@ -14,7 +14,7 @@ import datetime
 import time
 import math
 
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 ## -----------------------------------------------------------------------
 ## Configuration
diff --git a/python-twisted/tests/subscribe-test.py b/python-twisted/tests/subscribe-test.py
index ba74992..2f4c208 100755
--- a/python-twisted/tests/subscribe-test.py
+++ b/python-twisted/tests/subscribe-test.py
@@ -11,7 +11,7 @@
 
 import sys
 import datetime
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 from functools import partial
 from threading import current_thread
 import threading
diff --git a/python-twisted/tests/test_grant_async.py b/python-twisted/tests/test_grant_async.py
index 5b33b11..0f79570 100644
--- a/python-twisted/tests/test_grant_async.py
+++ b/python-twisted/tests/test_grant_async.py
@@ -1,6 +1,6 @@
 
 
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 import time
 
 pubnub = Pubnub("demo","demo")
diff --git a/python-twisted/tests/test_publish_async.py b/python-twisted/tests/test_publish_async.py
index 391297d..1f442ed 100644
--- a/python-twisted/tests/test_publish_async.py
+++ b/python-twisted/tests/test_publish_async.py
@@ -1,6 +1,6 @@
 
 
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 import time
 
 pubnub = Pubnub("demo","demo")
diff --git a/python-twisted/tests/unit-test-full.py b/python-twisted/tests/unit-test-full.py
index 3aecf12..2335ef6 100644
--- a/python-twisted/tests/unit-test-full.py
+++ b/python-twisted/tests/unit-test-full.py
@@ -18,7 +18,7 @@
 ## -----------------------------------
 
 import sys
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'