diff --git a/classes/log/store.php b/classes/log/store.php
index fea0d589862a880c524d6467d3d5f614185759fe..9cf20f93af670a53b3c588d288066699613ae1a2 100755
--- a/classes/log/store.php
+++ b/classes/log/store.php
@@ -97,7 +97,7 @@ class store extends php_obj implements log_writer {
                 'source_lang' => 'en',
                 'send_mbox' => $this->get_config('mbox', false),
                 'send_short_course_id' => $this->get_config('shortcourseid', false),
-                'send_username' => $this->get_config('username', false),
+                'send_username' => $this->get_config('send_username', false),
                 'plugin_url' => 'https://github.com/xAPI-vle/moodle-logstore_xapi',
                 'plugin_version' => $plugin->release,
                 'repo' => new \src\transformer\repos\MoodleRepository($DB),
diff --git a/lang/en/logstore_xapi.php b/lang/en/logstore_xapi.php
index 66ca3dc5fe5d20940c887d21dbe033d9b2075c95..20241bd0a50fbc71b9812b02dbfa5f0356b38475 100644
--- a/lang/en/logstore_xapi.php
+++ b/lang/en/logstore_xapi.php
@@ -41,7 +41,7 @@ $string['logguests'] = 'Log guest actions';
 $string['filters_help'] = 'Enable filters that INCLUDE some actions to be logged.';
 $string['mbox'] = 'Identify users by email';
 $string['mbox_desc'] = 'Statements will identify users with their email (mbox) when this box is ticked.';
-$string['username'] = 'Identify users by id';
-$string['username_desc'] = 'Statements will identify users with their username when this box is ticked, but only if identifying users by email is disabled.';
+$string['send_username'] = 'Identify users by id';
+$string['send_username_desc'] = 'Statements will identify users with their username when this box is ticked, but only if identifying users by email is disabled.';
 $string['shortcourseid'] = 'Send short course name';
 $string['shortcourseid_desc'] = 'Statements will contain the shortname for a course as a short course id extension';
diff --git a/settings.php b/settings.php
index b1f79ff4300a194d1ddefb8f66d51be32df6e94f..1266ff608df5cca5874eb9114c046c9d76aa862e 100644
--- a/settings.php
+++ b/settings.php
@@ -47,9 +47,9 @@ if ($hassiteconfig) {
         get_string('shortcourseid', 'logstore_xapi'),
         get_string('shortcourseid_desc', 'logstore_xapi'), 0));
 
-    $settings->add(new admin_setting_configcheckbox('logstore_xapi/username',
-        get_string('username', 'logstore_xapi'),
-        get_string('username_desc', 'logstore_xapi'), 0));
+    $settings->add(new admin_setting_configcheckbox('logstore_xapi/send_username',
+        get_string('send_username', 'logstore_xapi'),
+        get_string('send_username_desc', 'logstore_xapi'), 0));
 
     // Filters.
     $settings->add(new admin_setting_heading('filters',