diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 4971c13d..9042fea1 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -196,7 +196,7 @@ def process_torrent(input_directory, input_name, input_category, input_hash, inp
 
         if torrent_no_link == 0:
             try:
-                core.copy_link(inputFile, target_file, core.USELINK)
+                core.copy_link(inputFile, target_file, core.USE_LINK)
                 core.remove_read_only(target_file)
             except Exception:
                 logger.error('Failed to link: {0} to {1}'.format(inputFile, target_file))
@@ -270,7 +270,7 @@ def process_torrent(input_directory, input_name, input_category, input_hash, inp
             core.update_download_info_status(input_name, 1)
 
             # remove torrent
-            if core.USELINK == 'move-sym' and not core.DELETE_ORIGINAL == 1:
+            if core.USE_LINK == 'move-sym' and not core.DELETE_ORIGINAL == 1:
                 logger.debug('Checking for sym-links to re-direct in: {0}'.format(input_directory))
                 for dirpath, dirs, files in os.walk(input_directory):
                     for file in files:
diff --git a/core/__init__.py b/core/__init__.py
index c234fef3..99d3b974 100644
--- a/core/__init__.py
+++ b/core/__init__.py
@@ -139,7 +139,7 @@ NZB_DEFAULTDIR = None
 
 TORRENT_CLIENTAGENT = None
 TORRENT_CLASS = None
-USELINK = None
+USE_LINK = None
 OUTPUTDIRECTORY = None
 NOFLATTEN = []
 DELETE_ORIGINAL = 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, USELINK, OUTPUTDIRECTORY, \
+        SABNZB_NO_OF_ARGUMENTS, SABNZB_0717_NO_OF_ARGUMENTS, CATEGORIES, TORRENT_CLIENTAGENT, USE_LINK, OUTPUTDIRECTORY, \
         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, \
@@ -393,7 +393,7 @@ def initialize(section=None):
         GROUPS = None
 
     TORRENT_CLIENTAGENT = CFG['Torrent']['clientAgent']  # utorrent | deluge | transmission | rtorrent | vuze | qbittorrent |other
-    USELINK = CFG['Torrent']['useLink']  # no | hard | sym
+    USE_LINK = CFG['Torrent']['useLink']  # no | hard | sym
     OUTPUTDIRECTORY = CFG['Torrent']['outputDirectory']  # /abs/path/to/complete/
     TORRENT_DEFAULTDIR = CFG['Torrent']['default_downloadDirectory']
     CATEGORIES = (CFG['Torrent']['categories'])  # music,music_videos,pictures,software
diff --git a/core/auto_process/movies.py b/core/auto_process/movies.py
index 0c2f5880..ab84627e 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.USELINK == 'move-sym'):
+                if not (client_agent in [core.TORRENT_CLIENTAGENT, '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 8abfd0df..56323894 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.USELINK == 'move-sym':
+    if client_agent == core.TORRENT_CLIENTAGENT 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))
diff --git a/core/utils/common.py b/core/utils/common.py
index f352fb87..c2f9ef79 100644
--- a/core/utils/common.py
+++ b/core/utils/common.py
@@ -100,7 +100,7 @@ def get_dirs(section, subsection, link='hard'):
     except Exception as e:
         logger.error('Failed to add directories from {0} for post-processing: {1}'.format(watch_directory, e))
 
-    if core.USELINK == 'move':
+    if core.USE_LINK == 'move':
         try:
             output_directory = os.path.join(core.OUTPUTDIRECTORY, subsection)
             if os.path.exists(output_directory):
diff --git a/core/utils/torrents.py b/core/utils/torrents.py
index c20ba97f..810bfc42 100644
--- a/core/utils/torrents.py
+++ b/core/utils/torrents.py
@@ -85,7 +85,7 @@ def resume_torrent(client_agent, input_hash, input_id, input_name):
 
 
 def remove_torrent(client_agent, input_hash, input_id, input_name):
-    if core.DELETE_ORIGINAL == 1 or core.USELINK == 'move':
+    if core.DELETE_ORIGINAL == 1 or core.USE_LINK == 'move':
         logger.debug('Deleting torrent {0} from {1}'.format(input_name, client_agent))
         try:
             if client_agent == 'utorrent' and core.TORRENT_CLASS != '':