diff --git a/.travis.yml b/.travis.yml
index f3f28baa..f8480b79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,9 +39,6 @@ install:
       pip install tox; pip install tox-travis;
   fi
 script:
-- if [[ -z $TRAVIS_TAG ]] && [[ $TRAVIS_OS_NAME == 'linux' ]];then
-      tox;
-  fi
 - if [[ -n $TRAVIS_TAG ]] && [[ $TRAVIS_OS_NAME == 'osx' ]]; then
       ./build/travis-build-osx.sh ;
   fi
@@ -58,7 +55,7 @@ deploy:
   file:
   - build/electrum-zclassic/dist/electrum-zclassic-$ELECTRUM_ZCL_VERSION-macosx.dmg
   on:
-    repo: zebra-lucky/electrum-zclassic
+    repo: ZclassicCommunity/electrum-zclassic
     tags: true
     condition: "$TRAVIS_OS_NAME = osx"
 - provider: releases
@@ -70,6 +67,6 @@ deploy:
   - build/electrum-zclassic/dist/electrum-zclassic-$ELECTRUM_ZCL_VERSION-setup-win64.exe
   - build/electrum-zclassic/bin/Electrum_Zclassic-$ELECTRUM_ZCL_APK_VERSION-release-unsigned.apk
   on:
-    repo: zebra-lucky/electrum-zclassic
+    repo: ZclassicCommunity/electrum-zclassic
     tags: true
     condition: "$TRAVIS_OS_NAME = linux"
diff --git a/README.rst b/README.rst
index dc7a90bb..eb219202 100644
--- a/README.rst
+++ b/README.rst
@@ -53,7 +53,7 @@ Development version
 
 Check out the code from GitHub::
 
-    git clone git://github.com/zebra-lucky/electrum-zclassic.git
+    git clone git://github.com/ZclassicCommunity/electrum-zclassic.git
     cd electrum-zclassic
 
 Run install (this should install dependencies)::
diff --git a/contrib/zclassic/electrum-zclassic.nsi b/contrib/zclassic/electrum-zclassic.nsi
index ed9ca1c3..b74f64c8 100644
--- a/contrib/zclassic/electrum-zclassic.nsi
+++ b/contrib/zclassic/electrum-zclassic.nsi
@@ -8,7 +8,7 @@
 ;Variables
 
   !define PRODUCT_NAME "Electrum-Zclassic"
-  !define PRODUCT_WEB_SITE "https://github.com/zebra-lucky/electrum-zclassic"
+  !define PRODUCT_WEB_SITE "https://github.com/ZclassicCommunity/electrum-zclassic"
   !define PRODUCT_PUBLISHER "Electrum Technologies GmbH"
   !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
   !define BUILD_ARCH "${WINEARCH}"
diff --git a/contrib/zclassic/travis/travis-build-linux-apk.sh b/contrib/zclassic/travis/travis-build-linux-apk.sh
index 3d18c876..710ea88f 100755
--- a/contrib/zclassic/travis/travis-build-linux-apk.sh
+++ b/contrib/zclassic/travis/travis-build-linux-apk.sh
@@ -6,7 +6,7 @@ if [[ -z $TRAVIS_TAG ]]; then
   exit 1
 fi
 
-BUILD_REPO_URL=https://github.com/zebra-lucky/electrum-zclassic
+BUILD_REPO_URL=https://github.com/ZclassicCommunity/electrum-zclassic
 
 cd build
 
diff --git a/contrib/zclassic/travis/travis-build-linux.sh b/contrib/zclassic/travis/travis-build-linux.sh
index 4fa7668f..fcb68205 100755
--- a/contrib/zclassic/travis/travis-build-linux.sh
+++ b/contrib/zclassic/travis/travis-build-linux.sh
@@ -6,7 +6,7 @@ if [[ -z $TRAVIS_TAG ]]; then
   exit 1
 fi
 
-BUILD_REPO_URL=https://github.com/zebra-lucky/electrum-zclassic
+BUILD_REPO_URL=https://github.com/ZclassicCommunity/electrum-zclassic
 
 cd build
 
diff --git a/contrib/zclassic/travis/travis-build-osx.sh b/contrib/zclassic/travis/travis-build-osx.sh
index 92198c5e..0abae1cc 100755
--- a/contrib/zclassic/travis/travis-build-osx.sh
+++ b/contrib/zclassic/travis/travis-build-osx.sh
@@ -6,7 +6,7 @@ if [[ -z $TRAVIS_TAG ]]; then
   exit 1
 fi
 
-BUILD_REPO_URL=https://github.com/zebra-lucky/electrum-zclassic
+BUILD_REPO_URL=https://github.com/ZclassicCommunity/electrum-zclassic
 
 cd build
 
diff --git a/debian/control b/debian/control
index 18d34780..ec628e70 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
  python3-socks (>= 1.6.5),
  python3-pyblake2 (>=0.9.3),
 Standards-Version: 4.1.3
-Homepage: https://github.com/zebra-lucky/electrum-zclassic
+Homepage: https://github.com/ZclassicCommunity/electrum-zclassic
 X-Python3-Version: >= 3.4
 
 Package: python3-electrum-zclassic
diff --git a/debian/copyright b/debian/copyright
index d4abdf5e..817cd108 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: electrum-zclassic
-Source: https://github.com/zebra-lucky/electrum-zclassic/
+Source: https://github.com/ZclassicCommunity/electrum-zclassic/
 
 Files: *
 Copyright: Electrum Team
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index 7ee1c3b6..dc67d0cd 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -541,9 +541,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
 
         help_menu = menubar.addMenu(_("&Help"))
         help_menu.addAction(_("&About"), self.show_about)
-        #help_menu.addAction(_("&Official website"), lambda: webbrowser.open("https://github.com/zebra-lucky/electrum-zclassic"))
+        #help_menu.addAction(_("&Official website"), lambda: webbrowser.open("https://github.com/ZclassicCommunity/electrum-zclassic"))
         help_menu.addSeparator()
-        #help_menu.addAction(_("&Documentation"), lambda: webbrowser.open("http://github.com/zebra-lucky/electrum-zclassic")).setShortcut(QKeySequence.HelpContents)
+        #help_menu.addAction(_("&Documentation"), lambda: webbrowser.open("http://github.com/ZclassicCommunity/electrum-zclassic")).setShortcut(QKeySequence.HelpContents)
         #self._auto_crash_reports = QAction(_("&Automated Crash Reports"), self, checkable=True)
         #self._auto_crash_reports.setChecked(self.config.get("show_crash_reporter", default=False))
         #self._auto_crash_reports.triggered.connect(self.auto_crash_reports)
@@ -575,7 +575,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
     def show_report_bug(self):
         msg = ' '.join([
             _("Please report any bugs as issues on github:<br/>"),
-            "<a href=\"https://github.com/zebra-lucky/electrum-zclassic/issues\">https://github.com/zebra-lucky/electrum-zclassic/issues</a><br/><br/>",
+            "<a href=\"https://github.com/ZclassicCommunity/electrum-zclassic/issues\">https://github.com/ZclassicCommunity/electrum-zclassic/issues</a><br/><br/>",
             _("Before reporting a bug, upgrade to the most recent version of Electrum-Zclassic (latest release or git HEAD), and include the version number in your report."),
             _("Try to explain not only what the bug is, but how it occurs.")
          ])
diff --git a/setup.py b/setup.py
index b5d52741..36b2bfbc 100755
--- a/setup.py
+++ b/setup.py
@@ -84,6 +84,6 @@ setup(
     author="Thomas Voegtlin",
     author_email="thomasv@electrum.org",
     license="MIT License",
-    url="https://github.com/zebra-lucky/electrum-zclassic",
+    url="https://github.com/ZclassicCommunity/electrum-zclassic",
     long_description="""Lightweight Zclassic Wallet"""
 )