diff --git a/dev/tests/api-functional/config/install-config-mysql.php.dist b/dev/tests/api-functional/config/install-config-mysql.php.dist
index cfba75530f5d8f4c87efb9e6e69f9ad1fc6e021b..159ab87e76c518727ad88d7d7450624664190458 100644
--- a/dev/tests/api-functional/config/install-config-mysql.php.dist
+++ b/dev/tests/api-functional/config/install-config-mysql.php.dist
@@ -17,12 +17,12 @@ return [
'base_url' => 'http://localhost/',
'use_secure' => '0',
'use_rewrites' => '0',
- 'admin_lastname' => 'Admin',
- 'admin_firstname' => 'Admin',
- 'admin_email' => 'admin@example.com',
- 'admin_user' => 'admin',
- 'admin_password' => '123123q',
- 'admin_use_security_key' => '0',
+ 'admin-lastname' => 'Admin',
+ 'admin-firstname' => 'Admin',
+ 'admin-email' => 'admin@example.com',
+ 'admin-user' => 'admin',
+ 'admin-password' => '123123q',
+ 'admin-use-security-key' => '0',
/* PayPal has limitation for order number - 20 characters. 10 digits prefix + 8 digits number is good enough */
'sales_order_increment_prefix' => time(),
'session-save' => 'db',
diff --git a/dev/tests/integration/etc/install-config-mysql.php.dist b/dev/tests/integration/etc/install-config-mysql.php.dist
index f579d253ccff5b691a37063339cae98df2bde170..3cbe5eed4e976da6ad88238ad9a60a7fdb42c999 100644
--- a/dev/tests/integration/etc/install-config-mysql.php.dist
+++ b/dev/tests/integration/etc/install-config-mysql.php.dist
@@ -11,9 +11,9 @@ return [
'db-name' => 'magento_integration_tests',
'db-prefix' => '',
'backend-frontname' => 'backend',
- 'admin_user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
- 'admin_password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
- 'admin_email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
- 'admin_firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
- 'admin_lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
+ 'admin-user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
+ 'admin-password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
+ 'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
+ 'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
+ 'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
];
diff --git a/dev/tests/integration/etc/install-config-mysql.travis.php.dist b/dev/tests/integration/etc/install-config-mysql.travis.php.dist
index b539cd8ef0544e0974b96b6cc8d49ed33225b040..ac8eeb0bbbaccc5b2604d3a0e925c384afec1049 100644
--- a/dev/tests/integration/etc/install-config-mysql.travis.php.dist
+++ b/dev/tests/integration/etc/install-config-mysql.travis.php.dist
@@ -11,9 +11,9 @@ return [
'db-name' => 'magento_integration_tests',
'db-prefix' => 'travis_',
'backend-frontname' => 'backend',
- 'admin_user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
- 'admin_password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
- 'admin_email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
- 'admin_firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
- 'admin_lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
+ 'admin-user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
+ 'admin-password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
+ 'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
+ 'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
+ 'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
];
diff --git a/dev/tests/performance/benchmark.jmx b/dev/tests/performance/benchmark.jmx
index 9ebd36053e18e2ae06bac1cbd26ad7d0381d9748..af952a0e59cd8c3e4e8a43c08eb8af68c9287140 100644
--- a/dev/tests/performance/benchmark.jmx
+++ b/dev/tests/performance/benchmark.jmx
@@ -53,14 +53,14 @@
<stringProp name="Argument.value">${__P(admin_path,backend)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
- <elementProp name="admin_user" elementType="Argument">
- <stringProp name="Argument.name">admin_user</stringProp>
- <stringProp name="Argument.value">${__P(admin_user,admin)}</stringProp>
+ <elementProp name="admin-user" elementType="Argument">
+ <stringProp name="Argument.name">admin-user</stringProp>
+ <stringProp name="Argument.value">${__P(admin-user,admin)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
- <elementProp name="admin_password" elementType="Argument">
- <stringProp name="Argument.name">admin_password</stringProp>
- <stringProp name="Argument.value">${__P(admin_password,123123q)}</stringProp>
+ <elementProp name="admin-password" elementType="Argument">
+ <stringProp name="Argument.name">admin-password</stringProp>
+ <stringProp name="Argument.value">${__P(admin-password,123123q)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="response_time_file_name" elementType="Argument">
@@ -259,14 +259,14 @@
</elementProp>
<elementProp name="login[password]" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">true</boolProp>
- <stringProp name="Argument.value">${admin_password}</stringProp>
+ <stringProp name="Argument.value">${admin-password}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">login[password]</stringProp>
</elementProp>
<elementProp name="login[username]" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">true</boolProp>
- <stringProp name="Argument.value">${admin_user}</stringProp>
+ <stringProp name="Argument.value">${admin-user}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">login[username]</stringProp>
diff --git a/dev/tests/performance/config.php.dist b/dev/tests/performance/config.php.dist
index 968022b8e0dff654da8f64ec2d044ca00a153833..57c1111221d9bc6875142e17c2bd7d6a3588e71a 100644
--- a/dev/tests/performance/config.php.dist
+++ b/dev/tests/performance/config.php.dist
@@ -18,14 +18,14 @@ return array(
'db-user' => 'root',
'db-password' => '',
'use_secure' => '0',
- 'use_secure_admin' => '0',
+ 'use-secure-admin' => '0',
'use_rewrites' => '0',
- 'admin_lastname' => 'Admin',
- 'admin_firstname' => 'Admin',
- 'admin_email' => 'admin@example.com',
- 'admin_user' => 'admin',
- 'admin_password' => '123123q',
- 'admin_use_security_key' => '0',
+ 'admin-lastname' => 'Admin',
+ 'admin-firstname' => 'Admin',
+ 'admin-email' => 'admin@example.com',
+ 'admin-user' => 'admin',
+ 'admin-password' => '123123q',
+ 'admin-use-security-key' => '0',
'backend-frontname' => 'backend',
),
'options_no_value' => array(
diff --git a/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php b/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php
index 75eab279b5855ca01cd90e6321e0882a223a8e47..65287f5656bacc9a1f78b30a3f5ae3c1e69bee6e 100644
--- a/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php
+++ b/dev/tests/performance/framework/Magento/TestFramework/Performance/Config.php
@@ -117,7 +117,7 @@ class Config
}
// Validate admin options data
- $requiredAdminKeys = ['admin_user', 'admin_password', 'backend-frontname'];
+ $requiredAdminKeys = ['admin-user', 'admin-password', 'backend-frontname'];
foreach ($requiredAdminKeys as $requiredKeyName) {
if (empty($configData['application']['installation']['options'][$requiredKeyName])) {
throw new \Magento\Framework\Exception\LocalizedException(
@@ -278,8 +278,8 @@ class Config
\Magento\TestFramework\Performance\Scenario::ARG_PATH => $this->getApplicationUrlPath(),
\Magento\TestFramework\Performance\Scenario::ARG_BASEDIR => $this->getApplicationBaseDir(),
\Magento\TestFramework\Performance\Scenario::ARG_BACKEND_FRONTNAME => $options['backend-frontname'],
- \Magento\TestFramework\Performance\Scenario::ARG_ADMIN_USER => $options['admin_user'],
- \Magento\TestFramework\Performance\Scenario::ARG_ADMIN_PASSWORD => $options['admin_password'],
+ \Magento\TestFramework\Performance\Scenario::ARG_ADMIN_USER => $options['admin-user'],
+ \Magento\TestFramework\Performance\Scenario::ARG_ADMIN_PASSWORD => $options['admin-password'],
'jmeter.save.saveservice.output_format' => 'xml',
];
}
diff --git a/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php b/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php
index bcb56c85e197104200864d5c0a5cee8f4734d955..0cdbfe20936fd69c9e66a815431fc13f8c0f8770 100644
--- a/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php
+++ b/dev/tests/performance/framework/Magento/TestFramework/Performance/Scenario.php
@@ -24,9 +24,9 @@ class Scenario
const ARG_BASEDIR = 'basedir';
- const ARG_ADMIN_USER = 'admin_user';
+ const ARG_ADMIN_USER = 'admin-user';
- const ARG_ADMIN_PASSWORD = 'admin_password';
+ const ARG_ADMIN_PASSWORD = 'admin-password';
const ARG_BACKEND_FRONTNAME = 'backend-frontname';
diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php
index 7a2dba1f220c4a2c4461252a65b40d3cc780e450..50794f66c1cee434f92ae7b5b61b53004e2bcc6d 100644
--- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php
+++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/ConfigTest.php
@@ -145,8 +145,8 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
'option1' => 'value 1',
'option2' => 'value 2',
'backend-frontname' => 'backend',
- 'admin_user' => 'admin',
- 'admin_password' => 'password1',
+ 'admin-user' => 'admin',
+ 'admin-password' => 'password1',
];
$this->assertEquals($expectedOptions, $this->_object->getInstallOptions());
}
diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist
index 7f63b4ad90f9124818605fde4b5ea7f335cd7da4..239c3a60bec11254f1a4cfa27061480fed2b6aeb 100644
--- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist
+++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_dist/config.php.dist
@@ -11,8 +11,8 @@ return array(
'installation' => array(
'options' => array(
'backend-frontname' => 'backend',
- 'admin_user' => 'admin',
- 'admin_password' => 'password1',
+ 'admin-user' => 'admin',
+ 'admin-password' => 'password1',
),
),
),
diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php
index a85b38987cd542d91ffab2b6de9a16c617aa4afc..07a1a86c76dece35ac4c8af990a571c82dad3708 100644
--- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php
+++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php
@@ -11,8 +11,8 @@ return [
'installation' => [
'options' => [
'backend-frontname' => 'backend',
- 'admin_user' => 'admin',
- 'admin_password' => 'password1',
+ 'admin-user' => 'admin',
+ 'admin-password' => 'password1',
],
],
],
diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist
index 21325212b5a8ddf15e11448969b0d486fd1bd2cb..a1b5c16c55297e28c8c78d5ac9ca75b4fee3c514 100644
--- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist
+++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/bootstrap/config_normal/config.php.dist
@@ -11,8 +11,8 @@ return array(
'installation' => array(
'options' => array(
'backend-frontname' => 'backend',
- 'admin_user' => 'admin',
- 'admin_password' => 'password1',
+ 'admin-user' => 'admin',
+ 'admin-password' => 'password1',
),
),
),
diff --git a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php
index 629f6737ca11c489437a1d350fc9da2185e8fa3b..f74eb069d8eacd093d1baaa3309ea0c4bc94b18c 100644
--- a/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php
+++ b/dev/tests/performance/framework/tests/unit/testsuite/Magento/Test/Performance/_files/config_data.php
@@ -13,8 +13,8 @@ return [
'option1' => 'value 1',
'option2' => 'value 2',
'backend-frontname' => 'backend',
- 'admin_user' => 'admin',
- 'admin_password' => 'password1',
+ 'admin-user' => 'admin',
+ 'admin-password' => 'password1',
],
],
],
diff --git a/dev/tests/performance/testsuite/backend.jmx b/dev/tests/performance/testsuite/backend.jmx
index 28ca78a63bc57193694b1b4525c3612bd8935af9..e3e9dd82a55d3060900a3368df5ee97c305086b9 100644
--- a/dev/tests/performance/testsuite/backend.jmx
+++ b/dev/tests/performance/testsuite/backend.jmx
@@ -25,12 +25,12 @@
</elementProp>
<elementProp name="ADMIN_USER" elementType="Argument">
<stringProp name="Argument.name">ADMIN_USER</stringProp>
- <stringProp name="Argument.value">${__P(admin_user,admin)}</stringProp>
+ <stringProp name="Argument.value">${__P(admin-user,admin)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="ADMIN_PASSWORD" elementType="Argument">
<stringProp name="Argument.name">ADMIN_PASSWORD</stringProp>
- <stringProp name="Argument.value">${__P(admin_password,123123q)}</stringProp>
+ <stringProp name="Argument.value">${__P(admin-password,123123q)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="products_number" elementType="Argument">
diff --git a/dev/tests/performance/testsuite/checkout.jmx b/dev/tests/performance/testsuite/checkout.jmx
index 38e52803f7de4f0869f431f7359568b2e5557a6c..6306e47f71ab4d71d780ea77e958cfea918d27c8 100644
--- a/dev/tests/performance/testsuite/checkout.jmx
+++ b/dev/tests/performance/testsuite/checkout.jmx
@@ -45,12 +45,12 @@
</elementProp>
<elementProp name="ADMIN_USER" elementType="Argument">
<stringProp name="Argument.name">ADMIN_USER</stringProp>
- <stringProp name="Argument.value">${__P(admin_user,admin)}</stringProp>
+ <stringProp name="Argument.value">${__P(admin-user,admin)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="ADMIN_PASSWORD" elementType="Argument">
<stringProp name="Argument.name">ADMIN_PASSWORD</stringProp>
- <stringProp name="Argument.value">${__P(admin_password,123123q)}</stringProp>
+ <stringProp name="Argument.value">${__P(admin-password,123123q)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
</collectionProp>
diff --git a/dev/tests/performance/testsuite/product_edit.jmx b/dev/tests/performance/testsuite/product_edit.jmx
index 8e2f81f8ae1a11209665b3ffa8b132573b440cad..c4b2ced13478c5ee364d629957529ee46d23c619 100644
--- a/dev/tests/performance/testsuite/product_edit.jmx
+++ b/dev/tests/performance/testsuite/product_edit.jmx
@@ -35,12 +35,12 @@
</elementProp>
<elementProp name="ADMIN_USER" elementType="Argument">
<stringProp name="Argument.name">ADMIN_USER</stringProp>
- <stringProp name="Argument.value">${__P(admin_user,admin)}</stringProp>
+ <stringProp name="Argument.value">${__P(admin-user,admin)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="ADMIN_PASSWORD" elementType="Argument">
<stringProp name="Argument.name">ADMIN_PASSWORD</stringProp>
- <stringProp name="Argument.value">${__P(admin_password,123123q)}</stringProp>
+ <stringProp name="Argument.value">${__P(admin-password,123123q)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="product_sku" elementType="Argument">
diff --git a/dev/tests/performance/testsuite/reusable/admin_login.jmx b/dev/tests/performance/testsuite/reusable/admin_login.jmx
index 8964b81dcb3e76ec270316e91d9d437253f969c2..9d6eb8fb2cb2e2d23d120603de002bcd3ab108dc 100644
--- a/dev/tests/performance/testsuite/reusable/admin_login.jmx
+++ b/dev/tests/performance/testsuite/reusable/admin_login.jmx
@@ -160,12 +160,12 @@
</elementProp>
<elementProp name="ADMIN_USER" elementType="Argument">
<stringProp name="Argument.name">ADMIN_USER</stringProp>
- <stringProp name="Argument.value">${__P(admin_user,admin)}</stringProp>
+ <stringProp name="Argument.value">${__P(admin-user,admin)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="ADMIN_PASSWORD" elementType="Argument">
<stringProp name="Argument.name">ADMIN_PASSWORD</stringProp>
- <stringProp name="Argument.value">${__P(admin_password,123123q)}</stringProp>
+ <stringProp name="Argument.value">${__P(admin-password,123123q)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
</collectionProp>
diff --git a/dev/tools/performance-toolkit/README.txt b/dev/tools/performance-toolkit/README.txt
index 7f09be4ad422af069d0705edfd48a9ed227234ad..3fa0a0e1dfe6b89f389fca44ea2629540a760f2b 100644
--- a/dev/tools/performance-toolkit/README.txt
+++ b/dev/tools/performance-toolkit/README.txt
@@ -32,8 +32,8 @@ Scenario can accept parameters that are described bellow in format <parameter_na
<customer_checkout_percent:4/> Percentage of users that will reach the (logged-in) customer checkout stage. Default is '4'.
<loops:1/> Number of loops to run. Default is '1'.
<admin_path:admin/> Admin backend path. Default is 'admin'.
-<admin_user:admin/> Admin backend user. Default is 'admin'.
-<admin_password:123123q/> Admin backend password. Default is '123123q'.
+<admin-user:admin/> Admin backend user. Default is 'admin'.
+<admin-password:123123q/> Admin backend password. Default is '123123q'.
<think_time_deviation:1000> Deviation (ms) for "think time" emulation. Default is '1000'.
<think_time_delay_offset:2000> Constant delay offset (ms) for "think time" emulation. Default is '2000'.
diff --git a/dev/tools/performance-toolkit/benchmark.jmx b/dev/tools/performance-toolkit/benchmark.jmx
index dba0ec039cd9c0bfd757424f3be3cfb379918ec5..71ae48eb022bf32341f74c857d55ce8dc3de2785 100644
--- a/dev/tools/performance-toolkit/benchmark.jmx
+++ b/dev/tools/performance-toolkit/benchmark.jmx
@@ -83,14 +83,14 @@
<stringProp name="Argument.value">${__P(admin_path,admin)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
- <elementProp name="admin_user" elementType="Argument">
- <stringProp name="Argument.name">admin_user</stringProp>
- <stringProp name="Argument.value">${__P(admin_user,admin)}</stringProp>
+ <elementProp name="admin-user" elementType="Argument">
+ <stringProp name="Argument.name">admin-user</stringProp>
+ <stringProp name="Argument.value">${__P(admin-user,admin)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
- <elementProp name="admin_password" elementType="Argument">
- <stringProp name="Argument.name">admin_password</stringProp>
- <stringProp name="Argument.value">${__P(admin_password,123123q)}</stringProp>
+ <elementProp name="admin-password" elementType="Argument">
+ <stringProp name="Argument.name">admin-password</stringProp>
+ <stringProp name="Argument.value">${__P(admin-password,123123q)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="website_id" elementType="Argument">
@@ -724,14 +724,14 @@ productList.add(productMap); </stringProp>
</elementProp>
<elementProp name="login[password]" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">true</boolProp>
- <stringProp name="Argument.value">${admin_password}</stringProp>
+ <stringProp name="Argument.value">${admin-password}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">login[password]</stringProp>
</elementProp>
<elementProp name="login[username]" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">true</boolProp>
- <stringProp name="Argument.value">${admin_user}</stringProp>
+ <stringProp name="Argument.value">${admin-user}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">login[username]</stringProp>
diff --git a/setup/src/Magento/Setup/Model/AdminAccount.php b/setup/src/Magento/Setup/Model/AdminAccount.php
index 7e52b2b604e10f76f660e28d50f26cf59f3d2c6e..5642dda6afb31035d259682e06f7cb078a01cd16 100644
--- a/setup/src/Magento/Setup/Model/AdminAccount.php
+++ b/setup/src/Magento/Setup/Model/AdminAccount.php
@@ -17,11 +17,11 @@ class AdminAccount
/**#@+
* Data keys
*/
- const KEY_USER = 'admin_user';
- const KEY_PASSWORD = 'admin_password';
- const KEY_EMAIL = 'admin_email';
- const KEY_FIRST_NAME = 'admin_firstname';
- const KEY_LAST_NAME = 'admin_lastname';
+ const KEY_USER = 'admin-user';
+ const KEY_PASSWORD = 'admin-password';
+ const KEY_EMAIL = 'admin-email';
+ const KEY_FIRST_NAME = 'admin-firstname';
+ const KEY_LAST_NAME = 'admin-lastname';
/**#@- */
/**
diff --git a/setup/src/Magento/Setup/Model/StoreConfigurationDataMapper.php b/setup/src/Magento/Setup/Model/StoreConfigurationDataMapper.php
index 0fa3c235244568c8a4e7dbf2595c658f87f9dd68..8d3c517261109b23ddc778d097cc210e4278fb8e 100644
--- a/setup/src/Magento/Setup/Model/StoreConfigurationDataMapper.php
+++ b/setup/src/Magento/Setup/Model/StoreConfigurationDataMapper.php
@@ -26,11 +26,11 @@ class StoreConfigurationDataMapper
const KEY_BASE_URL = 'base_url';
const KEY_BASE_URL_SECURE = 'base_url_secure';
const KEY_IS_SECURE = 'use_secure';
- const KEY_IS_SECURE_ADMIN = 'use_secure_admin';
+ const KEY_IS_SECURE_ADMIN = 'use-secure-admin';
const KEY_LANGUAGE = 'language';
const KEY_TIMEZONE = 'timezone';
const KEY_CURRENCY = 'currency';
- const KEY_ADMIN_USE_SECURITY_KEY = 'admin_use_security_key';
+ const KEY_ADMIN_USE_SECURITY_KEY = 'admin-use-security-key';
/**#@- */
/**