diff --git a/lib/resolver.php b/lib/resolve.php
similarity index 98%
rename from lib/resolver.php
rename to lib/resolve.php
index 2bdaef5..225665a 100644
--- a/lib/resolver.php
+++ b/lib/resolve.php
@@ -34,7 +34,7 @@ class ResolveResult {
 	const InvalidPath = 7;
 }
 
-class Resolver {
+class Resolve {
 	private $isDirty = FALSE;
 	private $cache;
 	private $config;
@@ -151,7 +151,7 @@ class Resolver {
 
 // Testing
 if(defined('STDIN') ) {
-	$resolver = new Resolver($config);
+	$resolve = new Resolve($config);
 	$test_cases = Array(
 		Array('request' => 'jar70sccp.9-4-2ES26.sbn', 'expected' => '/data/firmware/7970/jar70sccp.9-4-2ES26.sbn'),
 		Array('request' => 'Russian_Russian_Federation/be-sccp.jar', 'expected' => '/data/locales/languages/Russian_Russian_Federation/be-sccp.jar'),
@@ -163,7 +163,7 @@ if(defined('STDIN') ) {
 	);
 	foreach($test_cases as $test) {
 		try {
-			$result = $resolver->resolve($test['request']);
+			$result = $resolve->resolve($test['request']);
 			if (is_string($result)) {
 				if ($result === $base_path . $test['expected']) {
 					print("'" . $test['request'] . "' => '" . $result . "'\n");
@@ -184,7 +184,7 @@ if(defined('STDIN') ) {
 			print("Exception: " . $e->getMessage() . "\n");
 		}
 	}
-	unset($resolver);
+	unset($resolve);
 	#unlink($CACHEFILE_NAME);
 }
 ?>
diff --git a/srv/tftp/tftp_provisioner b/srv/tftp/tftp_provisioner
index fff9e3d..b283e6f 100755
--- a/srv/tftp/tftp_provisioner
+++ b/srv/tftp/tftp_provisioner
@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 require_once("lib/tftp.php");
 require_once("lib/config.php");
-require_once("lib/resolver.php");
+require_once("lib/resolve.php");
 
 use SCCP\TFTP as TFTP;
 use SCCP\Resolve as Resolve;
 class TFTPProvisioner extends TFTP\TFTPServer
 {
   private $_debug;
-  private $_resolver;
+  private $_resolve;
   private $_settings_path;
 
   function __construct($server_url, $config, $logger = NULL, $debug = false)
@@ -23,7 +23,7 @@ class TFTPProvisioner extends TFTP\TFTPServer
     parent::__construct($server_url, $logger);
     $this->_debug = $debug;
     $this->max_put_size = 60000000;
-    $this->_resolver = new Resolve\Resolver($config);
+    $this->_resolve = new Resolve\Resolver($config);
     $this->_settings_path = $this->_config['main']['base_path'] . DIRECTORY_SEPARATOR
                 . $this->_config['subdirs']['settings']['path'] . DIRECTORY_SEPARATOR;
   }
@@ -39,7 +39,7 @@ class TFTPProvisioner extends TFTP\TFTPServer
 
   public function get($peer, $req_filename, $mode)
   {
-    $filename = $this->_resolver->resolve($req_filename);
+    $filename = $this->_resolve->resolve($req_filename);
     if (file_exists($filename) && is_readable($filename))
       return file_get_contents($filename);
     return false;
diff --git a/srv/web/index.php b/srv/web/index.php
index e050b82..cc7e465 100644
--- a/srv/web/index.php
+++ b/srv/web/index.php
@@ -1,6 +1,6 @@
 <?php
 include_once("../lib/config.php");
-include_once("../lib/resolver.php");
+include_once("../lib/resolve.php");
 $request = $_REQUEST ?? null;
 
 function send_fallback_html($message) {
@@ -51,11 +51,11 @@ if (!$request || empty($request) || !array_key_exists('filename',$request) || em
 }
 try {
 	$req_filename=$request['filename'];
-	$resolver = new Resolver($config);
-	if (($filename = $resolver->resolve($req_filename))) {
+	$resolve = new Resolver($config);
+	if (($filename = $resolve->resolve($req_filename))) {
 		sendfile($filename);
 	}
-	unset($resolver);
+	unset($resolve);
 } catch(Exception $e) {
 	send_fallback_html($e->getMessage());
 }