diff --git a/autobahn/Makefile b/autobahn/Makefile
index 0ff80615..d9475a84 100644
--- a/autobahn/Makefile
+++ b/autobahn/Makefile
@@ -21,8 +21,8 @@ clean:
 	find . -name "*__pycache__" -type d -exec rm -rf {} \;
 
 publish: clean
-	python3 setup.py register
-	python3 setup.py sdist upload
+	python setup.py register
+	python setup.py sdist upload
 
 test:
 	trial.py autobahn.wamp.tests
@@ -31,10 +31,3 @@ test:
 #	trial.py autobahn.wamp.tests.test_protocol_peer
 #	trial.py autobahn.wamp.tests.test_serializer
 #	trial.py autobahn.wamp.tests.test_uri_pattern
-
-testp:
-	python -m autobahn/wamp/tests/test_protocol.py
-#	python -m autobahn.wamp.tests.test_protocol
-#	python -m autobahn.wamp.tests.test_message
-#	python autobahn/wamp/tests/test_message.py
-#	python autobahn/wamp2/tests/test_uri_pattern.py
diff --git a/doc/wamp2.rst b/doc/wamp2.rst
index 161573c8..75871778 100644
--- a/doc/wamp2.rst
+++ b/doc/wamp2.rst
@@ -138,10 +138,8 @@ Protocol
              closeSession,
              publish,
              subscribe,
-             unsubscribe,
              call,
-             register,
-             unregister
+             register
 
 
 .. autoclass:: autobahn.wamp.protocol.WampAppFactory
diff --git a/examples/twisted/wamp/basic/client.py b/examples/twisted/wamp/basic/client.py
index 9a66b935..702e792b 100644
--- a/examples/twisted/wamp/basic/client.py
+++ b/examples/twisted/wamp/basic/client.py
@@ -61,7 +61,7 @@ if __name__ == '__main__':
    ## create a WAMP application session factory
    ##
    from autobahn.twisted.wamp import WampAppFactory
-   session = WampAppFactory()
+   session_factory = WampAppFactory()
 
 
    ## dynamically load the application component ..
@@ -73,20 +73,20 @@ if __name__ == '__main__':
 
    ## .. and set the session class on the factory
    ##
-   session.session = getattr(app, klass)
+   session_factory.session = getattr(app, klass)
 
 
    ## run WAMP-over-WebSocket
    ##
    from autobahn.twisted.websocket import WampWebSocketClientFactory
-   transport = WampWebSocketClientFactory(session, args.wsurl, debug = args.debug)
-   transport.setProtocolOptions(failByDrop = False)
+   transport_factory = WampWebSocketClientFactory(session_factory, args.wsurl, debug = args.debug)
+   transport_factory.setProtocolOptions(failByDrop = False)
 
 
    ## start a WebSocket client from an endpoint
    ##
    client = clientFromString(reactor, args.websocket)
-   client.connect(transport)
+   client.connect(transport_factory)
 
 
    ## now enter the Twisted reactor loop
diff --git a/examples/twisted/wamp/basic/server.py b/examples/twisted/wamp/basic/server.py
index 72bc82f9..a18d1b00 100644
--- a/examples/twisted/wamp/basic/server.py
+++ b/examples/twisted/wamp/basic/server.py
@@ -61,7 +61,7 @@ if __name__ == '__main__':
    ## create a WAMP router session factory
    ##
    from autobahn.twisted.wamp import WampRouterFactory
-   session = WampRouterFactory()
+   session_factory = WampRouterFactory()
 
 
    ## if asked to start an embedded application component ..
@@ -77,20 +77,20 @@ if __name__ == '__main__':
 
       ## .. and create and add an app WAMP session to the router
       ##
-      session.add(SessionKlass())
+      session_factory.add(SessionKlass())
 
 
    ## run WAMP over WebSocket
    ##
    from autobahn.twisted.websocket import WampWebSocketServerFactory
-   transport = WampWebSocketServerFactory(session, args.wsurl, debug = args.debug)
-   transport.setProtocolOptions(failByDrop = False)
+   transport_factory = WampWebSocketServerFactory(session_factory, args.wsurl, debug = args.debug)
+   transport_factory.setProtocolOptions(failByDrop = False)
 
 
    ## start the WebSocket server from an endpoint
    ##
    server = serverFromString(reactor, args.websocket)
-   server.listen(transport)
+   server.listen(transport_factory)
 
 
    ## now enter the Twisted reactor loop