diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
index 350cea42f3d4c14fbe9939485e67490df5fd542c..f656c072a93806869bf9ba4ebca735d5aaa10a90 100644
--- a/classes/privacy/provider.php
+++ b/classes/privacy/provider.php
@@ -24,14 +24,15 @@
 
 namespace tool_lifecycle\privacy;
 
+use context;
+use context_system;
 use core_privacy\local\metadata\collection;
 use core_privacy\local\request\approved_contextlist;
 use core_privacy\local\request\approved_userlist;
-use core_privacy\local\request\context;
 use core_privacy\local\request\contextlist;
 use core_privacy\local\request\userlist;
 use core_privacy\local\request\writer;
-use tool_lifecycle\manager\step_manager;
+use tool_lifecycle\local\manager\step_manager;
 
 defined('MOODLE_INTERNAL') || die();
 
@@ -95,7 +96,7 @@ class provider implements
     public static function export_user_data(approved_contextlist $contextlist) {
         global $DB;
         foreach ($contextlist->get_contexts() as $context) {
-            if ($context instanceof \context_system) {
+            if ($context instanceof context_system) {
                 $records = $DB->get_records('tool_lifecycle_action_log', array('userid' => $contextlist->get_user()->id));
                 $writer = writer::with_context($contextlist->current());
                 foreach ($records as $record) {
@@ -114,9 +115,9 @@ class provider implements
      *
      * @param context $context The specific context to delete data for.
      */
-    public static function delete_data_for_all_users_in_context(\context $context) {
+    public static function delete_data_for_all_users_in_context(context $context) {
         global $DB;
-        if ($context instanceof \context_system) {
+        if ($context instanceof context_system) {
             $sql = "UPDATE {tool_lifecycle_action_log}
                     SET userid = -1";
             $DB->execute($sql);
@@ -131,7 +132,7 @@ class provider implements
     public static function delete_data_for_user(approved_contextlist $contextlist) {
         global $DB;
         foreach ($contextlist->get_contexts() as $context) {
-            if ($context instanceof \context_system) {
+            if ($context instanceof context_system) {
                 $sql = "UPDATE {tool_lifecycle_action_log}
                     SET userid = -1
                     WHERE userid = :userid";
@@ -147,7 +148,7 @@ class provider implements
      */
     public static function get_users_in_context(userlist $userlist) {
         $context = $userlist->get_context();
-        if ($context instanceof \context_system) {
+        if ($context instanceof context_system) {
             $sql = "SELECT userid
                     FROM {tool_lifecycle_action_log}";
             $userlist->add_from_sql('userid', $sql, array());
@@ -162,7 +163,7 @@ class provider implements
     public static function delete_data_for_users(approved_userlist $userlist) {
         global $DB;
         $context = $userlist->get_context();
-        if ($context instanceof \context_system) {
+        if ($context instanceof context_system) {
             list($insql, $params) = $DB->get_in_or_equal($userlist->get_userids());
             $sql = "UPDATE {tool_lifecycle_action_log}
                     SET userid = -1
diff --git a/tests/privacy_test.php b/tests/privacy_test.php
index 31d3ef03652b51f8578591eb27693978237dc482..8ffe855a725dfac9b6d0029ebda2fa6993fd115f 100644
--- a/tests/privacy_test.php
+++ b/tests/privacy_test.php
@@ -27,21 +27,18 @@ defined('MOODLE_INTERNAL') || die();
 global $CFG;
 
 use core_privacy\local\request\approved_userlist;
-use core_privacy\local\request\content_writer;
 use core_privacy\local\request\userlist;
 use core_privacy\local\request\writer;
 use core_privacy\tests\provider_testcase;
 use core_privacy\tests\request\approved_contextlist;
 use tool_lifecycle\action;
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\interaction_manager;
-use tool_lifecycle\manager\process_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\step_subplugin;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\interaction_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 use tool_lifecycle\privacy\provider;
 use tool_lifecycle\processor;
-use tool_lifecycle\task\lifecycle_task;
 
 /**
  * Tests Privacy Implementation