diff --git a/CHANGES b/CHANGES
index 1d0c74f4..82f66026 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 26 Nov 2007 - 2.5.0-dev3
 ------------------------
 
+ * Renamed SecGeoLookupsDb to SecGeoLookupDB.
+
  * Implement SecComponentSignature.
 
  * Fix warnings on Solaris and/or 64bit builds.
diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c
index 86970c3c..fc462304 100644
--- a/apache2/apache2_config.c
+++ b/apache2/apache2_config.c
@@ -1273,7 +1273,7 @@ static const char *cmd_pdf_protect_method(cmd_parms *cmd, void *_dcfg,
 
 /* -- Geo Lookup configuration -- */
 
-static const char *cmd_geo_lookups_db(cmd_parms *cmd, void *_dcfg,
+static const char *cmd_geo_lookup_db(cmd_parms *cmd, void *_dcfg,
     const char *p1)
 {
     char *error_msg;
@@ -1520,8 +1520,8 @@ const command_rec module_directives[] = {
     ),
 
     AP_INIT_TAKE1 (
-        "SecGeoLookupsDb",
-        cmd_geo_lookups_db,
+        "SecGeoLookupDB",
+        cmd_geo_lookup_db,
         NULL,
         RSRC_CONF,
         "database for geographical lookups module."
diff --git a/apache2/re_operators.c b/apache2/re_operators.c
index 95fdeaf5..1c1bd7f8 100644
--- a/apache2/re_operators.c
+++ b/apache2/re_operators.c
@@ -931,7 +931,7 @@ static int msre_op_geoLookup_execute(modsec_rec *msr, msre_rule *rule, msre_var
     int rc;
 
     if (geo == NULL) {
-        msr_log(msr, 1, "Geo lookup for \"%s\" attempted without a database.  Set SecGeoLookupDb.", geo_host);
+        msr_log(msr, 1, "Geo lookup for \"%s\" attempted without a database.  Set SecGeoLookupDB.", geo_host);
         return 0;
     }
 
diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml
index ab0096db..f90d4a99 100644
--- a/doc/modsecurity2-apache-reference.xml
+++ b/doc/modsecurity2-apache-reference.xml
@@ -1097,16 +1097,16 @@ SecAuditLogStorageDir logs/audit
     </section>
 
     <section>
-      <title><literal>SecGeoLookupsDb</literal></title>
+      <title><literal>SecGeoLookupDb</literal></title>
 
       <para><emphasis>Description:</emphasis> Defines the path to the
       geograpical database file.</para>
 
       <para><emphasis>Syntax:</emphasis> <literal
-      moreinfo="none">SecGeoLookupsDb /path/to/db</literal></para>
+      moreinfo="none">SecGeoLookupDb /path/to/db</literal></para>
 
       <para><emphasis>Example Usage:</emphasis> <literal
-      moreinfo="none">SecGeoLookupsDb
+      moreinfo="none">SecGeoLookupDb
       /usr/local/geo/data/GeoLiteCity.dat</literal></para>
 
       <para><emphasis>Processing Phase:</emphasis> N/A</para>
@@ -4608,7 +4608,7 @@ SecRule ARGS:route "!<emphasis>@endsWith %{REQUEST_ADDR}</emphasis>" t:none,deny
       in the <literal moreinfo="none">GEO</literal> collection.</para>
 
       <para>You must provide a database via <literal
-      moreinfo="none">SecGeoLookupsDb</literal> before this operator can be
+      moreinfo="none">SecGeoLookupDb</literal> before this operator can be
       used.</para>
 
       <para>See the <literal moreinfo="none">GEO</literal> variable for an
@@ -5038,4 +5038,4 @@ SecRule REQUEST_METHOD "!<emphasis>@within %{tx.allowed_methods}</emphasis>" t:l
       </section>
     </section>
   </section>
-</article>
\ No newline at end of file
+</article>