diff --git a/bin/account-manager.cgi.in b/bin/account-manager.cgi.in
index 9c6a00a7d8d0da0f711cd4b8f3985c22c47517b7..75c0d217d02ba7daec63fb79e607dc37b7066816 100755
--- a/bin/account-manager.cgi.in
+++ b/bin/account-manager.cgi.in
@@ -7,16 +7,16 @@ use lib qw(@modulesdir@);
 
 use Config::Tiny;
 
-use AccountManager::WebRequest;
+use AccountManager::App;
 
 my $configuration_file =
     $ENV{ACCOUNTMANAGER_CONFIG} || '@sysconfdir@/manager.conf';
 my $configuration = Config::Tiny->read($configuration_file);
 
-my $request = AccountManager::WebRequest->new(
+my $app = AccountManager::App->new(
     configuration => $configuration
 );
-$request->run();
+$app->run();
 
 __END__
 
diff --git a/lib/AccountManager/WebRequest.pm b/lib/AccountManager/App.pm
similarity index 99%
rename from lib/AccountManager/WebRequest.pm
rename to lib/AccountManager/App.pm
index e66f619bbc3e5701f177f821671b2f4539236af5..d402a5cb3829b554dd9fd6901fe5059213b6bdd0 100644
--- a/lib/AccountManager/WebRequest.pm
+++ b/lib/AccountManager/App.pm
@@ -1,4 +1,4 @@
-package AccountManager::WebRequest;
+package AccountManager::App;
 
 use strict;
 use warnings;
@@ -40,7 +40,6 @@ my %actions = (
     download_accounts  => 'req_download_accounts',
 );
 
-## New web request
 sub new {
     my ($pkg, %args) = @_;
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3ef9a03a1c6bccabf5611e70ff3f2619f8cad43a..c74dc66a60cbb5fe5f3effc5359d5c93ba650857 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -11,6 +11,6 @@ nobase_modules_DATA = \
 	AccountManager/Account.pm \
 	AccountManager/Account/Manager.pm \
 	AccountManager/Tools.pm \
-	AccountManager/WebRequest.pm
+	AccountManager/App.pm
 
 EXTRA_DIST = $(nobase_modules_DATA)