diff --git a/Changelog b/Changelog
index ebba9e7ce..90e476c30 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2016-05-24 DariusIII
+	* Chg: Rename groupid column to groups_id.
 	* Upd: Improve speed of update_releases on larger databases
 2016-05-22 DariusIII
 	* Upd: Update the +1 patch file
diff --git a/build/nntmux.xml b/build/nntmux.xml
index 5bbd5a5aa..f881afcb5 100755
--- a/build/nntmux.xml
+++ b/build/nntmux.xml
@@ -16,8 +16,8 @@
 			</last>
 		</scripts>
 		<sql>
-			<db>257</db>
-			<file>257</file>
+			<db>258</db>
+			<file>258</file>
 		</sql>
 	</versions>
 </nntmux>
diff --git a/cli/data/predb_import_daily_batch.php b/cli/data/predb_import_daily_batch.php
index da3e275e7..6c52e909f 100755
--- a/cli/data/predb_import_daily_batch.php
+++ b/cli/data/predb_import_daily_batch.php
@@ -19,7 +19,7 @@
  * @copyright 2015 nZEDb
  */
 
-/* TODO better tune the queries for performance, including pre-fetching group_id and other data for
+/* TODO better tune the queries for performance, including pre-fetching groups_id and other data for
 	faster inclusion in the main query.
 */
 require_once realpath(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'indexer.php');
@@ -180,7 +180,7 @@ foreach ($data as $file) {
 			// Add any groups that do not currently exist
 			$predb->executeAddGroups();
 
-			// Fill the group_id
+			// Fill the groups_id
 			$predb->executeUpdateGroupID();
 
 			echo $predb->log->info("Inserting records from temporary table into predb table");
diff --git a/misc/testing/PreDB/dump_predb.php b/misc/testing/PreDB/dump_predb.php
index 737081c76..9e63d335d 100644
--- a/misc/testing/PreDB/dump_predb.php
+++ b/misc/testing/PreDB/dump_predb.php
@@ -31,8 +31,8 @@ if (isset($argv[1]) && $argv[1] == 'export' && isset($argv[2])) {
 	} else {
 		$table = 'predb';
 	}
-	echo  $pdo->log->header("SELECT title, nfo, size, files, filename, nuked, nukereason, category, predate, source, requestid, g.name FROM " . $table . " p LEFT OUTER JOIN groups g ON p.groupid = g.id INTO OUTFILE '" . $path . "' FIELDS TERMINATED BY '\\t\\t' ENCLOSED BY \"'\" LINES TERMINATED BY '\\r\\n';n");
-	$pdo->queryExec("SELECT title, nfo, size, files, filename, nuked, nukereason, category, predate, source, requestid, g.name FROM " . $table . " p LEFT OUTER JOIN groups g ON p.groupid = g.id INTO OUTFILE '" . $path . "' FIELDS TERMINATED BY '\t\t' ENCLOSED BY \"'\" LINES TERMINATED BY '\r\n'");
+	echo  $pdo->log->header("SELECT title, nfo, size, files, filename, nuked, nukereason, category, predate, source, requestid, g.name FROM " . $table . " p LEFT OUTER JOIN groups g ON p.groups_id = g.id INTO OUTFILE '" . $path . "' FIELDS TERMINATED BY '\\t\\t' ENCLOSED BY \"'\" LINES TERMINATED BY '\\r\\n';n");
+	$pdo->queryExec("SELECT title, nfo, size, files, filename, nuked, nukereason, category, predate, source, requestid, g.name FROM " . $table . " p LEFT OUTER JOIN groups g ON p.groups_id = g.id INTO OUTFILE '" . $path . "' FIELDS TERMINATED BY '\t\t' ENCLOSED BY \"'\" LINES TERMINATED BY '\r\n'");
 } else if (isset($argv[1]) && ($argv[1] == 'local' || $argv[1] == 'remote') && isset($argv[2]) && is_file($argv[2])) {
 	if (!preg_match('/^\//', $path)) {
 		$path = require_once getcwd() . '/' . $argv[2];
@@ -77,7 +77,7 @@ SQL_ADD_GROUPS;
 
 	// Insert and update table
 	$sqlInsert = <<<SQL_INSERT
-INSERT INTO $table (title, nfo, size, files, filename, nuked, nukereason, category, predate, SOURCE, requestid, groupid)
+INSERT INTO $table (title, nfo, size, files, filename, nuked, nukereason, category, predate, SOURCE, requestid, groups_id)
   SELECT t.title, t.nfo, t.size, t.files, t.filename, t.nuked, t.nukereason, t.category, t.predate, t.source, t.requestid, IF(g.id IS NOT NULL, g.id, 0)
     FROM predb_imports AS t
 	LEFT OUTER JOIN groups g ON t.groupname = g.name ON DUPLICATE KEY UPDATE predb.nfo = IF(predb.nfo IS NULL, t.nfo, predb.nfo),
@@ -88,7 +88,7 @@ INSERT INTO $table (title, nfo, size, files, filename, nuked, nukereason, catego
 	  predb.nukereason = IF(t.nuked > 0, t.nukereason, predb.nukereason),
 	  predb.category = IF(predb.category IS NULL, t.category, predb.category),
 	  predb.requestid = IF(predb.requestid = 0, t.requestid, predb.requestid),
-	  predb.groupid = IF(g.id IS NOT NULL, g.id, 0);
+	  predb.groups_id = IF(g.id IS NOT NULL, g.id, 0);
 SQL_INSERT;
 	echo $pdo->log->primary($sqlInsert);
 	$pdo->queryExec($sqlInsert);
diff --git a/misc/testing/Releases/recategorize.php b/misc/testing/Releases/recategorize.php
index 826b183ab..afe4c3fc5 100644
--- a/misc/testing/Releases/recategorize.php
+++ b/misc/testing/Releases/recategorize.php
@@ -31,9 +31,9 @@ function reCategorize($argv)
 	$othercats = implode(",", Category::OTHERS_GROUP);
 	$update = true;
 	if (isset($argv[1]) && is_numeric($argv[1])) {
-		$where = ' AND groupid = ' . $argv[1];
+		$where = ' AND groups_id = ' . $argv[1];
 	} else if (isset($argv[1]) && preg_match('/\([\d, ]+\)/', $argv[1])) {
-		$where = ' AND groupid IN ' . $argv[1];
+		$where = ' AND groups_id IN ' . $argv[1];
 	} else if (isset($argv[1]) && $argv[1] === 'misc') {
 		$where = sprintf(' AND categories_id IN (%s)', $othercats);
 	}
@@ -73,12 +73,12 @@ function categorizeRelease($where, $update = true, $echooutput = false)
 	$pdo->log = new ColorCLI();
 	$consoletools = new ConsoleTools(['ColorCLI' => $pdo->log]);
 	$relcount = $chgcount = 0;
-	echo $pdo->log->primary("SELECT id, searchname, groupid, categories_id FROM releases " . $where);
-	$resrel = $pdo->queryDirect("SELECT id, searchname, groupid, categories_id FROM releases " . $where);
+	echo $pdo->log->primary("SELECT id, searchname, groups_id, categories_id FROM releases " . $where);
+	$resrel = $pdo->queryDirect("SELECT id, searchname, groups_id, categories_id FROM releases " . $where);
 	$total = $resrel->rowCount();
 	if ($total > 0) {
 		foreach ($resrel as $rowrel) {
-			$catId = $cat->determineCategory($rowrel['groupid'], $rowrel['searchname']);
+			$catId = $cat->determineCategory($rowrel['groups_id'], $rowrel['searchname']);
 			if ($rowrel['categories_id'] != $catId) {
 				if ($update === true) {
 					$pdo->queryExec(
diff --git a/misc/testing/Various/renametopre.php b/misc/testing/Various/renametopre.php
index 50ec61db1..92ed17d5a 100644
--- a/misc/testing/Various/renametopre.php
+++ b/misc/testing/Various/renametopre.php
@@ -71,19 +71,19 @@ function preName($argv, $argc)
 		$where = '';
 		$why = ' WHERE nzbstatus = 1 AND isrenamed = 0';
 	} else if (isset($argv[2]) && is_numeric($argv[2]) && $full === true) {
-		$where = ' AND groupid = ' . $argv[2];
+		$where = ' AND groups_id = ' . $argv[2];
 		$why = ' WHERE nzbstatus = 1 AND isrenamed = 0';
 	} else if (isset($argv[2]) && preg_match('/\([\d, ]+\)/', $argv[2]) && $full === true) {
-		$where = ' AND groupid IN ' . $argv[2];
+		$where = ' AND groups_id IN ' . $argv[2];
 		$why = ' WHERE nzbstatus = 1 AND isrenamed = 0';
 	} else if (isset($argv[2]) && preg_match('/\([\d, ]+\)/', $argv[2]) && $all === true) {
-		$where = ' AND groupid IN ' . $argv[2];
+		$where = ' AND groups_id IN ' . $argv[2];
 		$why = ' WHERE nzbstatus = 1';
 	} else if (isset($argv[2]) && is_numeric($argv[2]) && $all === true) {
-		$where = ' AND groupid = ' . $argv[2];
+		$where = ' AND groups_id = ' . $argv[2];
 		$why = ' WHERE nzbstatus = 1 and predb_id = 0';
 	} else if (isset($argv[2]) && is_numeric($argv[2])) {
-		$where = ' AND groupid = ' . $argv[2];
+		$where = ' AND groups_id = ' . $argv[2];
 		$why = ' WHERE nzbstatus = 1 AND isrenamed = 0';
 	} else if ($full === true) {
 		$why = ' WHERE nzbstatus = 1 AND (isrenamed = 0 OR categories_id between 7000 AND 7999)';
@@ -94,15 +94,15 @@ function preName($argv, $argc)
 	}
 	resetSearchnames();
 	echo $pdo->log->header(
-		"SELECT id, name, searchname, fromname, size, groupid, categories_id FROM releases" . $why . $what .
+		"SELECT id, name, searchname, fromname, size, groups_id, categories_id FROM releases" . $why . $what .
 		$where . ";\n"
 	);
-	$res = $pdo->queryDirect("SELECT id, name, searchname, fromname, size, groupid, categories_id FROM releases" . $why . $what . $where);
+	$res = $pdo->queryDirect("SELECT id, name, searchname, fromname, size, groups_id, categories_id FROM releases" . $why . $what . $where);
 	$total = $res->rowCount();
 	if ($total > 0) {
 		$consoletools = new ConsoleTools(['ColorCLI' => $pdo->log]);
 		foreach ($res as $row) {
-			$groupname = $groups->getByNameByID($row['groupid']);
+			$groupname = $groups->getByNameByID($row['groups_id']);
 			$cleanerName = releaseCleaner($row['name'], $row['fromname'], $row['size'], $groupname, $usepre);
 			$preid = 0;
 			$predb = $predbfile = $increment = false;
@@ -155,7 +155,7 @@ function preName($argv, $argc)
 				if ($cleanName != $row['name'] && $cleanName != $row['searchname']) {
 					if (strlen(utf8_decode($cleanName)) <= 3) {
 					} else {
-						$determinedcat = $category->determineCategory($row["groupid"], $cleanName);
+						$determinedcat = $category->determineCategory($row["groups_id"], $cleanName);
 						if ($propername == true) {
 							$pdo->queryExec(
 								sprintf(
@@ -278,12 +278,12 @@ function catRelease($type, $where, $echooutput = false)
 	$cat = new Categorize(['Settings' => $pdo]);
 	$consoletools = new ConsoleTools(['ColorCLI' => $pdo->log]);
 	$relcount = 0;
-	echo $pdo->log->primary("SELECT id, " . $type . ", groupid FROM releases " . $where);
-	$resrel = $pdo->queryDirect("SELECT id, " . $type . ", groupid FROM releases " . $where);
+	echo $pdo->log->primary("SELECT id, " . $type . ", groups_id FROM releases " . $where);
+	$resrel = $pdo->queryDirect("SELECT id, " . $type . ", groups_id FROM releases " . $where);
 	$total = $resrel->rowCount();
 	if ($total > 0) {
 		foreach ($resrel as $rowrel) {
-			$catId = $cat->determineCategory($rowrel['groupid'], $rowrel[$type]);
+			$catId = $cat->determineCategory($rowrel['groups_id'], $rowrel[$type]);
 			$pdo->queryExec(sprintf("UPDATE releases SET iscategorized = 1, categories_id = %d WHERE id = %d", $catId, $rowrel['id']));
 			$relcount++;
 			if ($echooutput) {
diff --git a/misc/update/decrypt_hashes.php b/misc/update/decrypt_hashes.php
index 73b5bee7f..4e8c0c5c0 100755
--- a/misc/update/decrypt_hashes.php
+++ b/misc/update/decrypt_hashes.php
@@ -31,11 +31,11 @@ function getPreName($argv)
 
 	$res = false;
 	if (isset($argv[1]) && $argv[1] === "all") {
-		$res = $pdo->queryDirect('SELECT id AS releaseid, name, searchname, groupid, categories_id, dehashstatus FROM releases WHERE predb_id = 0 AND ishashed = 1');
+		$res = $pdo->queryDirect('SELECT id AS releaseid, name, searchname, groups_id, categories_id, dehashstatus FROM releases WHERE predb_id = 0 AND ishashed = 1');
 	} else if (isset($argv[1]) && $argv[1] === "full") {
-		$res = $pdo->queryDirect('SELECT id AS releaseid, name, searchname, groupid, categories_id, dehashstatus FROM releases WHERE categories_id = 7020 AND ishashed = 1 AND dehashstatus BETWEEN -6 AND 0');
+		$res = $pdo->queryDirect('SELECT id AS releaseid, name, searchname, groups_id, categories_id, dehashstatus FROM releases WHERE categories_id = 7020 AND ishashed = 1 AND dehashstatus BETWEEN -6 AND 0');
 	} else if (isset($argv[1]) && is_numeric($argv[1])) {
-		$res = $pdo->queryDirect('SELECT id AS releaseid, name, searchname, groupid, categories_id, dehashstatus FROM releases WHERE categories_id = 7020 AND ishashed = 1 AND dehashstatus BETWEEN -6 AND 0 ORDER BY postdate DESC LIMIT ' . $argv[1]);
+		$res = $pdo->queryDirect('SELECT id AS releaseid, name, searchname, groups_id, categories_id, dehashstatus FROM releases WHERE categories_id = 7020 AND ishashed = 1 AND dehashstatus BETWEEN -6 AND 0 ORDER BY postdate DESC LIMIT ' . $argv[1]);
 	}
 
 	$counter = $counted = $total = 0;
diff --git a/misc/update/nix/tmux/bin/fixreleasenames.php b/misc/update/nix/tmux/bin/fixreleasenames.php
index 5787d5af9..8df6986e0 100644
--- a/misc/update/nix/tmux/bin/fixreleasenames.php
+++ b/misc/update/nix/tmux/bin/fixreleasenames.php
@@ -18,7 +18,7 @@ if (!isset($argv[1])) {
 	$pieces = explode(' ', $argv[1]);
 	if (isset($pieces[1]) && $pieces[0] == 'nfo') {
 		$release = $pieces[1];
-		if ($res = $db->queryOneRow(sprintf('SELECT rel.guid AS guid, nfo.releases_id AS nfoid, rel.groupid, rel.categories_id, rel.name, rel.searchname, uncompress(nfo) AS textstring, rel.id AS releases_id FROM releases rel INNER JOIN release_nfos nfo ON (nfo.releases_id = rel.id) WHERE rel.id = %d', $release))) {
+		if ($res = $db->queryOneRow(sprintf('SELECT rel.guid AS guid, nfo.releases_id AS nfoid, rel.groups_id, rel.categories_id, rel.name, rel.searchname, uncompress(nfo) AS textstring, rel.id AS releases_id FROM releases rel INNER JOIN release_nfos nfo ON (nfo.releases_id = rel.id) WHERE rel.id = %d', $release))) {
 			//ignore encrypted nfos
 			if (preg_match('/^=newz\[NZB\]=\w+/', $res['textstring'])) {
 				$namefixer->done = $namefixer->matched = false;
@@ -37,7 +37,7 @@ if (!isset($argv[1])) {
 	} else if (isset($pieces[1]) && $pieces[0] == 'filename') {
 		$release = $pieces[1];
 		if ($res = $db->queryOneRow(sprintf('SELECT relfiles.name AS textstring, rel.categories_id, rel.searchname, '
-				. 'rel.groupid, relfiles.releases_id AS fileid, rel.id AS releases_id, rel.name FROM releases rel '
+				. 'rel.groups_id, relfiles.releases_id AS fileid, rel.id AS releases_id, rel.name FROM releases rel '
 				. 'INNER JOIN release_files relfiles ON (relfiles.releases_id = rel.id) WHERE rel.id = %d', $release))) {
 			$namefixer->done = $namefixer->matched = false;
 			if ($namefixer->checkName($res, true, 'Filenames, ', 1, 1) !== true) {
@@ -48,7 +48,7 @@ if (!isset($argv[1])) {
 	} else if (isset($pieces[1]) && $pieces[0] == 'srr') {
 		$release = $pieces[1];
 		if ($res = $db->queryOneRow(sprintf('SELECT relfiles.name AS textstring, rel.categories_id, rel.searchname, '
-			. 'rel.groupid, relfiles.releases_id AS fileid, rel.id AS releases_id, rel.name FROM releases rel '
+			. 'rel.groups_id, relfiles.releases_id AS fileid, rel.id AS releases_id, rel.name FROM releases rel '
 			. 'INNER JOIN release_files relfiles ON (relfiles.releases_id = rel.id) WHERE rel.id = %d', $release))) {
 			$namefixer->done = $namefixer->matched = false;
 			if ($namefixer->checkName($res, true, 'Srr, ', 1, 1) !== true) {
@@ -58,7 +58,7 @@ if (!isset($argv[1])) {
 		}
 	}else if (isset($pieces[1]) && $pieces[0] == 'md5') {
 		$release = $pieces[1];
-		if ($res = $db->queryOneRow(sprintf('SELECT r.id AS releases_id, r.name, r.searchname, r.categories_id, r.groupid, dehashstatus, rf.name AS filename FROM releases r LEFT JOIN release_files rf ON r.id = rf.releases_id WHERE r.id = %d', $release))) {
+		if ($res = $db->queryOneRow(sprintf('SELECT r.id AS releases_id, r.name, r.searchname, r.categories_id, r.groups_id, dehashstatus, rf.name AS filename FROM releases r LEFT JOIN release_files rf ON r.id = rf.releases_id WHERE r.id = %d', $release))) {
 			if (preg_match('/[a-fA-F0-9]{32,40}/i', $res['name'], $matches)) {
 				$namefixer->matchPredbHash($matches[0], $res, 1, 1, true, 1);
 			} else if (preg_match('/[a-fA-F0-9]{32,40}/i', $res['filename'], $matches)) {
diff --git a/misc/update/nix/tmux/bin/groupfixrelnames.php b/misc/update/nix/tmux/bin/groupfixrelnames.php
index b55941d68..db406b0a2 100644
--- a/misc/update/nix/tmux/bin/groupfixrelnames.php
+++ b/misc/update/nix/tmux/bin/groupfixrelnames.php
@@ -24,7 +24,7 @@ if (!isset($argv[1])) {
 		case $pieces[0] === 'nfo' && isset($guidChar) && isset($maxperrun) && is_numeric($maxperrun):
 			$releases = $pdo->queryDirect(
 				sprintf('
-					SELECT r.id AS releases_id, r.guid, r.groupid, r.categories_id, r.name, r.searchname,
+					SELECT r.id AS releases_id, r.guid, r.groups_id, r.categories_id, r.name, r.searchname,
 						uncompress(nfo) AS textstring
 					FROM releases r
 					INNER JOIN release_nfos rn ON r.id = rn.releases_id
@@ -69,7 +69,7 @@ if (!isset($argv[1])) {
 		case $pieces[0] === 'md5' && isset($guidChar) && isset($maxperrun) && is_numeric($maxperrun):
 			$releases = $pdo->queryDirect(
 				sprintf('
-					SELECT DISTINCT r.id AS releases_id, r.name, r.searchname, r.categories_id, r.groupid, r.dehashstatus,
+					SELECT DISTINCT r.id AS releases_id, r.name, r.searchname, r.categories_id, r.groups_id, r.dehashstatus,
 						rf.name AS filename
 					FROM releases r
 					LEFT OUTER JOIN release_files rf ON r.id = rf.releases_id AND rf.ishashed = 1
@@ -101,7 +101,7 @@ if (!isset($argv[1])) {
 		case $pieces[0] === 'par2' && isset($guidChar) && isset($maxperrun) && is_numeric($maxperrun):
 			$releases = $pdo->queryDirect(
 				sprintf('
-					SELECT r.id AS releases_id, r.guid, r.groupid
+					SELECT r.id AS releases_id, r.guid, r.groups_id
 					FROM releases r
 					WHERE r.leftguid = %s
 					AND r.nzbstatus = 1
@@ -128,7 +128,7 @@ if (!isset($argv[1])) {
 					)
 				);
 				foreach ($releases as $release) {
-					$res = $nzbcontents->checkPAR2($release['guid'], $release['releases_id'], $release['groupid'], 1, 1);
+					$res = $nzbcontents->checkPAR2($release['guid'], $release['releases_id'], $release['groups_id'], 1, 1);
 					if ($res === false) {
 						echo '.';
 					}
diff --git a/newznab/Books.php b/newznab/Books.php
index ff5f3e6ec..924185169 100644
--- a/newznab/Books.php
+++ b/newznab/Books.php
@@ -237,7 +237,7 @@ class Books
 			g.name AS group_name,
 			rn.id AS nfoid
 			FROM releases r
-			LEFT OUTER JOIN groups g ON g.id = r.groupid
+			LEFT OUTER JOIN groups g ON g.id = r.groups_id
 			LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
 			LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id
 			INNER JOIN bookinfo boo ON boo.id = r.bookinfo_id
diff --git a/newznab/Categorize.php b/newznab/Categorize.php
index 78a22ebef..ab70cb46c 100644
--- a/newznab/Categorize.php
+++ b/newznab/Categorize.php
@@ -63,7 +63,7 @@ class Categorize extends Category
 	 * Returns Category::OTHER_MISC if no category is appropriate.
 	 *
 	 * @param string     $releaseName The name to parse.
-	 * @param int|string $groupID     The groupid.
+	 * @param int|string $groupID     The groups_id.
 	 *
 	 * @return int The categories_id.
 	 */
diff --git a/newznab/Console.php b/newznab/Console.php
index 7c25b79f7..bb32bf044 100644
--- a/newznab/Console.php
+++ b/newznab/Console.php
@@ -236,7 +236,7 @@ class Console
 				genres.title AS genre,
 				rn.id AS nfoid
 				FROM releases r
-				LEFT OUTER JOIN groups g ON g.id = r.groupid
+				LEFT OUTER JOIN groups g ON g.id = r.groups_id
 				LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
 				LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id
 				INNER JOIN consoleinfo con ON con.id = r.consoleinfo_id
diff --git a/newznab/Games.php b/newznab/Games.php
index 50f9902b6..7092c20f9 100644
--- a/newznab/Games.php
+++ b/newznab/Games.php
@@ -248,7 +248,7 @@ class Games
 				con.*, YEAR (con.releasedate) as year, r.gamesinfo_id, g.name AS group_name,
 				rn.releases_id AS nfoid
 				FROM releases r
-				LEFT OUTER JOIN groups g ON g.id = r.groupid
+				LEFT OUTER JOIN groups g ON g.id = r.groups_id
 				LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
 				LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id
 				INNER JOIN gamesinfo con ON con.id = r.gamesinfo_id
diff --git a/newznab/Groups.php b/newznab/Groups.php
index cfb1a840b..7f78874f8 100644
--- a/newznab/Groups.php
+++ b/newznab/Groups.php
@@ -46,8 +46,8 @@ class Groups
 			COALESCE(rel.num, 0) AS num_releases
 			FROM groups
 			LEFT OUTER JOIN
-				(SELECT groupid, COUNT(id) AS num FROM releases GROUP BY groupid) rel
-			ON rel.groupid = groups.id
+				(SELECT groups_id, COUNT(id) AS num FROM releases GROUP BY groups_id) rel
+			ON rel.groups_id = groups.id
 			ORDER BY groups.name",
 			true, NN_CACHE_EXPIRY_LONG
 		);
@@ -131,7 +131,7 @@ class Groups
 	 *
 	 * @param string $name The group name.
 	 *
-	 * @return string Empty string on failure, groupid on success.
+	 * @return string Empty string on failure, groups_id on success.
 	 */
 	public function getIDByName($name)
 	{
@@ -180,10 +180,10 @@ class Groups
 				COALESCE(rel.num, 0) AS num_releases
 				FROM groups
 				LEFT OUTER JOIN
-					(SELECT groupid, COUNT(id) AS num
-						FROM releases GROUP BY groupid
+					(SELECT groups_id, COUNT(id) AS num
+						FROM releases GROUP BY groups_id
 					) rel
-				ON rel.groupid = groups.id
+				ON rel.groups_id = groups.id
 				WHERE 1 = 1 %s
 				ORDER BY groups.name " .
 				($start === false ? '' : " LIMIT " . $num . " OFFSET " . $start),
@@ -567,7 +567,7 @@ class Groups
 		}
 
 		$releaseArray = $this->pdo->queryDirect(
-			sprintf("SELECT id, guid FROM releases %s", ($id === false ? '' : 'WHERE groupid = ' . $id))
+			sprintf("SELECT id, guid FROM releases %s", ($id === false ? '' : 'WHERE groups_id = ' . $id))
 		);
 
 		if ($releaseArray instanceof \Traversable) {
@@ -648,11 +648,11 @@ class Groups
 				SELECT groups.*, COALESCE(rel.num, 0) AS num_releases
 				FROM groups
 				LEFT OUTER JOIN
-					(SELECT groupid, COUNT(id) AS num
+					(SELECT groups_id, COUNT(id) AS num
 						FROM releases
-						GROUP BY groupid
+						GROUP BY groups_id
 					) rel
-				ON rel.groupid = groups.id
+				ON rel.groups_id = groups.id
 				WHERE 1 = 1 %s
 				AND active = 1
 				ORDER BY groups.name " .
@@ -683,11 +683,11 @@ class Groups
 				SELECT groups.*, COALESCE(rel.num, 0) AS num_releases
 				FROM groups
 				LEFT OUTER JOIN
-					(SELECT groupid, COUNT(id) AS num
+					(SELECT groups_id, COUNT(id) AS num
 						FROM releases
-						GROUP BY groupid
+						GROUP BY groups_id
 					) rel
-				ON rel.groupid = groups.id
+				ON rel.groups_id = groups.id
 				WHERE 1 = 1 %s
 				AND active = 0
 				ORDER BY groups.name " .
diff --git a/newznab/IRCScraper.php b/newznab/IRCScraper.php
index 3d234cdab..d0c8a8989 100644
--- a/newznab/IRCScraper.php
+++ b/newznab/IRCScraper.php
@@ -285,7 +285,7 @@ class IRCScraper extends IRCClient
 		$query .= (!empty($this->_curPre['reason'])   ? 'nukereason, ' : '');
 		$query .= (!empty($this->_curPre['files'])    ? 'files, '      : '');
 		$query .= (!empty($this->_curPre['reqid'])    ? 'requestid, '  : '');
-		$query .= (!empty($this->_curPre['group_id'])  ? 'groupid, '    : '');
+		$query .= (!empty($this->_curPre['group_id'])  ? 'groups_id, '    : '');
 		$query .= (!empty($this->_curPre['nuked'])    ? 'nuked, '      : '');
 		$query .= (!empty($this->_curPre['filename']) ? 'filename, '   : '');
 
@@ -334,7 +334,7 @@ class IRCScraper extends IRCClient
 		$query .= (!empty($this->_curPre['files'])    ? 'files = '      . $this->_pdo->escapeString($this->_curPre['files'])    . ', ' : '');
 		$query .= (!empty($this->_curPre['reason'])   ? 'nukereason = ' . $this->_pdo->escapeString($this->_curPre['reason'])   . ', ' : '');
 		$query .= (!empty($this->_curPre['reqid'])    ? 'requestid = '  . $this->_curPre['reqid']                             . ', ' : '');
-		$query .= (!empty($this->_curPre['group_id'])  ? 'groupid = '    . $this->_curPre['group_id']                           . ', ' : '');
+		$query .= (!empty($this->_curPre['group_id'])  ? 'groups_id = '    . $this->_curPre['group_id']                           . ', ' : '');
 		$query .= (!empty($this->_curPre['predate'])  ? 'predate = '    . $this->_curPre['predate']                           . ', ' : '');
 		$query .= (!empty($this->_curPre['nuked'])    ? 'nuked = '      . $this->_curPre['nuked']                             . ', ' : '');
 		$query .= (!empty($this->_curPre['filename']) ? 'filename = '   . $this->_pdo->escapeString($this->_curPre['filename']) . ', ' : '');
diff --git a/newznab/MiscSorter.php b/newznab/MiscSorter.php
index da6386ff3..d1e5cbafa 100644
--- a/newznab/MiscSorter.php
+++ b/newznab/MiscSorter.php
@@ -71,7 +71,7 @@ class MiscSorter
 								r.id, r.name, r.searchname
 							FROM release_nfos rn
 							INNER JOIN releases r ON rn.releases_id = r.id
-							INNER JOIN groups g ON r.groupid = g.id
+							INNER JOIN groups g ON r.groups_id = g.id
 							WHERE rn.nfo IS NOT NULL
 							AND r.proc_sorter = %d
 							AND r.predb_id = 0 %s",
@@ -238,7 +238,7 @@ class MiscSorter
 		$release = $this->pdo->queryOneRow(
 			sprintf("
 							SELECT r.id AS releases_id, r.searchname AS searchname,
-								r.name AS name, r.categories_id, r.groupid
+								r.name AS name, r.categories_id, r.groups_id
 							FROM releases r
 							WHERE r.id = %d",
 				$id
diff --git a/newznab/Movie.php b/newznab/Movie.php
index eed733b25..f2b3ebfa5 100644
--- a/newznab/Movie.php
+++ b/newznab/Movie.php
@@ -329,7 +329,7 @@ class Movie
 			g.name AS group_name,
 			rn.releases_id AS nfoid
 			FROM releases r
-			LEFT OUTER JOIN groups g ON g.id = r.groupid
+			LEFT OUTER JOIN groups g ON g.id = r.groups_id
 			LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
 			LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id
 			LEFT OUTER JOIN categories c ON c.id = r.categories_id
@@ -1091,7 +1091,7 @@ class Movie
 				%s %s %s %s
 				LIMIT %d",
 				$this->catWhere,
-				($groupID === '' ? '' : ('AND r.groupid = ' . $groupID)),
+				($groupID === '' ? '' : ('AND r.groups_id = ' . $groupID)),
 				($guidChar === '' ? '' : 'AND r.leftguid = ' . $this->pdo->escapeString($guidChar)),
 				($lookupIMDB == 2 ? 'AND r.isrenamed = 1' : ''),
 				$this->movieqty
diff --git a/newznab/Music.php b/newznab/Music.php
index ce146400f..a65af6195 100644
--- a/newznab/Music.php
+++ b/newznab/Music.php
@@ -248,7 +248,7 @@ class Music
 				g.name AS group_name,
 				rn.releases_id AS nfoid
 			FROM releases r
-			LEFT OUTER JOIN groups g ON g.id = r.groupid
+			LEFT OUTER JOIN groups g ON g.id = r.groups_id
 			LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
 			LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id
 			INNER JOIN musicinfo m ON m.id = r.musicinfo_id
diff --git a/newznab/NZBImport.php b/newznab/NZBImport.php
index 8312d0012..2dd5d7589 100644
--- a/newznab/NZBImport.php
+++ b/newznab/NZBImport.php
@@ -445,7 +445,7 @@ class NZBImport
 					'name'			=> $escapedSubject,
 					'searchname'	=> $this->pdo->escapeString($cleanName),
 					'totalpart'		=> $nzbDetails['totalFiles'],
-					'groupid'		=> $nzbDetails['group_id'],
+					'groups_id'		=> $nzbDetails['group_id'],
 					'guid'			=> $this->pdo->escapeString($this->relGuid),
 					'postdate'		=> $this->pdo->escapeString($nzbDetails['postDate']),
 					'fromname'		=> $escapedFromName,
diff --git a/newznab/NameFixer.php b/newznab/NameFixer.php
index 6d87a012f..ac0de4b07 100755
--- a/newznab/NameFixer.php
+++ b/newznab/NameFixer.php
@@ -224,7 +224,7 @@ class NameFixer
 				foreach ($releases as $rel) {
 					$releaseRow = $this->pdo->queryOneRow(
 						sprintf('
-							SELECT nfo.releases_id AS nfoid, rel.groupid, rel.categories_id, rel.name, rel.searchname,
+							SELECT nfo.releases_id AS nfoid, rel.groups_id, rel.categories_id, rel.name, rel.searchname,
 								UNCOMPRESS(nfo) AS textstring, rel.id AS releases_id
 							FROM releases rel
 							INNER JOIN release_nfos nfo ON (nfo.releases_id = rel.id)
@@ -274,7 +274,7 @@ class NameFixer
 		if ($cats === 3) {
 			$query =
 				sprintf('
-					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groupid,
+					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groups_id,
 						rf.releases_id AS fileid, rel.id AS releases_id
 					FROM releases rel
 					STRAIGHT_JOIN release_files rf ON rf.releases_id = rel.id
@@ -287,7 +287,7 @@ class NameFixer
 		} else {
 			$query =
 				sprintf('
-					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groupid,
+					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groups_id,
 						rf.releases_id AS fileid, rel.id AS releases_id
 					FROM releases rel
 					STRAIGHT_JOIN release_files rf ON rf.releases_id = rel.id
@@ -351,7 +351,7 @@ class NameFixer
 		if ($cats === 3) {
 			$query =
 				sprintf('
-					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groupid,
+					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groups_id,
 						rf.releases_id AS fileid, rel.id AS releases_id
 					FROM releases rel
 					STRAIGHT_JOIN release_files rf ON rf.releases_id = rel.id
@@ -364,7 +364,7 @@ class NameFixer
 		} else {
 			$query =
 				sprintf('
-					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groupid,
+					SELECT rf.name AS textstring, rel.categories_id, rel.name, rel.searchname, rel.groups_id,
 						rf.releases_id AS fileid, rel.id AS releases_id
 					FROM releases rel
 					STRAIGHT_JOIN release_files rf ON rf.releases_id = rel.id
@@ -423,7 +423,7 @@ class NameFixer
 
 		if ($cats === 3) {
 			$query = sprintf('
-					SELECT rel.id AS releases_id, rel.guid, rel.groupid
+					SELECT rel.id AS releases_id, rel.guid, rel.groups_id
 					FROM releases rel
 					WHERE rel.nzbstatus = %d
 					AND rel.predb_id = 0',
@@ -432,7 +432,7 @@ class NameFixer
 			$cats = 2;
 		} else {
 			$query = sprintf('
-					SELECT rel.id AS releases_id, rel.guid, rel.groupid
+					SELECT rel.id AS releases_id, rel.guid, rel.groups_id
 					FROM releases rel
 					WHERE rel.isrenamed = %d
 					AND rel.proc_par2 = %d',
@@ -462,7 +462,7 @@ class NameFixer
 				);
 
 				foreach ($releases as $release) {
-					if (($nzbContents->checkPAR2($release['guid'], $release['releases_id'], $release['groupid'], $nameStatus, $show)) === true) {
+					if (($nzbContents->checkPAR2($release['guid'], $release['releases_id'], $release['groups_id'], $nameStatus, $show)) === true) {
 						$this->fixed++;
 					}
 
@@ -670,7 +670,7 @@ class NameFixer
 				$this->matched = true;
 				$this->relid = $release['releases_id'];
 
-				$determinedCategory = $this->category->determineCategory($release['groupid'], $newName);
+				$determinedCategory = $this->category->determineCategory($release['groups_id'], $newName);
 
 				if ($type === "PAR2, ") {
 					$newName = ucwords($newName);
@@ -692,7 +692,7 @@ class NameFixer
 				$newName = preg_replace(['/^[-=_\.:\s]+/', '/[-=_\.:\s]+$/'], '', $newName[0]);
 
 				if ($this->echooutput === true && $show === 1) {
-					$groupName = $this->_groups->getByNameByID($release['groupid']);
+					$groupName = $this->_groups->getByNameByID($release['groups_id']);
 					$oldCatName = $this->category->getNameByID($release['categories_id']);
 					$newCatName = $this->category->getNameByID($determinedCategory);
 
@@ -851,7 +851,7 @@ class NameFixer
 		$res = $this->pdo->queryDirect(
 			sprintf("
 							SELECT r.id AS releases_id, r.name, r.searchname,
-								r.groupid, r.categories_id
+								r.groups_id, r.categories_id
 							FROM releases r
 							%1\$s
 							AND (r.name %2\$s OR r.searchname %2\$s)
@@ -930,7 +930,7 @@ class NameFixer
 		$query = $this->pdo->queryDirect(
 			sprintf('
 							SELECT r.id AS releases_id, r.name, r.searchname,
-								r.groupid, r.categories_id,
+								r.groups_id, r.categories_id,
 								rf.name AS filename
 							FROM releases r
 							INNER JOIN release_files rf ON r.id = rf.releases_id
diff --git a/newznab/Nfo.php b/newznab/Nfo.php
index 03812179c..083866cba 100644
--- a/newznab/Nfo.php
+++ b/newznab/Nfo.php
@@ -226,7 +226,7 @@ class Nfo
 						'PostProcess'   => new PostProcess(['Echo' => $this->echo, 'Settings' => $this->pdo, 'Nfo' => $this])
 					]
 				);
-				$nzbContents->parseNZB($release['guid'], $release['id'], $release['groupid']);
+				$nzbContents->parseNZB($release['guid'], $release['id'], $release['groups_id']);
 			}
 			return true;
 		}
@@ -278,12 +278,12 @@ class Nfo
 	{
 		$ret = 0;
 		$guidCharQuery = ($guidChar === '' ? '' : 'AND r.leftguid = ' . $this->pdo->escapeString($guidChar));
-		$groupIDQuery = ($groupID === '' ? '' : 'AND r.groupid = ' . $groupID);
+		$groupIDQuery = ($groupID === '' ? '' : 'AND r.groups_id = ' . $groupID);
 		$optionsQuery = self::NfoQueryString($this->pdo);
 
 		$res = $this->pdo->query(
 			sprintf('
-				SELECT r.id, r.guid, r.groupid, r.name
+				SELECT r.id, r.guid, r.groups_id, r.name
 				FROM releases r
 				WHERE 1=1 %s %s %s
 				ORDER BY r.nfostatus ASC, r.postdate DESC
@@ -344,7 +344,7 @@ class Nfo
 			$movie = new Movie(['Echo' => $this->echo, 'Settings' => $this->pdo]);
 
 			foreach ($res as $arr) {
-				$fetchedBinary = $nzbContents->getNfoFromNZB($arr['guid'], $arr['id'], $arr['groupid'], $groups->getByNameByID($arr['groupid']));
+				$fetchedBinary = $nzbContents->getNfoFromNZB($arr['guid'], $arr['id'], $arr['groups_id'], $groups->getByNameByID($arr['groups_id']));
 				if ($fetchedBinary !== false) {
 					// Insert nfo into database.
 					$cp = 'COMPRESS(%s)';
diff --git a/newznab/PreDb.php b/newznab/PreDb.php
index 9f4407703..944210817 100644
--- a/newznab/PreDb.php
+++ b/newznab/PreDb.php
@@ -189,12 +189,12 @@ Class PreDb
 		$regex = "AND (r.ishashed = 1 OR rf.ishashed = 1)";
 
 		if ($cats === 3) {
-			$query = sprintf('SELECT r.id AS releases_id, r.name, r.searchname, r.categories_id, r.groupid, '
+			$query = sprintf('SELECT r.id AS releases_id, r.name, r.searchname, r.categories_id, r.groups_id, '
 				. 'dehashstatus, rf.name AS filename FROM releases r '
 				. 'LEFT OUTER JOIN release_files rf ON r.id = rf.releases_id '
 				. 'WHERE nzbstatus = 1 AND dehashstatus BETWEEN -6 AND 0 AND predb_id = 0 %s', $regex);
 		} else {
-			$query = sprintf('SELECT r.id AS releases_id, r.name, r.searchname, r.categories_id, r.groupid, '
+			$query = sprintf('SELECT r.id AS releases_id, r.name, r.searchname, r.categories_id, r.groups_id, '
 				. 'dehashstatus, rf.name AS filename FROM releases r '
 				. 'LEFT OUTER JOIN release_files rf ON r.id = rf.releases_id '
 				. 'WHERE nzbstatus = 1 AND isrenamed = 0 AND dehashstatus BETWEEN -6 AND 0 %s %s %s', $regex, $ct, $tq);
diff --git a/newznab/RSS.php b/newznab/RSS.php
index 68ae685c9..4a9e29658 100644
--- a/newznab/RSS.php
+++ b/newznab/RSS.php
@@ -79,7 +79,7 @@ Class RSS
 				FROM releases r
 				INNER JOIN categories c ON c.id = r.categories_id
 				INNER JOIN categories cp ON cp.id = c.parentid
-				INNER JOIN groups g ON g.id = r.groupid
+				INNER JOIN groups g ON g.id = r.groups_id
 				LEFT OUTER JOIN movieinfo m ON m.imdbid = r.imdbid AND m.title != ''
 				LEFT OUTER JOIN musicinfo mu ON mu.id = r.musicinfo_id
 				LEFT OUTER JOIN genres mug ON mug.id = mu.genreid
@@ -125,7 +125,7 @@ Class RSS
 				FROM releases r
 				INNER JOIN categories c ON c.id = r.categories_id
 				INNER JOIN categories cp ON cp.id = c.parentid
-				INNER JOIN groups g ON g.id = r.groupid
+				INNER JOIN groups g ON g.id = r.groups_id
 				LEFT OUTER JOIN videos v ON v.id = r.videos_id
 				LEFT OUTER JOIN tv_episodes tve ON tve.id = r.tv_episodes_id
 				WHERE %s %s %s
@@ -168,7 +168,7 @@ Class RSS
 				FROM releases r
 				INNER JOIN categories c ON c.id = r.categories_id
 				INNER JOIN categories cp ON cp.id = c.parentid
-				INNER JOIN groups g ON g.id = r.groupid
+				INNER JOIN groups g ON g.id = r.groups_id
 				LEFT OUTER JOIN movieinfo mi ON mi.imdbid = r.imdbid
 				WHERE %s %s
 				AND r.nzbstatus = %d
diff --git a/newznab/Regexes.php b/newznab/Regexes.php
index 689e3eb98..e9bf4eade 100644
--- a/newznab/Regexes.php
+++ b/newznab/Regexes.php
@@ -245,7 +245,7 @@ class Regexes
 
 		$rows = $this->pdo->query(
 			sprintf(
-				'SELECT name, searchname, id FROM releases WHERE groupid = %d LIMIT %d',
+				'SELECT name, searchname, id FROM releases WHERE groups_id = %d LIMIT %d',
 				$groupID,
 				$queryLimit
 			)
diff --git a/newznab/ReleaseCleaning.php b/newznab/ReleaseCleaning.php
index 044f77c41..c581f049a 100644
--- a/newznab/ReleaseCleaning.php
+++ b/newznab/ReleaseCleaning.php
@@ -130,7 +130,7 @@ class ReleaseCleaning
 		) {
 			$title = $this->pdo->queryOneRow(
 				sprintf(
-					'SELECT p.title , p.id from predb p INNER JOIN groups g on g.id = p.groupid WHERE p.requestid = %d and g.name = %s',
+					'SELECT p.title , p.id from predb p INNER JOIN groups g on g.id = p.groups_id WHERE p.requestid = %d and g.name = %s',
 					$match[1],
 					$this->pdo->escapeString($this->groupName)
 				)
@@ -160,7 +160,7 @@ class ReleaseCleaning
 			if ($title === false && !empty($reqGname)) {
 				$title = $this->pdo->queryOneRow(
 					sprintf(
-						"SELECT p.title as title, p.id as id from predb p INNER JOIN groups g on g.id = p.groupid
+						"SELECT p.title as title, p.id as id from predb p INNER JOIN groups g on g.id = p.groups_id
 								WHERE p.requestid = %d and g.name = %s",
 						$match[1],
 						$this->pdo->escapeString($reqGname)
diff --git a/newznab/ReleaseRemover.php b/newznab/ReleaseRemover.php
index 28cc12e42..d86026c61 100644
--- a/newznab/ReleaseRemover.php
+++ b/newznab/ReleaseRemover.php
@@ -844,7 +844,7 @@ class ReleaseRemover
 						$groupIDs = (substr($string, 0, -1));
 					}
 
-					$groupID = ' AND r.groupid in (' . $groupIDs . ') ';
+					$groupID = ' AND r.groups_id in (' . $groupIDs . ') ';
 				}
 				$this->method = 'Blacklist [' . $regex['id'] . ']';
 
@@ -959,7 +959,7 @@ class ReleaseRemover
 						$groupIDs = (substr($string, 0, -1));
 					}
 
-					$groupID = ' AND r.groupid in (' . $groupIDs . ') ';
+					$groupID = ' AND r.groups_id in (' . $groupIDs . ') ';
 				}
 
 				$this->method = 'Blacklist Files ' . $regex['id'];
@@ -1222,14 +1222,14 @@ class ReleaseRemover
 								break;
 							}
 
-							return ' AND groupid = ' . $group['id'];
+							return ' AND groups_id = ' . $group['id'];
 						case 'like':
 							$groups = $this->pdo->query('SELECT id FROM groups WHERE name ' . $this->formatLike($args[2], 'name'));
 							if (count($groups) === 0) {
 								$this->error = 'No groups were found with this pattern in your database: ' . $args[2] . PHP_EOL;
 								break;
 							}
-							$gQuery = ' AND groupid IN (';
+							$gQuery = ' AND groups_id IN (';
 							foreach ($groups as $group) {
 								$gQuery .= $group['id'] . ',';
 							}
diff --git a/newznab/Releases.php b/newznab/Releases.php
index 6096b7631..00f77e8be 100755
--- a/newznab/Releases.php
+++ b/newznab/Releases.php
@@ -77,14 +77,14 @@ class Releases
 		$parameters['id'] = $this->pdo->queryInsert(
 			sprintf(
 				"INSERT INTO releases
-					(name, searchname, totalpart, groupid, adddate, guid, leftguid, postdate, fromname,
+					(name, searchname, totalpart, groups_id, adddate, guid, leftguid, postdate, fromname,
 					size, passwordstatus, haspreview, categories_id, nfostatus, nzbstatus,
 					isrenamed, iscategorized, reqidstatus, predb_id)
 				VALUES (%s, %s, %d, %d, NOW(), %s, LEFT(%s, 1), %s, %s, %s, %d, -1, %d, -1, %d, %d, 1, %d, %d)",
 				$parameters['name'],
 				$parameters['searchname'],
 				$parameters['totalpart'],
-				$parameters['groupid'],
+				$parameters['groups_id'],
 				$parameters['guid'],
 				$parameters['guid'],
 				$parameters['postdate'],
@@ -121,7 +121,7 @@ class Releases
 				'SELECT r.*, g.name AS group_name, c.title AS category_name
 				FROM releases r
 				LEFT JOIN categories c ON c.id = r.categories_id
-				LEFT JOIN groups g ON g.id = r.groupid
+				LEFT JOIN groups g ON g.id = r.groups_id
 				WHERE r.nzbstatus = %d',
 				NZB::NZB_ADDED
 			), true, NN_CACHE_EXPIRY_LONG
@@ -172,7 +172,7 @@ class Releases
 				WHERE r.nzbstatus = %d
 				AND r.passwordstatus %s
 				%s %s %s %s',
-				($groupName != '' ? 'LEFT JOIN groups g ON g.id = r.groupid' : ''),
+				($groupName != '' ? 'LEFT JOIN groups g ON g.id = r.groups_id' : ''),
 				NZB::NZB_ADDED,
 				$this->showPasswords,
 				($groupName != '' ? sprintf(' AND g.name = %s', $this->pdo->escapeString($groupName)) : ''),
@@ -214,7 +214,7 @@ class Releases
 				(
 					SELECT r.*, g.name AS group_name
 					FROM releases r
-					LEFT JOIN groups g ON g.id = r.groupid
+					LEFT JOIN groups g ON g.id = r.groups_id
 					WHERE r.nzbstatus = %d
 					AND r.passwordstatus %s
 					%s %s %s %s %s
@@ -343,14 +343,14 @@ class Releases
 				"SELECT searchname, guid, groups.name AS gname, CONCAT(cp.title,'_',categories.title) AS catName
 				FROM releases r
 				LEFT JOIN categories ON r.categories_id = categories.id
-				LEFT JOIN groups ON r.groupid = groups.id
+				LEFT JOIN groups ON r.groups_id = groups.id
 				LEFT JOIN categories cp ON cp.id = categories.parentid
 				WHERE r.nzbstatus = %d
 				%s %s %s",
 				NZB::NZB_ADDED,
 				$this->exportDateString($postFrom),
 				$this->exportDateString($postTo, false),
-				(($groupID != '' && $groupID != '-1') ? sprintf(' AND groupid = %d ', $groupID) : '')
+				(($groupID != '' && $groupID != '-1') ? sprintf(' AND groups_id = %d ', $groupID) : '')
 			)
 		);
 	}
@@ -422,7 +422,7 @@ class Releases
 		$groups = $this->pdo->query(
 			'SELECT DISTINCT g.id, g.name
 			FROM releases r
-			LEFT JOIN groups g ON g.id = r.groupid'
+			LEFT JOIN groups g ON g.id = r.groups_id'
 		);
 		$temp_array = [];
 
@@ -489,7 +489,7 @@ class Releases
 					(SELECT df.failed) AS failed
 				FROM releases r
 				LEFT OUTER JOIN video_data re ON re.releases_id = r.id
-				LEFT JOIN groups ON groups.id = r.groupid
+				LEFT JOIN groups ON groups.id = r.groups_id
 				LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
 				LEFT OUTER JOIN tv_episodes tve ON tve.videos_id = r.videos_id
 				LEFT JOIN categories c ON c.id = r.categories_id
@@ -877,7 +877,7 @@ class Releases
 			$this->showPasswords,
 			NZB::NZB_ADDED,
 			($maxAge > 0 ? sprintf(' AND r.postdate > (NOW() - INTERVAL %d DAY) ', $maxAge) : ''),
-			($groupName != -1 ? sprintf(' AND r.groupid = %d ', $this->groups->getIDByName($groupName)) : ''),
+			($groupName != -1 ? sprintf(' AND r.groups_id = %d ', $this->groups->getIDByName($groupName)) : ''),
 			(array_key_exists($sizeFrom, $sizeRange) ? ' AND r.size > ' . (string)(104857600 * (int)$sizeRange[$sizeFrom]) . ' ' : ''),
 			(array_key_exists($sizeTo, $sizeRange) ? ' AND r.size < ' . (string)(104857600 * (int)$sizeRange[$sizeTo]) . ' ' : ''),
 			($hasNfo != 0 ? ' AND r.nfostatus = 1 ' : ''),
@@ -906,7 +906,7 @@ class Releases
 			LEFT OUTER JOIN videos v ON r.videos_id = v.id
 			LEFT OUTER JOIN tv_episodes tve ON r.tv_episodes_id = tve.id
 			LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
-			LEFT JOIN groups ON groups.id = r.groupid
+			LEFT JOIN groups ON groups.id = r.groups_id
 			LEFT JOIN categories c ON c.id = r.categories_id
 			LEFT JOIN categories cp ON cp.id = c.parentid
 			LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id
@@ -1007,7 +1007,7 @@ class Releases
 			LEFT OUTER JOIN tv_episodes tve ON r.tv_episodes_id = tve.id
 			LEFT JOIN categories c ON c.id = r.categories_id
 			INNER JOIN categories cp ON cp.id = c.parentid
-			LEFT JOIN groups ON groups.id = r.groupid
+			LEFT JOIN groups ON groups.id = r.groups_id
 			LEFT OUTER JOIN video_data re ON re.releases_id = r.id
 			LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
 
@@ -1066,7 +1066,7 @@ class Releases
 			FROM releases r
 			LEFT JOIN categories c ON c.id = r.categories_id
 			LEFT JOIN categories cp ON cp.id = c.parentid
-			LEFT JOIN groups ON groups.id = r.groupid
+			LEFT JOIN groups ON groups.id = r.groups_id
 			LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
 			LEFT OUTER JOIN releaseextrafull re ON re.releases_id = r.id
 			%s",
@@ -1122,7 +1122,7 @@ class Releases
 				g.name AS group_name,
 				rn.releases_id AS nfoid
 			FROM releases r
-			LEFT JOIN groups g ON g.id = r.groupid
+			LEFT JOIN groups g ON g.id = r.groups_id
 			LEFT JOIN categories c ON c.id = r.categories_id
 			LEFT JOIN categories cp ON cp.id = c.parentid
 			LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
@@ -1229,7 +1229,7 @@ class Releases
 				tvi.summary, tvi.image,
 				tve.title, tve.firstaired, tve.se_complete
 				FROM releases r
-			LEFT JOIN groups g ON g.id = r.groupid
+			LEFT JOIN groups g ON g.id = r.groups_id
 			LEFT JOIN categories c ON c.id = r.categories_id
 			LEFT JOIN categories cp ON cp.id = c.parentid
 			LEFT OUTER JOIN videos v ON r.videos_id = v.id
@@ -1303,7 +1303,7 @@ class Releases
 				"SELECT r.*, CONCAT(cp.title, ' > ', c.title) AS category_name,
 				groups.name AS group_name
 				FROM releases r
-				LEFT JOIN groups ON groups.id = r.groupid
+				LEFT JOIN groups ON groups.id = r.groups_id
 				LEFT JOIN categories c ON c.id = r.categories_id
 				LEFT JOIN categories cp ON cp.id = c.parentid
 				WHERE r.categories_id BETWEEN " . Category::TV_ROOT . " AND " . Category::TV_OTHER . "
@@ -1361,7 +1361,7 @@ class Releases
 		$qry = sprintf('
 				SELECT r.*, g.name AS group_name
 				FROM releases r
-				LEFT JOIN groups g ON g.id = r.groupid
+				LEFT JOIN groups g ON g.id = r.groups_id
 				WHERE r.id = %d',
 			$id
 		);
diff --git a/newznab/RequestIDLocal.php b/newznab/RequestIDLocal.php
index b5b228d97..5f2730b31 100644
--- a/newznab/RequestIDLocal.php
+++ b/newznab/RequestIDLocal.php
@@ -25,14 +25,14 @@ class RequestIDLocal extends RequestID
 		$query = (
 			'SELECT r.id, r.name, r.categories_id, r.reqidstatus, g.name AS groupname, g.id as gid
 			FROM releases r
-			LEFT JOIN groups g ON r.groupid = g.id
+			LEFT JOIN groups g ON r.groups_id = g.id
 			WHERE r.nzbstatus = 1
 			AND r.predb_id = 0
 			AND r.isrequestID = 1'
 		);
 
 		$query .= ($this->_charGUID === '' ? '' : ' AND r.leftguid = ' . $this->pdo->escapeString($this->_charGUID));
-		$query .= ($this->_groupID === '' ? '' : ' AND r.groupid = ' . $this->_groupID);
+		$query .= ($this->_groupID === '' ? '' : ' AND r.groups_id = ' . $this->_groupID);
 		$query .= ($this->_maxTime === 0 ? '' : sprintf(' AND r.adddate > NOW() - INTERVAL %d HOUR', $this->_maxTime));
 
 		switch ($this->_limit) {
@@ -108,7 +108,7 @@ class RequestIDLocal extends RequestID
 
 		$check = $this->pdo->queryDirect(
 			sprintf(
-				'SELECT id, title FROM predb WHERE requestid = %d AND groupid = %d',
+				'SELECT id, title FROM predb WHERE requestid = %d AND groups_id = %d',
 				$this->_requestID,
 				$this->_release['gid']
 			)
@@ -193,7 +193,7 @@ class RequestIDLocal extends RequestID
 	private $groupIDCache = [];
 
 	/**
-	 * Attempts to remap the release groupid by extracting the new group name from the release usenet name.
+	 * Attempts to remap the release groups_id by extracting the new group name from the release usenet name.
 	 *
 	 * @return array|bool
 	 */
@@ -237,7 +237,7 @@ class RequestIDLocal extends RequestID
 		}
 		$check = $this->pdo->queryOneRow(
 			sprintf("
-				SELECT id, title FROM predb WHERE requestid = %d AND groupid = %d",
+				SELECT id, title FROM predb WHERE requestid = %d AND groups_id = %d",
 				$this->_requestID,
 				($groupID === '' ? 0 : $groupID)
 			)
diff --git a/newznab/RequestIDWeb.php b/newznab/RequestIDWeb.php
index bb7f078f9..67ed2de36 100644
--- a/newznab/RequestIDWeb.php
+++ b/newznab/RequestIDWeb.php
@@ -42,9 +42,9 @@ class RequestIDWeb extends RequestID
 	{
 		$this->_releases = $this->pdo->queryDirect(
 			sprintf ('
-				SELECT r.id, r.name, r.searchname, g.name AS groupname, r.groupid, r.categories_id
+				SELECT r.id, r.name, r.searchname, g.name AS groupname, r.groups_id, r.categories_id
 				FROM releases r
-				LEFT JOIN groups g ON r.groupid = g.id
+				LEFT JOIN groups g ON r.groups_id = g.id
 				WHERE r.nzbstatus = 1
 				AND r.predb_id = 0
 				AND r.isrequestid = 1
@@ -58,7 +58,7 @@ class RequestIDWeb extends RequestID
 				self::REQID_NOLL,
 				self::REQID_NONE,
 				$this->_request_hours,
-				(empty($this->_groupID) ? '' : ('AND r.groupid = ' . $this->_groupID)),
+				(empty($this->_groupID) ? '' : ('AND r.groups_id = ' . $this->_groupID)),
 				$this->_getReqIdGroups(),
 				($this->_maxTime === 0 ? '' : sprintf(' AND r.adddate > NOW() - INTERVAL %d HOUR', $this->_maxTime)),
 				(empty($this->_limit) || $this->_limit > 1000 ? 1000 : $this->_limit)
@@ -177,12 +177,12 @@ class RequestIDWeb extends RequestID
 						// Buffer groupid queries.
 						$this->_release['groupname'] = $requestArray[(int)$result['ident']]['group'];
 						if (isset($groupIDarray[$this->_release['groupname']])) {
-							$this->_release['groupid'] = $groupIDArray[$this->_release['groupname']];
+							$this->_release['groups_id'] = $groupIDArray[$this->_release['groupname']];
 						} else {
-							$this->_release['groupid'] = $this->groups->getIDByName($this->_release['groupname']);
-							$groupIDArray[$this->_release['groupname']] = $this->_release['groupid'];
+							$this->_release['groups_id'] = $this->groups->getIDByName($this->_release['groupname']);
+							$groupIDArray[$this->_release['groupname']] = $this->_release['groups_id'];
 						}
-						$this->_release['gid'] = $this->_release['groupid'];
+						$this->_release['gid'] = $this->_release['groups_id'];
 
 						$this->_release['searchname'] = $requestArray[(int)$result['ident']]['sname'];
 						$this->_insertIntoPreDB();
@@ -246,7 +246,7 @@ class RequestIDWeb extends RequestID
 	{
 		$dupeCheck = $this->pdo->queryOneRow(
 			sprintf('
-				SELECT id AS predb_id, requestid, groupid
+				SELECT id AS predb_id, requestid, groups_id
 				FROM predb
 				WHERE title = %s',
 				$this->pdo->escapeString($this->_newTitle['title'])
@@ -256,12 +256,12 @@ class RequestIDWeb extends RequestID
 		if ($dupeCheck === false) {
 			$this->_preDbID = (int)$this->pdo->queryInsert(
 				sprintf("
-					INSERT INTO predb (title, source, requestid, groupid, predate)
+					INSERT INTO predb (title, source, requestid, groups_id, predate)
 					VALUES (%s, %s, %d, %d, NOW())",
 					$this->pdo->escapeString($this->_newTitle['title']),
 					$this->pdo->escapeString('requestWEB'),
 					$this->_requestID,
-					$this->_release['groupid']
+					$this->_release['groups_id']
 				)
 			);
 		} else {
@@ -269,10 +269,10 @@ class RequestIDWeb extends RequestID
 			$this->pdo->queryExec(
 				sprintf('
 					UPDATE predb
-					SET requestid = %d, groupid = %d
+					SET requestid = %d, groups_id = %d
 					WHERE id = %d',
 					$this->_requestID,
-					$this->_release['groupid'],
+					$this->_release['groups_id'],
 					$this->_preDbID
 				)
 			);
@@ -284,7 +284,7 @@ class RequestIDWeb extends RequestID
 	 */
 	protected function _updateRelease()
 	{
-		$determinedCategory = $this->category->determineCategory($this->_release['groupid'], $this->_newTitle['title']);
+		$determinedCategory = $this->category->determineCategory($this->_release['groups_id'], $this->_newTitle['title']);
 		$newTitle = $this->pdo->escapeString($this->_newTitle['title']);
 		$this->pdo->queryExec(
 			sprintf('
diff --git a/newznab/XXX.php b/newznab/XXX.php
index 648f30142..ca58c41d5 100644
--- a/newznab/XXX.php
+++ b/newznab/XXX.php
@@ -221,7 +221,7 @@ class XXX
 			g.name AS group_name,
 			rn.releases_id AS nfoid
 			FROM releases r
-			LEFT OUTER JOIN groups g ON g.id = r.groupid
+			LEFT OUTER JOIN groups g ON g.id = r.groups_id
 			LEFT OUTER JOIN release_nfos rn ON rn.releases_id = r.id
 			LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id
 			LEFT OUTER JOIN categories c ON c.id = r.categories_id
diff --git a/newznab/db/PreDb.php b/newznab/db/PreDb.php
index 1edb34c56..cb5e39264 100644
--- a/newznab/db/PreDb.php
+++ b/newznab/db/PreDb.php
@@ -99,7 +99,7 @@ class PreDb extends DB
 
 		$sql   = <<<SQL_EXPORT
 SELECT title, nfo, size, files, filename, nuked, nukereason, category, predate, source, requestid, g.name
-	FROM {$this->tableMain} p LEFT OUTER JOIN groups g ON p.groupid = g.id $limit
+	FROM {$this->tableMain} p LEFT OUTER JOIN groups g ON p.groups_id = g.id $limit
 	INTO OUTFILE '{$options['path']}'
 	FIELDS TERMINATED BY '{$options['fields']}' $enclosedby
 	LINES TERMINATED BY '{$options['lines']}';
@@ -240,8 +240,8 @@ SQL_ADD_GROUPS;
 	protected function prepareSQLInsert()
 	{
 		$sql = <<<SQL_INSERT
-INSERT INTO {$this->tableMain} (title, nfo, size, files, filename, nuked, nukereason, category, predate, SOURCE, requestid, groupid)
-  SELECT pi.title, pi.nfo, pi.size, pi.files, pi.filename, pi.nuked, pi.nukereason, pi.category, pi.predate, pi.source, pi.requestid, groupid
+INSERT INTO {$this->tableMain} (title, nfo, size, files, filename, nuked, nukereason, category, predate, SOURCE, requestid, groups_id)
+  SELECT pi.title, pi.nfo, pi.size, pi.files, pi.filename, pi.nuked, pi.nukereason, pi.category, pi.predate, pi.source, pi.requestid, groups_id
     FROM predb_imports AS pi
   ON DUPLICATE KEY UPDATE predb.nfo = IF(predb.nfo IS NULL, pi.nfo, predb.nfo),
 	  predb.size = IF(predb.size IS NULL, pi.size, predb.size),
@@ -251,7 +251,7 @@ INSERT INTO {$this->tableMain} (title, nfo, size, files, filename, nuked, nukere
 	  predb.nukereason = IF(pi.nuked > 0, pi.nukereason, predb.nukereason),
 	  predb.category = IF(predb.category IS NULL, pi.category, predb.category),
 	  predb.requestid = IF(predb.requestid = 0, pi.requestid, predb.requestid),
-	  predb.groupid = IF(predb.groupid = 0, pi.groupid, predb.groupid);
+	  predb.groups_id = IF(predb.groups_id = 0, pi.groups_id, predb.groups_id);
 SQL_INSERT;
 
 		$this->prepareSQLStatement($sql, 'Insert');
@@ -295,7 +295,7 @@ SQL_LOAD_DATA;
 
 	protected function prepareSQLUpdateGroupIDs()
 	{
-		$sql = "UPDATE predb_imports AS pi SET groupid = (SELECT id FROM groups WHERE name = pi.groupname) WHERE groupname IS NOT NULL";
+		$sql = "UPDATE predb_imports AS pi SET groups_id = (SELECT id FROM groups WHERE name = pi.groupname) WHERE groupname IS NOT NULL";
 		$this->prepareSQLStatement($sql, 'UpdateGroupID');
 	}
 }
diff --git a/newznab/libraries/Forking.php b/newznab/libraries/Forking.php
index fcf2621f9..a8f4d6be7 100644
--- a/newznab/libraries/Forking.php
+++ b/newznab/libraries/Forking.php
@@ -928,7 +928,7 @@ class Forking extends \fork_daemon
 			sprintf('
 				SELECT DISTINCT(g.id)
 				FROM groups g
-				INNER JOIN releases r ON r.groupid = g.id
+				INNER JOIN releases r ON r.groups_id = g.id
 				WHERE g.active = 1
 				AND r.nzbstatus = %d
 				AND r.predb_id = 0
diff --git a/newznab/processing/PostProcess.php b/newznab/processing/PostProcess.php
index e37637a79..439554d0b 100755
--- a/newznab/processing/PostProcess.php
+++ b/newznab/processing/PostProcess.php
@@ -339,7 +339,7 @@ class PostProcess
 
 		$query = $this->pdo->queryOneRow(
 			sprintf('
-				SELECT id, groupid, categories_id, name, searchname, UNIX_TIMESTAMP(postdate) AS post_date, id AS releases_id
+				SELECT id, groups_id, categories_id, name, searchname, UNIX_TIMESTAMP(postdate) AS post_date, id AS releases_id
 				FROM releases
 				WHERE isrenamed = 0
 				AND id = %d',
@@ -470,12 +470,12 @@ class PostProcess
 		$query = $this->pdo->queryOneRow(
 			sprintf('
 				SELECT
-					r.id, r.groupid, r.categories_id, r.name, r.searchname,
+					r.id, r.groups_id, r.categories_id, r.name, r.searchname,
 					UNIX_TIMESTAMP(r.postdate) AS post_date,
 					r.id AS releases_id,
 					g.name AS groupname
 				FROM releases r
-				LEFT JOIN groups g ON r.groupid = g.id
+				LEFT JOIN groups g ON r.groups_id = g.id
 				WHERE r.isrenamed = 0
 				AND r.predb_id = 0
 				AND r.id = %d',
diff --git a/newznab/processing/ProcessReleases.php b/newznab/processing/ProcessReleases.php
index fed8c311e..d6ed48716 100644
--- a/newznab/processing/ProcessReleases.php
+++ b/newznab/processing/ProcessReleases.php
@@ -271,11 +271,11 @@ class ProcessReleases
 	{
 		$cat = new Categorize(['Settings' => $this->pdo]);
 		$categorized = $total = 0;
-		$releases = $this->pdo->queryDirect(sprintf('SELECT id, %s, groupid FROM releases %s', $type, $where));
+		$releases = $this->pdo->queryDirect(sprintf('SELECT id, %s, groups_id FROM releases %s', $type, $where));
 		if ($releases && $releases->rowCount()) {
 			$total = $releases->rowCount();
 			foreach ($releases as $release) {
-				$catId = $cat->determineCategory($release['groupid'], $release[$type]);
+				$catId = $cat->determineCategory($release['groups_id'], $release[$type]);
 				$this->pdo->queryExec(
 					sprintf('UPDATE releases SET categories_id = %d, iscategorized = 1 WHERE id = %d', $catId, $release['id'])
 				);
@@ -611,7 +611,7 @@ class ProcessReleases
 							'name' => $cleanRelName,
 							'searchname' => $this->pdo->escapeString(utf8_encode($cleanedName)),
 							'totalpart' => $collection['totalfiles'],
-							'groupid' => $collection['group_id'],
+							'groups_id' => $collection['group_id'],
 							'guid' => $this->pdo->escapeString($this->releases->createGUID()),
 							'postdate' => $this->pdo->escapeString($collection['date']),
 							'fromname' => $fromName,
@@ -701,7 +701,7 @@ class ProcessReleases
 				INNER JOIN categories c ON r.categories_id = c.id
 				INNER JOIN categories cp ON cp.id = c.parentid
 				WHERE %s nzbstatus = 0",
-				(!empty($groupID) ? ' r.groupid = ' . $groupID . ' AND ' : ' ')
+				(!empty($groupID) ? ' r.groups_id = ' . $groupID . ' AND ' : ' ')
 			)
 		);
 
@@ -820,7 +820,7 @@ class ProcessReleases
 		$this->categorizeRelease(
 			$type,
 			(!empty($groupID)
-					? 'WHERE categories_id = ' . Category::OTHER_MISC . ' AND iscategorized = 0 AND groupid = ' . $groupID
+					? 'WHERE categories_id = ' . Category::OTHER_MISC . ' AND iscategorized = 0 AND groups_id = ' . $groupID
 					: 'WHERE categories_id = ' . Category::OTHER_MISC . ' AND iscategorized = 0')
 	);
 
@@ -1091,8 +1091,8 @@ class ProcessReleases
 				sprintf("
 					SELECT r.guid, r.id
 					FROM releases r
-					INNER JOIN groups g ON g.id = r.groupid
-					WHERE r.groupid = %d
+					INNER JOIN groups g ON g.id = r.groups_id
+					WHERE r.groups_id = %d
 					AND greatest(IFNULL(g.minsizetoformrelease, 0), %d) > 0
 					AND r.size < greatest(IFNULL(g.minsizetoformrelease, 0), %d)",
 					$groupID['id'],
@@ -1112,7 +1112,7 @@ class ProcessReleases
 					sprintf('
 						SELECT id, guid
 						FROM releases
-						WHERE groupid = %d
+						WHERE groups_id = %d
 						AND size > %d',
 						$groupID['id'],
 						$maxSizeSetting
@@ -1130,8 +1130,8 @@ class ProcessReleases
 				sprintf("
 					SELECT r.id, r.guid
 					FROM releases r
-					INNER JOIN groups g ON g.id = r.groupid
-					WHERE r.groupid = %d
+					INNER JOIN groups g ON g.id = r.groups_id
+					WHERE r.groups_id = %d
 					AND greatest(IFNULL(g.minfilestoformrelease, 0), %d) > 0
 					AND r.totalpart < greatest(IFNULL(g.minfilestoformrelease, 0), %d)",
 					$groupID['id'],
diff --git a/newznab/processing/post/ProcessAdditional.php b/newznab/processing/post/ProcessAdditional.php
index 7061f594f..2943decab 100644
--- a/newznab/processing/post/ProcessAdditional.php
+++ b/newznab/processing/post/ProcessAdditional.php
@@ -613,7 +613,7 @@ class ProcessAdditional
 	{
 		$this->_releases = $this->pdo->query(
 			sprintf('
-				SELECT r.id, r.id AS releases_id, r.guid, r.name, r.size, r.groupid, r.nfostatus,
+				SELECT r.id, r.id AS releases_id, r.guid, r.name, r.size, r.groups_id, r.nfostatus,
 					r.completion, r.categories_id, r.searchname, r.predb_id,
 					c.disablepreview
 				FROM releases r
@@ -627,7 +627,7 @@ class ProcessAdditional
 				LIMIT %d',
 				$this->_maxSize,
 				$this->_minSize,
-				($groupID === '' ? '' : 'AND r.groupid = ' . $groupID),
+				($groupID === '' ? '' : 'AND r.groups_id = ' . $groupID),
 				($guidChar === '' ? '' : 'AND r.leftguid = ' . $this->pdo->escapeString($guidChar)),
 				$this->_queryLimit
 			)
@@ -1745,7 +1745,7 @@ class ProcessAdditional
 		// Make sure the category is music or other.
 		$rQuery = $this->pdo->queryOneRow(
 			sprintf(
-				'SELECT searchname, categories_id AS id, groupid FROM releases WHERE proc_pp = 0 AND id = %d',
+				'SELECT searchname, categories_id AS id, groups_id FROM releases WHERE proc_pp = 0 AND id = %d',
 				$this->_release['id']
 			)
 		);
@@ -1802,7 +1802,7 @@ class ProcessAdditional
 									} else if ($ext === 'FLAC') {
 										$newCat = Category::MUSIC_LOSSLESS;
 									} else {
-										$newCat = $this->_categorize->determineCategory($rQuery['groupid'], $newName);
+										$newCat = $this->_categorize->determineCategory($rQuery['groups_id'], $newName);
 									}
 
 									$newTitle = $this->pdo->escapeString(substr($newName, 0, 255));
@@ -1828,7 +1828,7 @@ class ProcessAdditional
 												'old_name' => $rQuery['searchname'],
 												'new_category' => $newCat,
 												'old_category' => $rQuery['id'],
-												'group' => $rQuery['groupid'],
+												'group' => $rQuery['groups_id'],
 												'release_id' => $this->_release['id'],
 												'method' => 'ProcessAdditional->_getAudioInfo'
 											]
@@ -2390,7 +2390,7 @@ class ProcessAdditional
 					}
 
 					// Get a new category ID.
-					$newCategory = $this->_categorize->determineCategory($this->_release['groupid'], $newName);
+					$newCategory = $this->_categorize->determineCategory($this->_release['groups_id'], $newName);
 
 					$newTitle = $this->pdo->escapeString(substr($newName, 0, 255));
 					// Update the release with the data.
@@ -2416,7 +2416,7 @@ class ProcessAdditional
 								'old_name' => $this->_release['searchname'],
 								'new_category' => $newCategory,
 								'old_category' => $this->_release['categories_id'],
-								'group' => $this->_release['groupid'],
+								'group' => $this->_release['groups_id'],
 								'release_id' => $this->_release['id'],
 								'method' => 'ProcessAdditional->_processU4ETitle'
 							]
@@ -2530,7 +2530,7 @@ class ProcessAdditional
 		$this->_passwordStatus = [Releases::PASSWD_NONE];
 		$this->_releaseHasPassword = false;
 
-		$this->_releaseGroupName = $this->_groups->getByNameByID($this->_release['groupid']);
+		$this->_releaseGroupName = $this->_groups->getByNameByID($this->_release['groups_id']);
 
 		$this->_releaseHasNoNFO = false;
 		// Make sure we don't already have an nfo.
diff --git a/newznab/processing/tv/TV.php b/newznab/processing/tv/TV.php
index 613d709e0..d48fcfdcf 100644
--- a/newznab/processing/tv/TV.php
+++ b/newznab/processing/tv/TV.php
@@ -158,7 +158,7 @@ abstract class TV extends Videos
 				LIMIT %d",
 				$status,
 				$this->catWhere,
-				($groupID === '' ? '' : 'AND r.groupid = ' . $groupID),
+				($groupID === '' ? '' : 'AND r.groups_id = ' . $groupID),
 				($guidChar === '' ? '' : 'AND r.leftguid = ' . $this->pdo->escapeString($guidChar)),
 				($lookupSetting == 2 ? 'AND r.isrenamed = 1' : ''),
 				$this->tvqty
diff --git a/resources/db/patches/mysql/0258~general.sql b/resources/db/patches/mysql/0258~general.sql
new file mode 100644
index 000000000..62d36a82d
--- /dev/null
+++ b/resources/db/patches/mysql/0258~general.sql
@@ -0,0 +1,8 @@
+# Change releases.groupid to releases.groups_id to follow lithium convention.
+ALTER TABLE releases CHANGE COLUMN groupid groups_id INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to groups.id';
+
+# Change predb.groupid to predb.groups_id to follow lithium convention.
+ALTER TABLE predb CHANGE COLUMN groupid groups_id INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to groups.id';
+
+# Change predb_imports.groupid to predb_imports.groups_id to follow lithium convention.
+ALTER TABLE predb_imports CHANGE COLUMN groupid groups_id INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'FK to groups.id';
diff --git a/www/pages/preinfo.php b/www/pages/preinfo.php
index b3739350c..8edb9b15e 100644
--- a/www/pages/preinfo.php
+++ b/www/pages/preinfo.php
@@ -154,7 +154,7 @@ if (isset($_GET['type'])) {
 					sprintf('
 					SELECT p.*
 					FROM predb p
-					INNER JOIN groups g ON g.id = p.groupid
+					INNER JOIN groups g ON g.id = p.groups_id
 					WHERE requestid = %d
 					AND g.name = %s
 					%s %s %s
diff --git a/www/themes/shared/templates/admin/nzb-export.tpl b/www/themes/shared/templates/admin/nzb-export.tpl
index 982d96d01..7955dedc4 100644
--- a/www/themes/shared/templates/admin/nzb-export.tpl
+++ b/www/themes/shared/templates/admin/nzb-export.tpl
@@ -4,7 +4,7 @@
 <p>
 Export nzbs from the system into a folder. Specify the full file path to a folder.
 <br/>
-If you are exporting a large number of nzb files, run this script from the command line and pass in the folder path as the first argument. e.g. php scriptname outputpath from(optional) to(optional) groupid(optional use -1) categories_id(optional)<br/>
+If you are exporting a large number of nzb files, run this script from the command line and pass in the folder path as the first argument. e.g. php scriptname outputpath from(optional) to(optional) groups_id(optional use -1) categories_id(optional)<br/>
 <span style="font-family:courier;display:block;padding:5px 0 15px 0;">
 	php admin/nzb-export.php /path/to/export/into 01/01/2008 01/01/2010 -1 1050
 </span>