diff --git a/DEVELOPERS.md b/DEVELOPERS.md
index 6e240760..1e839ede 100644
--- a/DEVELOPERS.md
+++ b/DEVELOPERS.md
@@ -200,8 +200,6 @@ cd doc
 make publish
 ```
 
-> The docs are published to the Autobahn Web site, which is hosted on a AWS S3 bucket is owned by Tavendo, and hence the publish can only be done by Tavendo.
-
 ### WebSocket Test Reports
 
 [AutobahnTestsuite](http://crossbar.io/autobahn#testsuite) provides a fully automated test suite to verify client and server implementations of the WebSocket Protocol for specification conformance and implementation robustness.
@@ -308,8 +306,6 @@ aws --region eu-west-1 s3 sync \
     --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
 ```
 
-> The above S3 bucket is owned by Tavendo, and hence the upload can only be done by Tavendo.
-
 After the upload has finished, check the live pages:
 
 * [Client Mode Reports](http://autobahn-python.readthedocs.io/en/latest/testreport/clients/index.html)
diff --git a/Makefile b/Makefile
index bc1aa898..7d78994b 100755
--- a/Makefile
+++ b/Makefile
@@ -133,6 +133,3 @@ find_windows_files:
 # on Windows (Git Bash), check for files with Unix lines endings
 find_unix_files:
 	find . -name "*" -exec dos2unix -tv {} \; 2>&1 | grep "Unix"
-
-find_tavendo:
-	find . -path ./.git -prune -o -type f -exec grep -Hi "tavendo" {} \; | grep -v "Copyright (c) Tavendo"
diff --git a/autobahn/wamp/auth.py b/autobahn/wamp/auth.py
index e0e55755..1aee48e6 100644
--- a/autobahn/wamp/auth.py
+++ b/autobahn/wamp/auth.py
@@ -289,8 +289,3 @@ def compute_wcs(key, challenge):
         challenge = challenge.encode('utf8')
     sig = hmac.new(key, challenge, hashlib.sha256).digest()
     return binascii.b2a_base64(sig).strip()
-
-
-if __name__ == '__main__':
-    with open('test.svg', 'w') as f:
-        f.write(qrcode_from_totp(u'CACKN3GRF3KQZMEK', u'tobias1', u'Tavendo'))
diff --git a/docs/conf.py b/docs/conf.py
index de11fcca..5394eb35 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -113,12 +113,12 @@ master_doc = 'contents'
 
 # General information about the project.
 project = u'autobahn'
-author = u'Tavendo'
+author = u'Crossbar.io Project'
 this_year = u'{0}'.format(time.strftime('%Y'))
 if this_year != u'2012':
-    copyright = u'2012-{0}, Tavendo GmbH'.format(this_year)
+    copyright = u'2012-{0}, Crossbar.io Technologies GmbH'.format(this_year)
 else:
-    copyright = u'2012, Tavendo GmbH'
+    copyright = u'2012, Crossbar.io Technologies GmbH'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/docs/work/apps.rst b/docs/work/apps.rst
index 364aac87..339b5f6e 100644
--- a/docs/work/apps.rst
+++ b/docs/work/apps.rst
@@ -113,7 +113,7 @@ lines in the same function. In that case, you should not `return`, but use
    @app.signal('onjoin')
    def entry_point():
       # Calling statuscode
-      url = "http://tavendo.com"
+      url = "http://crossbar.io"
       code = yield app.session.call('statuscode', url)
       print("GET on '%s' returned status '%s'" % (url, code))
 
@@ -127,4 +127,4 @@ Now, in a Terminal:
 
    $ python script.py
    Running on 'ws://localhost:8080'
-   GET on 'http://tavendo.com' returned status '200'
+   GET on 'http://crossbar.io' returned status '200'
diff --git a/examples/twisted/wamp/pubsub/tls/create-self-signed-cert.sh b/examples/twisted/wamp/pubsub/tls/create-self-signed-cert.sh
index b30d8f28..01619238 100755
--- a/examples/twisted/wamp/pubsub/tls/create-self-signed-cert.sh
+++ b/examples/twisted/wamp/pubsub/tls/create-self-signed-cert.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 openssl req -nodes -new -x509 -keyout server.key \
-        -subj '/C=DE/ST=Bavaria/L=Erlangen/O=Tavendo/CN=localhost/' \
+        -subj '/C=DE/ST=Bavaria/L=Erlangen/O=Crossbar.io GmbH/CN=localhost/' \
         -out server.crt
diff --git a/examples/twisted/wamp/rpc/cancel/__init__.py b/examples/twisted/wamp/rpc/cancel/__init__.py
index 7a5ffd2f..89caae25 100644
--- a/examples/twisted/wamp/rpc/cancel/__init__.py
+++ b/examples/twisted/wamp/rpc/cancel/__init__.py
@@ -1,17 +1,25 @@
 ###############################################################################
-##
-##  Copyright (C) 2014 Tavendo GmbH
-##
-##  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.
-##
+#
+# The MIT License (MIT)
+#
+# Copyright (c) Crossbar.io Technologies GmbH
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
 ###############################################################################
diff --git a/examples/twisted/wamp/rpc/cancel/backend.py b/examples/twisted/wamp/rpc/cancel/backend.py
index 320f2987..8e742fb5 100644
--- a/examples/twisted/wamp/rpc/cancel/backend.py
+++ b/examples/twisted/wamp/rpc/cancel/backend.py
@@ -1,19 +1,27 @@
 ###############################################################################
-##
-##  Copyright (C) 2014 Tavendo GmbH
-##
-##  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.
-##
+#
+# The MIT License (MIT)
+#
+# Copyright (c) Crossbar.io Technologies GmbH
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
 ###############################################################################
 
 from twisted.internet.defer import inlineCallbacks
diff --git a/examples/twisted/wamp/rpc/cancel/frontend.py b/examples/twisted/wamp/rpc/cancel/frontend.py
index 48ddcfda..95c87da6 100644
--- a/examples/twisted/wamp/rpc/cancel/frontend.py
+++ b/examples/twisted/wamp/rpc/cancel/frontend.py
@@ -1,19 +1,27 @@
 ###############################################################################
-##
-##  Copyright (C) 2014 Tavendo GmbH
-##
-##  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.
-##
+#
+# The MIT License (MIT)
+#
+# Copyright (c) Crossbar.io Technologies GmbH
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
 ###############################################################################
 
 from twisted.internet import reactor
diff --git a/examples/twisted/websocket/echo_service/setup.py b/examples/twisted/websocket/echo_service/setup.py
index de228758..4f21ef25 100644
--- a/examples/twisted/websocket/echo_service/setup.py
+++ b/examples/twisted/websocket/echo_service/setup.py
@@ -36,7 +36,7 @@ setup(
     version='0.1.0',
     description='Autobahn WebSocket Echo Service',
     long_description=LONGDESC,
-    author='Tavendo GmbH',
+    author='Crossbar.io Technologies GmbH',
     url='http://crossbar.io/autobahn',
     platforms=('Any'),
     install_requires=['Twisted>=Twisted-12.2',
diff --git a/setup.py b/setup.py
index 1a502a41..615c6509 100644
--- a/setup.py
+++ b/setup.py
@@ -167,13 +167,12 @@ setup(
     description='WebSocket client & server library, WAMP real-time framework',
     long_description=docstr,
     license='MIT License',
-    author='Tavendo GmbH',
-    author_email='autobahnws@googlegroups.com',
+    author='Crossbar.io Technologies GmbH',
     url='http://crossbar.io/autobahn',
     platforms='Any',
     install_requires=[
         'six>=1.10.0',      # MIT license
-        'txaio>=2.5.1',     # MIT license
+        'txaio>=2.5.2',     # MIT license
     ],
     extras_require={
         'all': extras_require_all,
diff --git a/tox.ini b/tox.ini
index 97605313..201fc9dd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,7 @@ deps =
     py-ubjson
 
     ; txaio
-    git+https://github.com/tavendo/txaio
+    git+https://github.com/crossbario/txaio
 
     ; twisted dependencies
     tw121: twisted==12.1.0