diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PerlClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PerlClientCodegen.java
index 8f8ff21bc58..24a14135225 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PerlClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PerlClientCodegen.java
@@ -76,7 +76,7 @@ public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
     typeMapping.put("array", "ARRAY");
     typeMapping.put("map", "HASH");
 
-    supportingFiles.add(new SupportingFile("APIClient.mustache", "lib/WWW/" + invokerPackage, "APIClient.pm"));
+    supportingFiles.add(new SupportingFile("ApiClient.mustache", "lib/WWW/" + invokerPackage, "ApiClient.pm"));
     supportingFiles.add(new SupportingFile("Configuration.mustache", "lib/WWW/" + invokerPackage, "Configuration.pm"));
     supportingFiles.add(new SupportingFile("BaseObject.mustache", "lib/WWW/" + invokerPackage, "Object/BaseObject.pm"));
   }
diff --git a/modules/swagger-codegen/src/main/resources/perl/APIClient.mustache b/modules/swagger-codegen/src/main/resources/perl/APIClient.mustache
index 79528dad23b..d5fa48ac6d9 100644
--- a/modules/swagger-codegen/src/main/resources/perl/APIClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/APIClient.mustache
@@ -1,4 +1,4 @@
-package WWW::{{invokerPackage}}::APIClient;
+package WWW::{{invokerPackage}}::ApiClient;
 
 use strict;
 use warnings;
diff --git a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache
index 07ff9b87785..90ad999c8a9 100644
--- a/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/Configuration.mustache
@@ -7,8 +7,6 @@ use utf8;
 use Log::Any qw($log);
 use Carp;
 
-use WWW::{{invokerPackage}}::APIClient;
-
 # class/static variables
 our $api_client;
 our $http_timeout = 180;
diff --git a/modules/swagger-codegen/src/main/resources/perl/api.mustache b/modules/swagger-codegen/src/main/resources/perl/api.mustache
index 54647ca4b8f..f1168d18ce7 100644
--- a/modules/swagger-codegen/src/main/resources/perl/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/perl/api.mustache
@@ -27,7 +27,7 @@ use Exporter;
 use Carp qw( croak );
 use Log::Any qw($log);
 
-use WWW::{{invokerPackage}}::APIClient;
+use WWW::{{invokerPackage}}::ApiClient;
 use WWW::{{invokerPackage}}::Configuration;
 
 {{#operations}}
@@ -38,7 +38,7 @@ our @EXPORT_OK = qw(
 
 sub new {
     my $class   = shift;
-    my $default_api_client = $WWW::{{invokerPackage}}::Configuration::api_client ? $WWW::{{invokerPackage}}::Configuration::api_client  : WWW::{{invokerPackage}}::APIClient->new;
+    my $default_api_client = $WWW::{{invokerPackage}}::Configuration::api_client ? $WWW::{{invokerPackage}}::Configuration::api_client  : WWW::{{invokerPackage}}::ApiClient->new;
     my (%self) = (
         'api_client' => $default_api_client,
         @_
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/APIClient.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/APIClient.pm
index 3f6aaf9ff87..c80677ca518 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/APIClient.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/APIClient.pm
@@ -1,4 +1,4 @@
-package WWW::SwaggerClient::APIClient;
+package WWW::SwaggerClient::ApiClient;
 
 use strict;
 use warnings;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm
index e3da7f3332d..08982c445e1 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/Configuration.pm
@@ -7,8 +7,6 @@ use utf8;
 use Log::Any qw($log);
 use Carp;
 
-use WWW::SwaggerClient::APIClient;
-
 # class/static variables
 our $api_client;
 our $http_timeout = 180;
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
index 077e7cbc45f..92fdd50e5ef 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/PetApi.pm
@@ -27,7 +27,7 @@ use Exporter;
 use Carp qw( croak );
 use Log::Any qw($log);
 
-use WWW::SwaggerClient::APIClient;
+use WWW::SwaggerClient::ApiClient;
 use WWW::SwaggerClient::Configuration;
 
 our @EXPORT_OK = qw(
@@ -44,7 +44,7 @@ our @EXPORT_OK = qw(
 
 sub new {
     my $class   = shift;
-    my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client  : WWW::SwaggerClient::APIClient->new;
+    my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client  : WWW::SwaggerClient::ApiClient->new;
     my (%self) = (
         'api_client' => $default_api_client,
         @_
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
index 0c2d25d0236..b6d864a6be3 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/StoreApi.pm
@@ -27,7 +27,7 @@ use Exporter;
 use Carp qw( croak );
 use Log::Any qw($log);
 
-use WWW::SwaggerClient::APIClient;
+use WWW::SwaggerClient::ApiClient;
 use WWW::SwaggerClient::Configuration;
 
 our @EXPORT_OK = qw(
@@ -40,7 +40,7 @@ our @EXPORT_OK = qw(
 
 sub new {
     my $class   = shift;
-    my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client  : WWW::SwaggerClient::APIClient->new;
+    my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client  : WWW::SwaggerClient::ApiClient->new;
     my (%self) = (
         'api_client' => $default_api_client,
         @_
diff --git a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
index ecdd8eab9c2..fa0d9ed5c4f 100644
--- a/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/SwaggerClient/UserApi.pm
@@ -27,7 +27,7 @@ use Exporter;
 use Carp qw( croak );
 use Log::Any qw($log);
 
-use WWW::SwaggerClient::APIClient;
+use WWW::SwaggerClient::ApiClient;
 use WWW::SwaggerClient::Configuration;
 
 our @EXPORT_OK = qw(
@@ -44,7 +44,7 @@ our @EXPORT_OK = qw(
 
 sub new {
     my $class   = shift;
-    my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client  : WWW::SwaggerClient::APIClient->new;
+    my $default_api_client = $WWW::SwaggerClient::Configuration::api_client ? $WWW::SwaggerClient::Configuration::api_client  : WWW::SwaggerClient::ApiClient->new;
     my (%self) = (
         'api_client' => $default_api_client,
         @_
diff --git a/samples/client/petstore/perl/t/01_pet_api.t b/samples/client/petstore/perl/t/01_pet_api.t
index 4a2ef58ee91..6b731b846fe 100644
--- a/samples/client/petstore/perl/t/01_pet_api.t
+++ b/samples/client/petstore/perl/t/01_pet_api.t
@@ -6,12 +6,12 @@ use strict;
 use warnings;
 
 use_ok('WWW::SwaggerClient::PetApi');
-use_ok('WWW::SwaggerClient::APIClient');
+use_ok('WWW::SwaggerClient::ApiClient');
 use_ok('WWW::SwaggerClient::Object::Pet');
 use_ok('WWW::SwaggerClient::Object::Tag');
 use_ok('WWW::SwaggerClient::Object::Category');
 
-my $api_client = WWW::SwaggerClient::APIClient->new('base_url' => 'http://testing');
+my $api_client = WWW::SwaggerClient::ApiClient->new('base_url' => 'http://testing');
 my $pet_api = WWW::SwaggerClient::PetApi->new('api_client' => $api_client);
 is $pet_api->{api_client}->{base_url}, 'http://testing', 'get the proper base URL from api client';
 
diff --git a/samples/client/petstore/perl/test.pl b/samples/client/petstore/perl/test.pl
index f1e819be5ce..3479f6bd3a9 100755
--- a/samples/client/petstore/perl/test.pl
+++ b/samples/client/petstore/perl/test.pl
@@ -5,7 +5,7 @@ use lib 'lib';
 use strict;
 use warnings;
 use WWW::SwaggerClient::PetApi;
-use WWW::SwaggerClient::APIClient;
+use WWW::SwaggerClient::ApiClient;
 use WWW::SwaggerClient::Configuration;
 use WWW::SwaggerClient::Object::Pet;
 use WWW::SwaggerClient::Object::Tag;