diff --git a/conf/type/__mysql_database/gencode-remote b/conf/type/__mysql_database/gencode-remote
index 9001ac99..c0e862f3 100755
--- a/conf/type/__mysql_database/gencode-remote
+++ b/conf/type/__mysql_database/gencode-remote
@@ -20,8 +20,8 @@
 #
 
 # if --database was specified
-if [ -f "$__object/parameter/database" ]; then
-   database="$(cat "$__object/parameter/database")"
+if [ -f "$__object/parameter/name" ]; then
+   database="$(cat "$__object/parameter/name")"
 else # otherwise use the object id as database name
    database="$__object_id"
 fi
diff --git a/conf/type/__mysql_database/man.text b/conf/type/__mysql_database/man.text
index 3c66eeab..f184a30e 100644
--- a/conf/type/__mysql_database/man.text
+++ b/conf/type/__mysql_database/man.text
@@ -19,7 +19,7 @@ None.
 
 OPTIONAL PARAMETERS
 -------------------
-database::
+name::
    The name of the database to install
    defaults to the object id
 
@@ -34,7 +34,7 @@ EXAMPLES
 --------
 
 --------------------------------------------------------------------------------
-__mysql_database "cdist" --database "cdist" --user "myuser" --password "mypwd"
+__mysql_database "cdist" --name "cdist" --user "myuser" --password "mypwd"
 --------------------------------------------------------------------------------
 
 
diff --git a/conf/type/__mysql_database/parameter/optional b/conf/type/__mysql_database/parameter/optional
index ac60a873..756afee7 100644
--- a/conf/type/__mysql_database/parameter/optional
+++ b/conf/type/__mysql_database/parameter/optional
@@ -1,3 +1,3 @@
-database
+name
 user
 password