diff --git a/README.md b/README.md
index 3423473..531c412 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<p align="center">fHDHR_IPTVorg-US    <img src="docs/images/logo.ico" alt="Logo"/></p>
+<p align="center">fHDHR_IPTVorg    <img src="docs/images/logo.ico" alt="Logo"/></p>
 
 
 Welcome to the world of streaming content as a DVR device! We use some fancy python here to achieve a system of:
diff --git a/config.all.ini b/config.all.ini
index 96c22e2..f9c5fa7 100644
--- a/config.all.ini
+++ b/config.all.ini
@@ -1,8 +1,8 @@
 [main]
 # uuid =
 # cache_dir =
-# servicename = IPTVorg-US
-# reponame = fHDHR_IPTVorg-US
+# servicename = IPTVorg
+# reponame = fHDHR_IPTVorg
 
 [fhdhr]
 # address = 0.0.0.0
@@ -10,8 +10,8 @@
 # port = 5004
 # stream_type = direct
 # tuner_count =  4
-# friendlyname = fHDHR-IPTVorg-US
-# reporting_firmware_name = fHDHR_IPTVorg-US
+# friendlyname = fHDHR-IPTVorg
+# reporting_firmware_name = fHDHR_IPTVorg
 # reporting_manufacturer = BoronDust
 # reporting_model = fHDHR
 # reporting_firmware_ver = 20201001
@@ -41,5 +41,5 @@
 # type = sqlite
 # driver = None
 
-[iptvorg-us]
+[iptvorg]
 # force_best = False
diff --git a/docs/ADV_Config.md b/docs/ADV_Config.md
index b089a66..e227dd4 100644
--- a/docs/ADV_Config.md
+++ b/docs/ADV_Config.md
@@ -1,7 +1,7 @@
 <p align="center">fHDHR    <img src="images/logo.ico" alt="Logo"/></p>
 
 ---
-[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg-us](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
+[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
 ---
 **f**un
 **H**ome
@@ -45,8 +45,8 @@ The `fhdhr` contains all the configuration options for interfacing between this
 # port = 5004
 # stream_type = direct
 # tuner_count =  4
-# friendlyname = fHDHR-iptvorg-us
-# reporting_firmware_name = fHDHR_IPTVorg-US
+# friendlyname = fHDHR-iptvorg
+# reporting_firmware_name = fHDHR_IPTVorg
 # reporting_manufacturer = BoronDust
 # reporting_model = fHDHR
 # reporting_firmware_ver = 20201001
@@ -56,7 +56,7 @@ The `fhdhr` contains all the configuration options for interfacing between this
 
 # EPG
 * `images` can be set to `proxy` or `pass`. If you choose `proxy`, images will be reverse proxied through fHDHR.
-* `method` defaults to `origin` and will pull the xmltv data from iptvorg-us. Other Options include `blocks` which is an hourly schedule with minimal channel information. Another option is `zap2it`, which is another source of EPG information. Channel Numbers may need to be manually mapped.
+* `method` defaults to `origin` and will pull the xmltv data from iptvorg. Other Options include `blocks` which is an hourly schedule with minimal channel information. Another option is `zap2it`, which is another source of EPG information. Channel Numbers may need to be manually mapped.
 * `update_frequency` * `epg_update_frequency` determines how often we check for new scheduling information. In Seconds.
 
 ````
@@ -119,11 +119,11 @@ TODO: improve documentation here.
 # driver = None
 ````
 
-## iptvorg-us
-The `iptvorg-us` section
+## iptvorg
+The `iptvorg` section
 
 ````
-[iptvorg-us]
+[iptvorg]
 # username =
 # password =
 ````
diff --git a/docs/Config.md b/docs/Config.md
index 3eb6995..16b5b58 100644
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -1,7 +1,7 @@
 <p align="center">fHDHR    <img src="images/logo.ico" alt="Logo"/></p>
 
 ---
-[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg-us](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
+[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
 ---
 **f**un
 **H**ome
@@ -30,12 +30,12 @@ Under `fhdhr`, you'll find 2 addresses listed. `0.0.0.0` works great for a liste
 # discovery_address = 0.0.0.0
 ````
 
-## iptvorg-us
+## iptvorg
 
-iptvorg-us requires signin credentials, so add those.
+iptvorg requires signin credentials, so add those.
 
 ````
-[iptvorg-us]
+[iptvorg]
 # username =
 # password =
 ````
diff --git a/docs/Origin.md b/docs/Origin.md
index 1d6b083..2bfb130 100644
--- a/docs/Origin.md
+++ b/docs/Origin.md
@@ -1,7 +1,7 @@
 <p align="center">fHDHR    <img src="images/logo.ico" alt="Logo"/></p>
 
 ---
-[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg-us](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
+[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
 ---
 **f**un
 **H**ome
@@ -12,4 +12,4 @@
 ---
 
 
-This varient of fHDHR connects to [iptvorg-us](https://iptvorg-us.com/about).
+This varient of fHDHR connects to [iptvorg](https://iptvorg.com/about).
diff --git a/docs/README.md b/docs/README.md
index d86ba6d..7f2679e 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,7 +1,7 @@
 <p align="center">fHDHR    <img src="images/logo.ico" alt="Logo"/></p>
 
 ---
-[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg-us](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
+[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
 ---
 **f**un
 **H**ome
diff --git a/docs/Related-Projects.md b/docs/Related-Projects.md
index 34aeb45..719be08 100644
--- a/docs/Related-Projects.md
+++ b/docs/Related-Projects.md
@@ -1,7 +1,7 @@
 <p align="center">fHDHR    <img src="images/logo.ico" alt="Logo"/></p>
 
 ---
-[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg-us](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
+[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
 ---
 **f**un
 **H**ome
diff --git a/docs/Usage.md b/docs/Usage.md
index fe69c67..07a76a7 100644
--- a/docs/Usage.md
+++ b/docs/Usage.md
@@ -1,7 +1,7 @@
 <p align="center">fHDHR    <img src="images/logo.ico" alt="Logo"/></p>
 
 ---
-[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg-us](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
+[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
 ---
 **f**un
 **H**ome
@@ -50,72 +50,72 @@ fHDHR uses direct connections with video sources by default. Alternatively, you
 ## Docker
 This portion of the guide assumes you are using a Linux system with both docker and docker-compose installed. This (or some variation thereof) may work on Mac or Windows, but has not been tested.
 
-* this guide assumes we wish to use the `~/fhdhr` directory for our install (you can use whatever directory you like, just make the appropriate changes elsewhere in this guide) and that we are installing for iptvorg-us support
-* run the following commands to clone the repo into `~/fhdhr/fHDHR_IPTVorg-US`
+* this guide assumes we wish to use the `~/fhdhr` directory for our install (you can use whatever directory you like, just make the appropriate changes elsewhere in this guide) and that we are installing for iptvorg support
+* run the following commands to clone the repo into `~/fhdhr/fHDHR_IPTVorg`
 ```
 cd ~/fhdhr
-git clone https://github.com/fHDHR/fHDHR_IPTVorg-US.git
+git clone https://github.com/fHDHR/fHDHR_IPTVorg.git
 ```
-* create your config.ini file (as described earlier in this guide) in the `~/fhdhr/fHDHR_IPTVorg-US` directory
+* create your config.ini file (as described earlier in this guide) in the `~/fhdhr/fHDHR_IPTVorg` directory
 * while still in the `~/fhdhr` directory, create the following `docker-compose.yml` file
 ```
 version: '3'
 
 services:
-  iptvorg-us:
-    build: ./fHDHR_IPTVorg-US
-    container_name: iptvorg-us
+  iptvorg:
+    build: ./fHDHR_IPTVorg
+    container_name: iptvorg
     network_mode: host
     volumes:
-      - ./fHDHR_IPTVorg-US/config.ini:/app/config/config.ini
+      - ./fHDHR_IPTVorg/config.ini:/app/config/config.ini
 ```
 * run the following command to build and launch the container
 ```
-docker-compose up --build -d iptvorg-us
+docker-compose up --build -d iptvorg
 ```
 
 After a short period of time (during which docker will build your new fHDHR container), you should now have a working build of fHDHR running inside a docker container.
 
 As the code changes and new versions / bug fixes are released, at any point you can pull the latest version of the code and rebuild your container with the following commands:
 ```
-cd ~/fhdhr/fHDHR_IPTVorg-US
+cd ~/fhdhr/fHDHR_IPTVorg
 git checkout master
 git pull
 cd ~/fhdhr
-docker-compose up --build -d iptvorg-us
+docker-compose up --build -d iptvorg
 ```
 <hr />
 
 You can also run multiple instances of fHDHR to support additional sources by cloning the appropriate repo into your `~/fhdhr` directory and adding the necessary services to the docker-compose file we created above.
 
-* for example, if we also wanted iptvorg-us support, you would clone the iptvorg-us repository:
+* for example, if we also wanted iptvorg support, you would clone the iptvorg repository:
 ```
 cd ~/fhdhr
-git clone https://github.com/fHDHR/fHDHR_IPTVorg-US.git
+git clone https://github.com/fHDHR/fHDHR_IPTVorg.git
 ```
-* **NOTE**: if you are running multiple services on the same machine, you must change the port in your config.ini file for each one. For example, if iptvorg-us was using the default port of 5004, iptvorg-us cannot also use that port. You must change the port in your iptvorg-us config.ini file to something else (5005, for example).
-* add iptvorg-us as a service in your `docker-compose.yml` file
+* **NOTE**: if you are running multiple services on the same machine, you must change the port in your config.ini file for each one. For example, if iptvorg was using the default port of 5004, iptvorg cannot also use that port. You must change the port in your iptvorg config.ini file to something else (5005, for example).
+* add iptvorg as a service in your `docker-compose.yml` file
 ```
 version: '3'
 
 services:
-  iptvorg-us:
-    build: ./fHDHR_IPTVorg-US
-    container_name: iptvorg-us
+  iptvorg:
+    build: ./fHDHR_IPTVorg
+    container_name: iptvorg
     network_mode: host
     volumes:
-      - ./fHDHR_IPTVorg-US/config.ini:/app/config/config.ini
+      - ./fHDHR_IPTVorg/config.ini:/app/config/config.ini
 
-  iptvorg-us:
-    build: ./fHDHR_IPTVorg-US
-    container_name: iptvorg-us
+  iptvorg:
+    build: ./fHDHR_IPTVorg
+    container_name: iptvorg
     network_mode: host
     volumes:
-      - ./fHDHR_IPTVorg-US/config.ini:/app/config/config.ini
+      - ./fHDHR_IPTVorg/config.ini:/app/config/config.ini
 ```
 * run the following command to build and launch the container
 ```
-docker-compose up --build -d iptvorg-us
+docker-compose up --build -d iptvorg
 ```
 
 You can repeat these instructions for as many fHDHR containers as your system resources will allow.
diff --git a/docs/WebUI.md b/docs/WebUI.md
index f68a009..7a7d326 100644
--- a/docs/WebUI.md
+++ b/docs/WebUI.md
@@ -1,7 +1,7 @@
 <p align="center">fHDHR    <img src="images/logo.ico" alt="Logo"/></p>
 
 ---
-[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg-us](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
+[Main](README.md)  |  [Setup and Usage](Usage.md)  |  [iptvorg](Origin.md)  |  [Credits/Related Projects](Related-Projects.md)
 ---
 **f**un
 **H**ome
@@ -27,7 +27,7 @@ Below is the main landing page with basic information.
 
 <img src="screenshots/webui_main.PNG" alt="Main Page"/>
 
-# iptvorg-us
+# iptvorg
 
 Here you will have access to some basic information about the service we are proxying.
 
diff --git a/origin/__init__.py b/origin/__init__.py
index 2687c91..ca4b1c4 100644
--- a/origin/__init__.py
+++ b/origin/__init__.py
@@ -3,5 +3,5 @@ from .origin_service import *
 from .origin_channels import *
 from .origin_epg import *
 
-ORIGIN_NAME = "fHDHR_IPTVorg-US"
+ORIGIN_NAME = "fHDHR_IPTVorg"
 ORIGIN_VERSION = "v0.5.0-beta"
diff --git a/origin/origin_conf.json b/origin/origin_conf.json
index 1dad3bf..8ad1999 100644
--- a/origin/origin_conf.json
+++ b/origin/origin_conf.json
@@ -1,17 +1,17 @@
 {
   "main":{
           "servicename":{
-                "value": "IPTVorg-US",
+                "value": "IPTVorg",
                 "config_file": false,
                 "config_web": false
                 },
           "dictpopname":{
-                      "value": "iptvorg-us",
+                      "value": "iptvorg",
                       "config_file": false,
                       "config_web": false
                     },
           "reponame":{
-                          "value": "fHDHR_IPTVorg-US",
+                          "value": "fHDHR_IPTVorg",
                           "config_file": false,
                           "config_web": false
                         },
@@ -23,12 +23,12 @@
   },
   "fhdhr":{
           "friendlyname":{
-                    "value": "fHDHR-IPTVorg-US",
+                    "value": "fHDHR-IPTVorg",
                     "config_file": true,
                     "config_web": true
                 },
           "reporting_firmware_name":{
-                                    "value": "fHDHR_IPTVorg-US",
+                                    "value": "fHDHR_IPTVorg",
                                     "config_file": true,
                                     "config_web": true
                                   }
@@ -40,7 +40,7 @@
                     "config_web": true
                 }
   },
-  "iptvorg-us":{
+  "iptvorg":{
           "filter_country":{
                     "value": "United States",
                     "config_file": true,