diff --git a/lib/controller/action.py b/lib/controller/action.py
index 465cb464a..47a40c4d2 100644
--- a/lib/controller/action.py
+++ b/lib/controller/action.py
@@ -106,13 +106,13 @@ def action():
     if conf.getTables:
         conf.dumper.dbTables(conf.dbmsHandler.getTables())
 
-    if conf.bruteTables:
+    if conf.commonTables:
         conf.dumper.dbTables(tableExists(paths.COMMON_TABLES))
 
     if conf.getColumns:
         conf.dumper.dbTableColumns(conf.dbmsHandler.getColumns())
 
-    if conf.bruteColumns:
+    if conf.commonTables:
         conf.dumper.dbTableColumns(columnExists(paths.COMMON_COLUMNS))
 
     if conf.dumpTable:
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index cf4b22661..3a4aff047 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -114,8 +114,8 @@ optDict = {
                              },
 
             "Brute":         {
-                               "bruteTables":       "boolean",
-                               "bruteColumns":      "boolean",
+                               "commonTables":       "boolean",
+                               "commonColumns":      "boolean",
                              },
 
             "User-defined function": {
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 0272affd5..8daf6948b 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -346,10 +346,10 @@ def cmdLineParser():
                           "options can be used to run brute force "
                           "checks.")
 
-        brute.add_option("--brute-tables", dest="bruteTables", action="store_true",
+        brute.add_option("--common-tables", dest="commonTables", action="store_true",
                                default=False, help="Check existence of common tables")
 
-        brute.add_option("--brute-columns", dest="bruteColumns", action="store_true",
+        brute.add_option("--common-columns", dest="commonColumns", action="store_true",
                                default=False, help="Check existence of common columns")
 
         # User-defined function options
diff --git a/sqlmap.conf b/sqlmap.conf
index 47cf1432c..0c15cc649 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -392,11 +392,11 @@ sqlShell = False
 
 # Check existence of common tables.
 # Valid: True or False
-bruteTables = False
+commonTables = False
 
 # Check existence of common columns.
 # Valid: True or False
-bruteColumns = False
+commonColumns = False
 
 
 # These options can be used to create custom user-defined functions.