diff --git a/misc/update/python/postprocess_threaded.py b/misc/update/python/postprocess_threaded.py
index a6d464b2b..1865a0942 100644
--- a/misc/update/python/postprocess_threaded.py
+++ b/misc/update/python/postprocess_threaded.py
@@ -232,7 +232,7 @@ def main(args):
 		final = cur[0].fetchall()
 		if len(datas) > 0:
 			for item in final:
-				run = "DELETE FROM release_nfos WHERE nfo IS NULL AND releaseid = %s"
+				run = "DELETE FROM release_nfos WHERE nfo IS NULL AND releases_id = %s"
 				cur[0].execute(run, (item[0]))
 				final = cur[0].fetchall()
 
diff --git a/newznab/DnzbFailures.php b/newznab/DnzbFailures.php
index 8ebaba244..32a1727eb 100644
--- a/newznab/DnzbFailures.php
+++ b/newznab/DnzbFailures.php
@@ -169,7 +169,7 @@ class DnzbFailures
 				sprintf('
 				SELECT text
 				FROM release_comments
-				WHERE releaseid = %d',
+				WHERE releases_id = %d',
 						$relid
 				)
 		);
diff --git a/newznab/Nfo.php b/newznab/Nfo.php
index b8754368b..89c5ca1cc 100644
--- a/newznab/Nfo.php
+++ b/newznab/Nfo.php
@@ -199,11 +199,11 @@ class Nfo
 	{
 		if ($release['id'] > 0 && $this->isNFO($nfo, $release['guid'])) {
 
-			$check = $this->pdo->queryOneRow(sprintf('SELECT id FROM release_nfos WHERE releaseid = %d', $release['id']));
+			$check = $this->pdo->queryOneRow(sprintf('SELECT id FROM release_nfos WHERE releases_id = %d', $release['id']));
 
 			if ($check === false) {
 				$this->pdo->queryInsert(
-					sprintf('INSERT INTO release_nfos (nfo, releaseid) VALUES (compress(%s), %d)',
+					sprintf('INSERT INTO release_nfos (nfo, releases_id) VALUES (compress(%s), %d)',
 						$this->pdo->escapeString($nfo),
 						$release['id']
 					)
@@ -350,9 +350,9 @@ class Nfo
 					$cp = 'COMPRESS(%s)';
 					$nc = $this->pdo->escapeString($fetchedBinary);
 
-					$ckreleaseid = $this->pdo->queryOneRow(sprintf('SELECT id FROM release_nfos WHERE releaseid = %d', $arr['id']));
+					$ckreleaseid = $this->pdo->queryOneRow(sprintf('SELECT id FROM release_nfos WHERE releases_id = %d', $arr['id']));
 					if (!isset($ckreleaseid['id'])) {
-						$this->pdo->queryInsert(sprintf('INSERT INTO release_nfos (nfo, releaseid) VALUES (' . $cp . ', %d)', $nc, $arr['id']));
+						$this->pdo->queryInsert(sprintf('INSERT INTO release_nfos (nfo, releases_id) VALUES (' . $cp . ', %d)', $nc, $arr['id']));
 					}
 					$this->pdo->queryExec(sprintf('UPDATE releases SET nfostatus = %d WHERE id = %d', self::NFO_FOUND, $arr['id']));
 					$ret++;
@@ -399,7 +399,7 @@ class Nfo
 			foreach ($releases as $release) {
 				// remove any releasenfo for failed
 				$this->pdo->queryExec(sprintf('
-					DELETE FROM release_nfos WHERE nfo IS NULL AND releaseid = %d',
+					DELETE FROM release_nfos WHERE nfo IS NULL AND releases_id = %d',
 						$release['id']
 					)
 				);
diff --git a/newznab/ReleaseComments.php b/newznab/ReleaseComments.php
index baaff18fe..864d51bc1 100644
--- a/newznab/ReleaseComments.php
+++ b/newznab/ReleaseComments.php
@@ -173,7 +173,7 @@ class ReleaseComments
 
 		$comid = $this->pdo->queryInsert(
 			sprintf("
-				INSERT INTO release_comments (releaseid, gid, text, userid, createddate, host, username)
+				INSERT INTO release_comments (releases_id, gid, text, userid, createddate, host, username)
 				VALUES (%d, %s, %s, %d, NOW(), %s, %s)",
 				$id,
 				$this->pdo->escapeString($gid),
diff --git a/newznab/ReleaseExtra.php b/newznab/ReleaseExtra.php
index 63d3e6293..8eb89c586 100644
--- a/newznab/ReleaseExtra.php
+++ b/newznab/ReleaseExtra.php
@@ -55,22 +55,22 @@ class ReleaseExtra
 	public function get($id)
 	{
 		// hopefully nothing will use this soon and it can be deleted
-		return $this->pdo->queryOneRow(sprintf('SELECT * FROM video_data WHERE releaseid = %d', $id));
+		return $this->pdo->queryOneRow(sprintf('SELECT * FROM video_data WHERE releases_id = %d', $id));
 	}
 
 	public function getVideo($id)
 	{
-		return $this->pdo->queryOneRow(sprintf('SELECT * from video_data WHERE releaseid = %d', $id));
+		return $this->pdo->queryOneRow(sprintf('SELECT * from video_data WHERE releases_id = %d', $id));
 	}
 
 	public function getAudio($id)
 	{
-		return $this->pdo->query(sprintf('SELECT * from release_audio WHERE releaseid = %d ORDER BY audioid ASC', $id));
+		return $this->pdo->query(sprintf('SELECT * from release_audio WHERE releases_id = %d ORDER BY audioid ASC', $id));
 	}
 
 	public function getSubs($id)
 	{
-		return $this->pdo->queryOneRow(sprintf("SELECT GROUP_CONCAT(subslanguage SEPARATOR ', ') AS subs FROM release_subtitles WHERE releaseid = %d ORDER BY subsid ASC", $id));
+		return $this->pdo->queryOneRow(sprintf("SELECT GROUP_CONCAT(subslanguage SEPARATOR ', ') AS subs FROM release_subtitles WHERE releases_id = %d ORDER BY subsid ASC", $id));
 	}
 
 	public function getBriefByGuid($guid)
@@ -85,9 +85,9 @@ class ReleaseExtra
 
 	public function delete($id)
 	{
-		$this->pdo->queryExec(sprintf('DELETE FROM release_audio WHERE releaseid = %d', $id));
-		$this->pdo->queryExec(sprintf('DELETE FROM release_subtitles WHERE releaseid = %d', $id));
-		return $this->pdo->queryExec(sprintf('DELETE FROM video_data WHERE releaseid = %d', $id));
+		$this->pdo->queryExec(sprintf('DELETE FROM release_audio WHERE releases_id = %d', $id));
+		$this->pdo->queryExec(sprintf('DELETE FROM release_subtitles WHERE releases_id = %d', $id));
+		return $this->pdo->queryExec(sprintf('DELETE FROM video_data WHERE releases_id = %d', $id));
 	}
 
 	public function addFromXml($releaseID, $xml)
@@ -188,43 +188,43 @@ class ReleaseExtra
 
 	public function addVideo($releaseID, $containerformat, $overallbitrate, $videoduration, $videoformat, $videocodec, $videowidth, $videoheight, $videoaspect, $videoframerate, $videolibrary)
 	{
-		$ckid = $this->pdo->queryOneRow(sprintf('SELECT releaseid FROM video_data WHERE releaseid = %s', $releaseID));
-		if (!isset($ckid['releaseid'])) {
-			return $this->pdo->queryExec(sprintf('INSERT INTO video_data (releaseid, containerformat, overallbitrate, videoduration, videoformat, videocodec, videowidth, videoheight, videoaspect, videoframerate, videolibrary) VALUES (%d, %s, %s, %s, %s, %s, %d, %d, %s, %d, %s)', $releaseID, $this->pdo->escapeString($containerformat), $this->pdo->escapeString($overallbitrate), $this->pdo->escapeString($videoduration), $this->pdo->escapeString($videoformat), $this->pdo->escapeString($videocodec), $videowidth, $videoheight, $this->pdo->escapeString($videoaspect), $videoframerate, $this->pdo->escapeString(substr($videolibrary, 0, 50))));
+		$ckid = $this->pdo->queryOneRow(sprintf('SELECT releases_id FROM video_data WHERE releases_id = %s', $releaseID));
+		if (!isset($ckid['releases_id'])) {
+			return $this->pdo->queryExec(sprintf('INSERT INTO video_data (releases_id, containerformat, overallbitrate, videoduration, videoformat, videocodec, videowidth, videoheight, videoaspect, videoframerate, videolibrary) VALUES (%d, %s, %s, %s, %s, %s, %d, %d, %s, %d, %s)', $releaseID, $this->pdo->escapeString($containerformat), $this->pdo->escapeString($overallbitrate), $this->pdo->escapeString($videoduration), $this->pdo->escapeString($videoformat), $this->pdo->escapeString($videocodec), $videowidth, $videoheight, $this->pdo->escapeString($videoaspect), $videoframerate, $this->pdo->escapeString(substr($videolibrary, 0, 50))));
 		}
 	}
 
 	public function addAudio($releaseID, $audioID, $audioformat, $audiomode, $audiobitratemode, $audiobitrate, $audiochannels, $audiosamplerate, $audiolibrary, $audiolanguage, $audiotitle)
 	{
-		$ckid = $this->pdo->queryOneRow(sprintf('SELECT releaseid FROM release_audio WHERE releaseid = %s', $releaseID));
-		if (!isset($ckid['releaseid'])) {
-			return $this->pdo->queryExec(sprintf('INSERT INTO release_audio (releaseid, audioid, audioformat, audiomode, audiobitratemode, audiobitrate, audiochannels, audiosamplerate, audiolibrary ,audiolanguage, audiotitle) VALUES (%d, %d, %s, %s, %s, %s, %s, %s, %s, %s, %s)', $releaseID, $audioID, $this->pdo->escapeString($audioformat), $this->pdo->escapeString($audiomode), $this->pdo->escapeString($audiobitratemode), $this->pdo->escapeString(substr($audiobitrate, 0, 10)), $this->pdo->escapeString($audiochannels), $this->pdo->escapeString(substr($audiosamplerate, 0, 25)), $this->pdo->escapeString(substr($audiolibrary, 0, 50)), $this->pdo->escapeString($audiolanguage), $this->pdo->escapeString(substr($audiotitle, 0, 50))));
+		$ckid = $this->pdo->queryOneRow(sprintf('SELECT releases_id FROM release_audio WHERE releases_id = %s', $releaseID));
+		if (!isset($ckid['releases_id'])) {
+			return $this->pdo->queryExec(sprintf('INSERT INTO release_audio (releases_id, audioid, audioformat, audiomode, audiobitratemode, audiobitrate, audiochannels, audiosamplerate, audiolibrary ,audiolanguage, audiotitle) VALUES (%d, %d, %s, %s, %s, %s, %s, %s, %s, %s, %s)', $releaseID, $audioID, $this->pdo->escapeString($audioformat), $this->pdo->escapeString($audiomode), $this->pdo->escapeString($audiobitratemode), $this->pdo->escapeString(substr($audiobitrate, 0, 10)), $this->pdo->escapeString($audiochannels), $this->pdo->escapeString(substr($audiosamplerate, 0, 25)), $this->pdo->escapeString(substr($audiolibrary, 0, 50)), $this->pdo->escapeString($audiolanguage), $this->pdo->escapeString(substr($audiotitle, 0, 50))));
 		}
 	}
 
 	public function addSubs($releaseID, $subsID, $subslanguage)
 	{
-		$ckid = $this->pdo->queryOneRow(sprintf('SELECT releaseid FROM release_subtitles WHERE releaseid = %s', $releaseID));
-		if (!isset($ckid['releaseid'])) {
-			return $this->pdo->queryExec(sprintf('INSERT INTO release_subtitles (releaseid, subsid, subslanguage) VALUES (%d, %d, %s)', $releaseID, $subsID, $this->pdo->escapeString($subslanguage)));
+		$ckid = $this->pdo->queryOneRow(sprintf('SELECT releases_id FROM release_subtitles WHERE releases_id = %s', $releaseID));
+		if (!isset($ckid['releases_id'])) {
+			return $this->pdo->queryExec(sprintf('INSERT INTO release_subtitles (releases_id, subsid, subslanguage) VALUES (%d, %d, %s)', $releaseID, $subsID, $this->pdo->escapeString($subslanguage)));
 		}
 	}
 
 	public function getFull($id)
 	{
-		return $this->pdo->queryOneRow(sprintf('SELECT * FROM releaseextrafull WHERE releaseid = %d', $id));
+		return $this->pdo->queryOneRow(sprintf('SELECT * FROM releaseextrafull WHERE releases_id = %d', $id));
 	}
 
 	public function deleteFull($id)
 	{
-		return $this->pdo->queryExec(sprintf('DELETE FROM releaseextrafull WHERE releaseid = %d', $id));
+		return $this->pdo->queryExec(sprintf('DELETE FROM releaseextrafull WHERE releases_id = %d', $id));
 	}
 
 	public function addFull($id, $xml)
 	{
-		$ckid = $this->pdo->queryOneRow(sprintf('SELECT releaseid FROM releaseextrafull WHERE releaseid = %s', $id));
-		if (!isset($ckid['releaseid'])) {
-			return $this->pdo->queryExec(sprintf('INSERT INTO releaseextrafull (releaseid, mediainfo) VALUES (%d, %s)', $id, $this->pdo->escapeString($xml)));
+		$ckid = $this->pdo->queryOneRow(sprintf('SELECT releases_id FROM releaseextrafull WHERE releases_id = %s', $id));
+		if (!isset($ckid['releases_id'])) {
+			return $this->pdo->queryExec(sprintf('INSERT INTO releaseextrafull (releases_id, mediainfo) VALUES (%d, %s)', $id, $this->pdo->escapeString($xml)));
 		}
 	}
 }
diff --git a/newznab/ReleaseFiles.php b/newznab/ReleaseFiles.php
index ad93b6d4e..d99f970ab 100644
--- a/newznab/ReleaseFiles.php
+++ b/newznab/ReleaseFiles.php
@@ -37,7 +37,7 @@ class ReleaseFiles
 	 */
 	public function get($id)
 	{
-		return $this->pdo->query(sprintf("SELECT * FROM release_files WHERE releaseid = %d ORDER BY release_files.name ", $id));
+		return $this->pdo->query(sprintf("SELECT * FROM release_files WHERE releases_id = %d ORDER BY release_files.name ", $id));
 	}
 
 	/**
@@ -61,7 +61,7 @@ class ReleaseFiles
 	 */
 	public function delete($id)
 	{
-		$res = $this->pdo->queryExec(sprintf("DELETE FROM release_files WHERE releaseid = %d", $id));
+		$res = $this->pdo->queryExec(sprintf("DELETE FROM release_files WHERE releases_id = %d", $id));
 		$this->sphinxSearch->updateRelease($id, $this->pdo);
 		return $res;
 	}
@@ -83,9 +83,9 @@ class ReleaseFiles
 
 		$duplicateCheck = $this->pdo->queryOneRow(
 				sprintf('
-				SELECT releaseid
+				SELECT releases_id
 				FROM release_files
-				WHERE releaseid = %d AND name = %s',
+				WHERE releases_id = %d AND name = %s',
 						$id,
 						$this->pdo->escapeString($name)
 				)
@@ -95,7 +95,7 @@ class ReleaseFiles
 			$insert = $this->pdo->queryInsert(
 					sprintf("
 						INSERT INTO release_files
-						(releaseid, name, size, createddate, passworded)
+						(releases_id, name, size, createddate, passworded)
 						VALUES
 						(%d, %s, %s, %s, %d)",
 							$id,
diff --git a/newznab/Releases.php b/newznab/Releases.php
index 7082f1ca1..f479affd2 100755
--- a/newznab/Releases.php
+++ b/newznab/Releases.php
@@ -1359,7 +1359,7 @@ class Releases
 	{
 		return $this->pdo->queryOneRow(
 			sprintf(
-				'SELECT releaseid %s FROM release_nfos WHERE releaseid = %d AND nfo IS NOT NULL',
+				'SELECT releases_id %s FROM release_nfos WHERE releases_id = %d AND nfo IS NOT NULL',
 				($getNfoString ? ", UNCOMPRESS(nfo) AS nfo" : ''),
 				$id
 			)
diff --git a/newznab/Sharing.php b/newznab/Sharing.php
index 8956654e0..6d4369724 100644
--- a/newznab/Sharing.php
+++ b/newznab/Sharing.php
@@ -554,7 +554,7 @@ Class Sharing
 		if ($this->pdo->queryExec(
 			sprintf('
 				INSERT IGNORE INTO release_comments
-				(text, createddate, issynced, shareid, cid, gid, nzb_guid, siteid, username, userid, releaseid, shared, host, sourceID)
+				(text, createddate, issynced, shareid, cid, gid, nzb_guid, siteid, username, userid, releases_id, shared, host, sourceID)
 				VALUES (%s, %s, 1, %s, %s, %s, %s, %s, %s, 0, 0, 2, "", 999)',
 				$this->pdo->escapeString($body['BODY']),
 				$this->pdo->from_unixtime(($body['TIME'] > time() ? time() : $body['TIME'])),
diff --git a/newznab/SpotNab.php b/newznab/SpotNab.php
index a5de4b57c..4a55f0529 100644
--- a/newznab/SpotNab.php
+++ b/newznab/SpotNab.php
@@ -261,7 +261,7 @@ class SpotNab {
 		// comments they do not have a release for... Makes sense :)
 		$offset = 0;
 		$sql = "SELECT DISTINCT(gid) as gid FROM release_comments "
-			."WHERE releaseid = 0 "
+			."WHERE releases_id = 0 "
 			."AND createddate < NOW() - INTERVAL $max_days DAY "
 			."ORDER BY createddate "
 			."LIMIT %d,%d";
@@ -1221,7 +1221,7 @@ class SpotNab {
 		// Comments
 		$sql_new_cmt = "INSERT INTO release_comments (".
 			"id, sourceid, username, userid, gid, cid, isvisible, ".
-			"releaseid, text, createddate, issynced, nzb_guid) VALUES (".
+			"releases_id, text, createddate, issynced, nzb_guid) VALUES (".
 			"NULL, %d, %s, 0, %s, %s, %d, 0, %s, %s, 1, UNHEX(%s))";
 		$sql_upd_cmt = "UPDATE release_comments SET ".
 			"isvisible = %d, text = %s".
diff --git a/newznab/Users.php b/newznab/Users.php
index 14c3c06d3..6d7792c3d 100644
--- a/newznab/Users.php
+++ b/newznab/Users.php
@@ -721,7 +721,7 @@ class Users
 	public function addCart($uid, $releaseid)
 	{
 
-		$sql = sprintf("INSERT INTO users_releases (userid, releaseid, createddate) VALUES (%d, %d, now())", $uid, $releaseid);
+		$sql = sprintf("INSERT INTO users_releases (userid, releases_id, createddate) VALUES (%d, %d, now())", $uid, $releaseid);
 
 		return $this->pdo->queryInsert($sql);
 	}
@@ -759,12 +759,12 @@ class Users
 	{
 		$rel = $this->pdo->queryOneRow(sprintf("SELECT id FROM releases WHERE guid = %s", $this->pdo->escapeString($guid)));
 		if ($rel)
-			$this->pdo->queryExec(sprintf("DELETE FROM users_releases WHERE userid = %d AND releaseid = %d", $uid, $rel["id"]));
+			$this->pdo->queryExec(sprintf("DELETE FROM users_releases WHERE userid = %d AND releases_id = %d", $uid, $rel["id"]));
 	}
 
 	public function delCartForRelease($rid)
 	{
-		$this->pdo->queryExec(sprintf("DELETE FROM users_releases WHERE releaseid = %d", $rid));
+		$this->pdo->queryExec(sprintf("DELETE FROM users_releases WHERE releases_id = %d", $rid));
 	}
 
 	public function addCategoryExclusions($uid, $catids)
@@ -1077,7 +1077,7 @@ class Users
 	{
 		if ($days == 0) {
 			$days = 1;
-			$this->pdo->queryExec("UPDATE user_downloads SET releaseid = null");
+			$this->pdo->queryExec("UPDATE user_downloads SET releases_id = null");
 		}
 
 		$this->pdo->queryExec(sprintf("DELETE FROM user_requests WHERE timestamp < DATE_SUB(NOW(), INTERVAL %d DAY)", $days));
@@ -1134,7 +1134,7 @@ class Users
 	{
 		return $this->pdo->queryInsert(
 			sprintf(
-				"INSERT INTO user_downloads (userid, releaseid, timestamp) VALUES (%d, %d, NOW())",
+				"INSERT INTO user_downloads (userid, releases_id, timestamp) VALUES (%d, %d, NOW())",
 				$userID,
 				$releaseID
 			)
@@ -1143,7 +1143,7 @@ class Users
 
 	public function delDownloadRequestsForRelease($releaseID)
 	{
-		return $this->pdo->queryInsert(sprintf("delete FROM user_downloads WHERE releaseid = %d", $releaseID));
+		return $this->pdo->queryInsert(sprintf("delete FROM user_downloads WHERE releases_id = %d", $releaseID));
 	}
 
 	/**
diff --git a/newznab/processing/PostProcess.php b/newznab/processing/PostProcess.php
index cda1f9a8a..1b076d3b1 100755
--- a/newznab/processing/PostProcess.php
+++ b/newznab/processing/PostProcess.php
@@ -396,9 +396,9 @@ class PostProcess
 					if ($filesAdded < 11 &&
 						$this->pdo->queryOneRow(
 							sprintf('
-								SELECT releaseid
+								SELECT releases_id
 								FROM release_files
-								WHERE releaseid = %d
+								WHERE releases_id = %d
 								AND name = %s',
 								$relID,
 								$this->pdo->escapeString($file['name'])
diff --git a/newznab/processing/post/ProcessAdditional.php b/newznab/processing/post/ProcessAdditional.php
index 7a8c51fc4..00c5516b2 100644
--- a/newznab/processing/post/ProcessAdditional.php
+++ b/newznab/processing/post/ProcessAdditional.php
@@ -1230,8 +1230,8 @@ class ProcessAdditional
 				$this->pdo->queryOneRow(
 					sprintf(
 						'
-						SELECT releaseid FROM release_files
-						WHERE releaseid = %d
+						SELECT releases_id FROM release_files
+						WHERE releases_id = %d
 						AND name = %s
 						AND size = %d',
 						$this->_release['id'], $this->pdo->escapeString($file['name']), $file['size']
@@ -1657,7 +1657,7 @@ class ProcessAdditional
 				SELECT COUNT(release_files.releases_id) AS count,
 				SUM(release_files.size) AS size
 				FROM release_files
-				WHERE releaseid = %d',
+				WHERE releases_id = %d',
 				$this->_release['id']
 			)
 		);
@@ -2295,7 +2295,7 @@ class ProcessAdditional
 				if ($filesAdded < 11 &&
 					$this->pdo->queryOneRow(
 						sprintf(
-							'SELECT releaseid FROM release_files WHERE releaseid = %d AND name = %s',
+							'SELECT releases_id FROM release_files WHERE releases_id = %d AND name = %s',
 							$this->_release['id'], $this->pdo->escapeString($file['name'])
 						)
 					) === false
diff --git a/www/pages/api.php b/www/pages/api.php
index 5f151369c..ee21c1f93 100644
--- a/www/pages/api.php
+++ b/www/pages/api.php
@@ -470,7 +470,7 @@ function addLanguage(&$releases, Settings $settings)
 				$language = $settings->queryOneRow('
 					SELECT audiolanguage
 					FROM release_audio
-					WHERE releaseid = ' .
+					WHERE releases_id = ' .
 						$release['id']
 				);
 				if ($language !== false) {