diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 7de26883..fe84e5dc 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -291,7 +291,7 @@ def main(args):
     core.initialize()
 
     # clientAgent for Torrents
-    client_agent = core.TORRENT_CLIENTAGENT
+    client_agent = core.TORRENT_CLIENT_AGENT
 
     logger.info('#########################################################')
     logger.info('## ..::[{0}]::.. ##'.format(os.path.basename(__file__)))
diff --git a/core/__init__.py b/core/__init__.py
index cdeedda9..9ea59001 100644
--- a/core/__init__.py
+++ b/core/__init__.py
@@ -137,7 +137,7 @@ SABNZBD_PORT = None
 SABNZBD_APIKEY = None
 NZB_DEFAULT_DIRECTORY = None
 
-TORRENT_CLIENTAGENT = None
+TORRENT_CLIENT_AGENT = None
 TORRENT_CLASS = None
 USE_LINK = None
 OUTPUT_DIRECTORY = None
@@ -255,7 +255,7 @@ def initialize(section=None):
     global NZBGET_POSTPROCESS_ERROR, NZBGET_POSTPROCESS_NONE, NZBGET_POSTPROCESS_PAR_CHECK, NZBGET_POSTPROCESS_SUCCESS, \
         NZBTOMEDIA_TIMEOUT, FORKS, FORK_DEFAULT, FORK_FAILED_TORRENT, FORK_FAILED, NOEXTRACTFAILED, SHOWEXTRACT, \
         NZBTOMEDIA_BRANCH, NZBTOMEDIA_VERSION, NEWEST_VERSION, NEWEST_VERSION_STRING, VERSION_NOTIFY, SYS_ARGV, CFG, \
-        SABNZB_NO_OF_ARGUMENTS, SABNZB_0717_NO_OF_ARGUMENTS, CATEGORIES, TORRENT_CLIENTAGENT, USE_LINK, OUTPUT_DIRECTORY, \
+        SABNZB_NO_OF_ARGUMENTS, SABNZB_0717_NO_OF_ARGUMENTS, CATEGORIES, TORRENT_CLIENT_AGENT, USE_LINK, OUTPUT_DIRECTORY, \
         NOFLATTEN, UTORRENT_PASSWORD, UTORRENT_USER, UTORRENT_WEB_UI, DELUGE_HOST, DELUGE_PORT, DELUGE_USER, DELUGE_PASSWORD, VLEVEL, \
         TRANSMISSION_HOST, TRANSMISSION_PORT, TRANSMISSION_PASSWORD, TRANSMISSION_USER, COMPRESSEDCONTAINER, MEDIACONTAINER, \
         METACONTAINER, SECTIONS, ALL_FORKS, TEST_FILE, GENERALOPTS, LOG_GIT, GROUPS, SEVENZIP, CONCAT, VCRF, \
@@ -392,7 +392,7 @@ def initialize(section=None):
     if GROUPS == ['']:
         GROUPS = None
 
-    TORRENT_CLIENTAGENT = CFG['Torrent']['clientAgent']  # utorrent | deluge | transmission | rtorrent | vuze | qbittorrent |other
+    TORRENT_CLIENT_AGENT = CFG['Torrent']['clientAgent']  # utorrent | deluge | transmission | rtorrent | vuze | qbittorrent |other
     USE_LINK = CFG['Torrent']['useLink']  # no | hard | sym
     OUTPUT_DIRECTORY = CFG['Torrent']['outputDirectory']  # /abs/path/to/complete/
     TORRENT_DEFAULT_DIRECTORY = CFG['Torrent']['default_downloadDirectory']
@@ -860,7 +860,7 @@ def initialize(section=None):
     CATEGORIES = list(set(CATEGORIES))
 
     # create torrent class
-    TORRENT_CLASS = create_torrent_class(TORRENT_CLIENTAGENT)
+    TORRENT_CLASS = create_torrent_class(TORRENT_CLIENT_AGENT)
 
     # finished initalizing
     return True
diff --git a/core/auto_process/movies.py b/core/auto_process/movies.py
index ab84627e..7b1fb8e5 100644
--- a/core/auto_process/movies.py
+++ b/core/auto_process/movies.py
@@ -152,7 +152,7 @@ def process(section, dir_name, input_name=None, status=0, client_agent='manual',
             if not release and '.cp(tt' not in video and imdbid:
                 video_name, video_ext = os.path.splitext(video)
                 video2 = '{0}.cp({1}){2}'.format(video_name, imdbid, video_ext)
-                if not (client_agent in [core.TORRENT_CLIENTAGENT, 'manual'] and core.USE_LINK == 'move-sym'):
+                if not (client_agent in [core.TORRENT_CLIENT_AGENT, 'manual'] and core.USE_LINK == 'move-sym'):
                     logger.debug('Renaming: {0} to: {1}'.format(video, video2))
                     os.rename(video, video2)
 
diff --git a/core/auto_process/tv.py b/core/auto_process/tv.py
index 56323894..cc31f94e 100644
--- a/core/auto_process/tv.py
+++ b/core/auto_process/tv.py
@@ -47,7 +47,7 @@ def process(section, dir_name, input_name=None, failed=False, client_agent='manu
     delete_failed = int(cfg.get('delete_failed', 0))
     nzb_extraction_by = cfg.get('nzbExtractionBy', 'Downloader')
     process_method = cfg.get('process_method')
-    if client_agent == core.TORRENT_CLIENTAGENT and core.USE_LINK == 'move-sym':
+    if client_agent == core.TORRENT_CLIENT_AGENT and core.USE_LINK == 'move-sym':
         process_method = 'symlink'
     remote_path = int(cfg.get('remote_path', 0))
     wait_for = int(cfg.get('wait_for', 2))