diff --git a/misc/testing/PostProc/getImdb.php b/misc/testing/PostProc/getImdb.php
index 5402e62fd..71df0154b 100644
--- a/misc/testing/PostProc/getImdb.php
+++ b/misc/testing/PostProc/getImdb.php
@@ -6,7 +6,7 @@ use newznab\db\Settings;
 
 $pdo = new Settings();
 $c = new ColorCLI();
-$movie = new Film(['Echo' => true, 'Settings' => $pdo]);
+$movie = new Movie(['Echo' => true, 'Settings' => $pdo]);
 
 
 $movies = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE tmdbid = 0 ORDER BY id ASC");
diff --git a/misc/testing/PostProc/getMovieCovers.php b/misc/testing/PostProc/getMovieCovers.php
index 965204245..a7cecd3bc 100644
--- a/misc/testing/PostProc/getMovieCovers.php
+++ b/misc/testing/PostProc/getMovieCovers.php
@@ -6,7 +6,7 @@ use newznab\db\Settings;
 
 $pdo = new Settings();
 
-$movie = new Film(['Echo' => true, 'Settings' => $pdo]);
+$movie = new Movie(['Echo' => true, 'Settings' => $pdo]);
 
 $movies = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE cover = 0 ORDER BY year ASC, id DESC");
 if ($movies instanceof \Traversable) {
diff --git a/misc/testing/PostProc/getTrakt.php b/misc/testing/PostProc/getTrakt.php
index f47f805e0..0c0721cd8 100644
--- a/misc/testing/PostProc/getTrakt.php
+++ b/misc/testing/PostProc/getTrakt.php
@@ -6,7 +6,7 @@ use newznab\db\Settings;
 
 $pdo = new Settings();
 $c = new ColorCLI();
-$movie = new Film(['Echo' => true, 'Settings' => $pdo]);
+$movie = new Movie(['Echo' => true, 'Settings' => $pdo]);
 
 
 $movies = $pdo->queryDirect("SELECT imdbid FROM movieinfo WHERE traktid = 0 ORDER BY id ASC");
diff --git a/misc/testing/getCovers.php b/misc/testing/getCovers.php
index e1963d369..106f20681 100644
--- a/misc/testing/getCovers.php
+++ b/misc/testing/getCovers.php
@@ -9,9 +9,9 @@ $movie = new Movie(true);
 
 $db = new Settings();
 
-$movies = $db->query("SELECT imdbID from movieinfo where cover = 0");
+$movies = $db->query("SELECT imdbid from movieinfo where cover = 0");
 
 foreach ($movies as $mov) {
-	$mov = $movie->updateMovieInfo($mov['imdbID']);
+	$mov = $movie->updateMovieInfo($mov['imdbid']);
 	sleep(1);
 }
\ No newline at end of file
diff --git a/misc/testing/getTMdb.php b/misc/testing/getTMdb.php
deleted file mode 100644
index 5d4b17aaf..000000000
--- a/misc/testing/getTMdb.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-// search tmdb or web for movie from a given name
-
-require_once dirname(__FILE__) . '/../../www/config.php';
-
-$moviename = "Africa Screams";
-$movie = new Movie();
-
-// #1 tmdb
-//
-//print_r($movie->searchTmdb($moviename));
-
-// #2 search engine (google/bing)
-//$buffer = getUrl("https://www.google.com/search?source=ig&hl=en&rlz=&btnG=Google+Search&aq=f&oq=&q=".urlencode($moviename.' site:imdb.com'));
-$buffer = \newznab\utility\Utility::getUrl(['url' => 'http://www.bing.com/search?&q='.urlencode($moviename.' site:imdb.com')]);
-if ($buffer !== false && strlen($buffer))
-{
-    $imdb = $movie->parseImdbFromNfo($buffer);
-    echo sprintf("imdbid : %s\n", $imdb);
-    print_r($movie->fetchImdbProperties($imdb));
-}
\ No newline at end of file
diff --git a/misc/update_scripts/update_theaters.php b/misc/update_scripts/update_theaters.php
index 2d1e9f8a9..f58b0489d 100644
--- a/misc/update_scripts/update_theaters.php
+++ b/misc/update_scripts/update_theaters.php
@@ -2,6 +2,6 @@
 //run this once per day
 require_once("config.php");
 
-$m = new Film(['Echo' => true]);
+$m = new Movie(['Echo' => true]);
 $m->updateUpcoming();
 
diff --git a/newznab/controllers/Info.php b/newznab/controllers/Info.php
index 5615df4db..d9c774743 100644
--- a/newznab/controllers/Info.php
+++ b/newznab/controllers/Info.php
@@ -338,7 +338,7 @@ class Info
 					'PostProcess' => new PProcess(['Echo' => $this->echo, 'Nfo' => $this, 'Settings' => $this->pdo])
 				]
 			);
-			$movie = new Film(['Echo' => $this->echo, 'Settings' => $this->pdo]);
+			$movie = new Movie(['Echo' => $this->echo, 'Settings' => $this->pdo]);
 			$tvRage = new TvAnger(['Echo' => $this->echo, 'Settings' => $this->pdo]);
 
 			foreach ($res as $arr) {
diff --git a/newznab/controllers/MiscSorter.php b/newznab/controllers/MiscSorter.php
index 5f39bcc1e..d377b5688 100644
--- a/newznab/controllers/MiscSorter.php
+++ b/newznab/controllers/MiscSorter.php
@@ -50,7 +50,7 @@ class MiscSorter
 		$this->pdo = ($pdo instanceof Settings ? $pdo : new Settings());
 
 		$this->category = new Categorize(['Settings' => $this->pdo]);
-		$this->movie = new Film(['Echo' => $this->echooutput, 'Settings' => $this->pdo]);
+		$this->movie = new Movie(['Echo' => $this->echooutput, 'Settings' => $this->pdo]);
 		$this->pubkey = $this->pdo->getSetting('amazonpubkey');
 		$this->privkey = $this->pdo->getSetting('amazonprivkey');
 		$this->asstag = $this->pdo->getSetting('amazonassociatetag');
diff --git a/newznab/controllers/Film.php b/newznab/controllers/Movie.php
similarity index 99%
rename from newznab/controllers/Film.php
rename to newznab/controllers/Movie.php
index 4bc4062af..52c0297ce 100644
--- a/newznab/controllers/Film.php
+++ b/newznab/controllers/Movie.php
@@ -5,9 +5,9 @@ use newznab\utility\Utility;
 use newznab\libraries\Tmdb\TMDB;
 
 /**
- * Class Film
+ * Class Movie
  */
-class Film
+class Movie
 {
 
 	const SRC_BOXOFFICE = 1;
@@ -1496,23 +1496,23 @@ class Film
 			switch ($operation) {
 				case 'boxoffice':
 					$data = $rt->getBoxOffice();
-					$update = Film::SRC_BOXOFFICE;
+					$update = Movie::SRC_BOXOFFICE;
 					break;
 				case 'theaters':
 					$data = $rt->getInTheaters();
-					$update = Film::SRC_INTHEATRE;
+					$update = Movie::SRC_INTHEATRE;
 					break;
 				case 'opening':
 					$data = $rt->getOpening();
-					$update = Film::SRC_OPENING;
+					$update = Movie::SRC_OPENING;
 					break;
 				case 'upcoming':
 					$data = $rt->getUpcoming();
-					$update = Film::SRC_UPCOMING;
+					$update = Movie::SRC_UPCOMING;
 					break;
 				case 'dvd':
 					$data = $rt->getDVDReleases();
-					$update = Film::SRC_DVD;
+					$update = Movie::SRC_DVD;
 					break;
 				default:
 					$data = false;
diff --git a/newznab/processing/PProcess.php b/newznab/processing/PProcess.php
index 44240b133..607216e0f 100644
--- a/newznab/processing/PProcess.php
+++ b/newznab/processing/PProcess.php
@@ -190,7 +190,7 @@ class PProcess
 	{
 		$processMovies = (is_numeric($processMovies) ? $processMovies : $this->pdo->getSetting('lookupimdb'));
 		if ($processMovies > 0) {
-			(new \Film(['Echo' => $this->echooutput, 'Settings' => $this->pdo]))->processMovieReleases($groupID, $guidChar, $processMovies);
+			(new \Movie(['Echo' => $this->echooutput, 'Settings' => $this->pdo]))->processMovieReleases($groupID, $guidChar, $processMovies);
 		}
 	}
 
diff --git a/www/admin/movie-add.php b/www/admin/movie-add.php
index d5149fbc3..0e54a7f37 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 Film(['Settings' => $page->settings]);
+$movie = new Movie(['Settings' => $page->settings]);
 $id = 0;
 
 $page->title = "Movie Add";
diff --git a/www/admin/movie-edit.php b/www/admin/movie-edit.php
index ee4da8f31..97f2af5b1 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 Film();
+$movie = new Movie();
 $id = 0;
 
 // set the current action
diff --git a/www/admin/release-edit.php b/www/admin/release-edit.php
index 3ec83db4a..dc388d4ad 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 Film();
+				$movie = new Movie();
 				$mov = $movie->getMovieInfo($release['imdbid']);
 				$page->smarty->assign('updatename', $mov["title"]);
 			}
diff --git a/www/pages/ajax_mymovies.php b/www/pages/ajax_mymovies.php
index 4bae5269f..5ef585050 100644
--- a/www/pages/ajax_mymovies.php
+++ b/www/pages/ajax_mymovies.php
@@ -16,7 +16,7 @@ if (isset($_REQUEST['del'])) {
 	$cats[] = '2030';
 	$cats[] = '2040';
 
-	$m = new Film(['Settings' => $page->settings]);
+	$m = new Movie(['Settings' => $page->settings]);
 	$mi = $m->getMovieInfo($_REQUEST['add']);
 	if (!$mi) {
 		$m->updateMovieInfo($_REQUEST['add']);
@@ -29,7 +29,7 @@ if (isset($_REQUEST['del'])) {
 	}
 
 	$tmdb = new TMDB($page->settings->getSetting('tmdbkey'), $page->settings->getSetting('imdblanguage'));
-	$m = new Film(['Settings' => $page->settings, 'TMDb' => $tmdb]);
+	$m = new Movie(['Settings' => $page->settings, 'TMDb' => $tmdb]);
 
 	if (is_numeric($_REQUEST['id'])) {
 		$movie = $m->fetchTMDBProperties($_REQUEST['id']);
@@ -69,7 +69,7 @@ if (isset($_REQUEST['del'])) {
 		} else {
 			$ourmovieimdbs = [];
 			if (count($imdbids) > 0) {
-				$m = new Film(['Settings' => $page->settings, 'TMDb' => $tmdb]);
+				$m = new Movie(['Settings' => $page->settings, 'TMDb' => $tmdb]);
 				$allmovies = $m->getMovieInfoMultiImdb($imdbids);
 				foreach ($allmovies as $ourmovie) {
 					if ($ourmovie['relimdb'] != '') {
diff --git a/www/pages/details.php b/www/pages/details.php
index 503d6c134..da735b9a6 100644
--- a/www/pages/details.php
+++ b/www/pages/details.php
@@ -72,7 +72,7 @@ if (isset($_GET["id"]))
 
 	$mov = '';
 	if ($data['imdbid'] != '' && $data['imdbid'] != 0000000) {
-		$movie = new Film(['Settings' => $page->settings]);
+		$movie = new Movie(['Settings' => $page->settings]);
 		$mov   = $movie->getMovieInfo($data['imdbid']);
 		if ($mov && isset($mov['title'])) {
 			$mov['title']    = str_replace(['/', '\\'], '', $mov['title']);
diff --git a/www/pages/movie.php b/www/pages/movie.php
index 6aeebceae..de6119cb5 100644
--- a/www/pages/movie.php
+++ b/www/pages/movie.php
@@ -5,7 +5,7 @@ if (!$page->users->isLoggedIn()) {
 }
 
 if (isset($_GET['modal']) && isset($_GET["id"]) && ctype_digit($_GET["id"])) {
-	$movie = new Film(['Settings' => $page->settings]);
+	$movie = new Movie(['Settings' => $page->settings]);
 	$mov = $movie->getMovieInfo($_GET['id']);
 
 	if (!$mov) {
diff --git a/www/pages/movies.php b/www/pages/movies.php
index bf6ea43fb..f5af2a9fd 100644
--- a/www/pages/movies.php
+++ b/www/pages/movies.php
@@ -1,6 +1,6 @@
 <?php
 
-$movie = new Film(['Settings' => $page->settings]);
+$movie = new Movie(['Settings' => $page->settings]);
 $cat = new Category(['Settings' => $page->settings]);
 
 if (!$page->users->isLoggedIn())
diff --git a/www/pages/movietrailer.php b/www/pages/movietrailer.php
index 729c27041..837673256 100644
--- a/www/pages/movietrailer.php
+++ b/www/pages/movietrailer.php
@@ -1,6 +1,6 @@
 <?php
 
-$movie = new Film;
+$movie = new Movie;
 
 if (!$page->users->isLoggedIn())
 	$page->show403();
diff --git a/www/pages/upcoming.php b/www/pages/upcoming.php
index 1be21d5ce..c0a54e552 100644
--- a/www/pages/upcoming.php
+++ b/www/pages/upcoming.php
@@ -4,7 +4,7 @@ if (!$page->users->isLoggedIn()) {
 	$page->show403();
 }
 
-$m = new Film();
+$m = new Movie();
 
 if (!isset($_GET["id"])) {
 	$_GET["id"] = 1;
@@ -30,19 +30,19 @@ if (!$data || $data["info"] == "") {
 		$page->smarty->assign('data', $data->movies);
 
 		switch ($_GET["id"]) {
-			case Film::SRC_BOXOFFICE;
+			case Movie::SRC_BOXOFFICE;
 				$page->title = "Box Office";
 				break;
-			case Film::SRC_INTHEATRE;
+			case Movie::SRC_INTHEATRE;
 				$page->title = "In Theater";
 				break;
-			case Film::SRC_OPENING;
+			case Movie::SRC_OPENING;
 				$page->title = "Opening";
 				break;
-			case Film::SRC_UPCOMING;
+			case Movie::SRC_UPCOMING;
 				$page->title = "Upcoming";
 				break;
-			case Film::SRC_DVD;
+			case Movie::SRC_DVD;
 				$page->title = "DVD Releases";
 				break;
 		}