diff --git a/misc/testing/PostProc/updateMovieImages.php b/misc/testing/PostProc/updateMovieImages.php
index 446b374e0..63f00e642 100644
--- a/misc/testing/PostProc/updateMovieImages.php
+++ b/misc/testing/PostProc/updateMovieImages.php
@@ -2,7 +2,7 @@
 require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
-
+use newznab\utility\Utility;
 
 $pdo = new Settings();
 $covers = $updated = $deleted = 0;
@@ -11,6 +11,12 @@ if ($argc == 1 || $argv[1] != 'true') {
 	exit($pdo->log->error("\nThis script will check all images in covers/movies and compare to db->movieinfo.\nTo run:\nphp $argv[0] true\n"));
 }
 
+$row = $pdo->queryOneRow("SELECT value FROM settings WHERE setting = 'coverspath'");
+if ($row !== false) {
+	Utility::setCoversConstant($row['value']);
+} else {
+	die("Unable to set Covers' constant!\n");
+}
 $path2covers = NN_COVERS . 'movies' . DS;
 
 $dirItr = new \RecursiveDirectoryIterator($path2covers);
diff --git a/www/admin/movie-add.php b/www/admin/movie-add.php
index ea35228f3..d5149fbc3 100644
--- a/www/admin/movie-add.php
+++ b/www/admin/movie-add.php
@@ -3,7 +3,7 @@
 require_once './config.php';
 
 $page = new AdminPage();
-$movie = new Movie();
+$movie = new Film(['Settings' => $page->settings]);
 $id = 0;
 
 $page->title = "Movie Add";
diff --git a/www/admin/movie-delete.php b/www/admin/movie-delete.php
index 26cbd028d..6bb393b44 100644
--- a/www/admin/movie-delete.php
+++ b/www/admin/movie-delete.php
@@ -5,7 +5,7 @@ $page = new AdminPage();
 
 if (isset($_GET['id']))
 {
-	$m = new Movie();
+	$m = new Film();
 	$m->delete($_GET['id']);
 }
 
diff --git a/www/admin/movie-edit.php b/www/admin/movie-edit.php
index 97f2af5b1..ee4da8f31 100644
--- a/www/admin/movie-edit.php
+++ b/www/admin/movie-edit.php
@@ -3,7 +3,7 @@
 require_once './config.php';
 
 $page = new AdminPage();
-$movie = new Movie();
+$movie = new Film();
 $id = 0;
 
 // set the current action
diff --git a/www/admin/movie-list.php b/www/admin/movie-list.php
index 1fe07efe7..3bed1c61a 100644
--- a/www/admin/movie-list.php
+++ b/www/admin/movie-list.php
@@ -4,7 +4,7 @@ require_once './config.php';
 
 $page = new AdminPage();
 
-$movie = new Movie();
+$movie = new Film(['Settings' => $page->settings]);
 
 $page->title = "Movie List";
 
@@ -12,7 +12,7 @@ $tname = "";
 if (isset($_REQUEST['moviename']) && !empty($_REQUEST['moviename']))
 	$tname = $_REQUEST['moviename'];
 
-$movcount = $movie->getCount($tname);
+$movcount = $movie->getCount();
 
 $offset = isset($_REQUEST["offset"]) ? $_REQUEST["offset"] : 0;
 $tsearch = ($tname != "") ? 'moviename='.$tname.'&' : '';
@@ -20,11 +20,11 @@ $tsearch = ($tname != "") ? 'moviename='.$tname.'&' : '';
 $page->smarty->assign('pagertotalitems',$movcount);
 $page->smarty->assign('pageroffset',$offset);
 $page->smarty->assign('pageritemsperpage',ITEMS_PER_PAGE);
-$page->smarty->assign('pagerquerybase', WWW_TOP."/movie-list.php?".$tsearch."&offset=");
+$page->smarty->assign('pagerquerybase', WWW_TOP . "/movie-list.php?offset=");
 $pager = $page->smarty->fetch("pager.tpl");
 $page->smarty->assign('pager', $pager);
 
-$movielist = $movie->getRange($offset, ITEMS_PER_PAGE, $tname);
+$movielist = $movie->getRange($offset, ITEMS_PER_PAGE);
 $page->smarty->assign('movielist',$movielist);
 
 $page->content = $page->smarty->fetch('movie-list.tpl');
diff --git a/www/admin/release-edit.php b/www/admin/release-edit.php
index dc388d4ad..3ec83db4a 100644
--- a/www/admin/release-edit.php
+++ b/www/admin/release-edit.php
@@ -36,7 +36,7 @@ switch($action)
 
 			if ($release && $release["imdbid"] != "")
 			{
-				$movie = new Movie();
+				$movie = new Film();
 				$mov = $movie->getMovieInfo($release['imdbid']);
 				$page->smarty->assign('updatename', $mov["title"]);
 			}
diff --git a/www/pages/movietrailer.php b/www/pages/movietrailer.php
index 837673256..729c27041 100644
--- a/www/pages/movietrailer.php
+++ b/www/pages/movietrailer.php
@@ -1,6 +1,6 @@
 <?php
 
-$movie = new Movie;
+$movie = new Film;
 
 if (!$page->users->isLoggedIn())
 	$page->show403();