diff --git a/.lintr b/.lintr
index d5ba821..d5ded88 100644
--- a/.lintr
+++ b/.lintr
@@ -5,6 +5,7 @@ linters: linters_with_defaults(
     object_name_linter = object_name_linter(c("snake_case", "CamelCase")), # only allow snake case and camel case object names
     cyclocomp_linter = NULL, # do not check function complexity
     commented_code_linter = NULL, # allow code in comments
-    line_length_linter = line_length_linter(120)
+    line_length_linter = line_length_linter(120),
+    indentation_linter = indentation_linter(indent = 2, hanging_indent_style = "never")
     )
 
diff --git a/DESCRIPTION b/DESCRIPTION
index b1dafdb..3ae61ec 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -26,6 +26,9 @@ Depends:
     R (>= 3.1.0)
 Suggests:
     mlr3 (>= 0.13.3)
+Remotes:
+    mlr-org/mlr3misc@common_baseclass,
+    mlr-org/mlr3@common_baseclass
 Encoding: UTF-8
 LazyData: true
 LazyDataCompression: xz
diff --git a/R/ames_housing.R b/R/ames_housing.R
index 042bdbf..af46817 100644
--- a/R/ames_housing.R
+++ b/R/ames_housing.R
@@ -18,7 +18,7 @@ NULL
 
 get_ames_housing_task = function() {
   b = as_backend("ames_housing")
-  task = mlr3::TaskRegr$new("ames_housing", b, target = "Sale_Price", label = "Ames House Sales")
-  b$hash = task$man = "mlr3data::mlr_tasks_ames_housing"
+  task = mlr3::TaskRegr$new("ames_housing", b, target = "Sale_Price")
+  task$override_info(man = "mlr3data::mlr_tasks_ames_housing", hash = "mlr3data::mlr_tasks_ames_housing")
   task
 }
diff --git a/R/bike_sharing.R b/R/bike_sharing.R
index 3d148d2..5f49370 100644
--- a/R/bike_sharing.R
+++ b/R/bike_sharing.R
@@ -24,7 +24,7 @@ NULL
 
 get_bike_sharing_task = function() {
   b = as_backend("bike_sharing")
-  task = mlr3::TaskRegr$new("bike_sharing", b, target = "count", label = "Bike Sharing Demand")
-  b$hash = task$man = "mlr3data::mlr_tasks_bike_sharing"
+  task = mlr3::TaskRegr$new("bike_sharing", b, target = "count")
+  task$override_info(man = "mlr3data::mlr_tasks_bike_sharing", hash = "mlr3data::mlr_tasks_bike_sharing")
   task
 }
diff --git a/R/ilpd.R b/R/ilpd.R
index e2d345d..4c9755b 100644
--- a/R/ilpd.R
+++ b/R/ilpd.R
@@ -23,7 +23,7 @@ NULL
 
 get_ilpd_task = function() {
   b = as_backend("ilpd")
-  task = mlr3::TaskClassif$new("ilpd", b, target = "diseased", positive = "yes", label = "Indian Liver Patient Data")
-  b$hash = task$man = "mlr3data::mlr_tasks_ilpd"
+  task = mlr3::TaskClassif$new("ilpd", b, target = "diseased", positive = "yes")
+  task$override_info(man = "mlr3data::mlr_tasks_ilpd", hash = "mlr3data::mlr_tasks_ilpd")
   task
 }
diff --git a/R/kc_housing.R b/R/kc_housing.R
index 1038808..31d2a2d 100644
--- a/R/kc_housing.R
+++ b/R/kc_housing.R
@@ -28,7 +28,7 @@ NULL
 
 get_kc_housing_task = function() {
   b = as_backend("kc_housing")
-  task = mlr3::TaskRegr$new("kc_housing", b, target = "price", label = "King County House Sales")
-  b$hash = task$man = "mlr3data::mlr_tasks_kc_housing"
+  task = mlr3::TaskRegr$new("kc_housing", b, target = "price")
+  task$override_info(man = "mlr3data::mlr_tasks_kc_housing", hash = "mlr3data::mlr_tasks_kc_housing")
   task
 }
diff --git a/R/moneyball.R b/R/moneyball.R
index cad5472..bf3923f 100644
--- a/R/moneyball.R
+++ b/R/moneyball.R
@@ -25,7 +25,7 @@ NULL
 
 get_moneyball_task = function() {
   b = as_backend("moneyball")
-  task = mlr3::TaskRegr$new("moneyball", b, target = "rs", label = "Major League Baseball Statistics")
-  b$hash = task$man = "mlr3data::mlr_tasks_moneyball"
+  task = mlr3::TaskRegr$new("moneyball", b, target = "rs")
+  task$override_info(man = "mlr3data::mlr_tasks_moneyball", hash = "mlr3data::mlr_tasks_moneyball")
   task
 }
diff --git a/R/optdigits.R b/R/optdigits.R
index 42a892e..d1df4cc 100644
--- a/R/optdigits.R
+++ b/R/optdigits.R
@@ -30,8 +30,7 @@ NULL
 
 get_optdigits_task = function() {
   b = as_backend("optdigits")
-  task = mlr3::TaskClassif$new("optdigits", b, target = "binaryclass", positive = "P",
-    label = "Optical Recognition of Handwritten Digits")
-  b$hash = task$man = "mlr3data::mlr_tasks_optdigits"
+  task = mlr3::TaskClassif$new("optdigits", b, target = "binaryclass", positive = "P")
+  task$override_info(man = "mlr3data::mlr_tasks_optdigits", hash = "mlr3data::mlr_tasks_optdigits")
   task
 }
diff --git a/R/penguins_simple.R b/R/penguins_simple.R
index e669a78..b9b1c5a 100644
--- a/R/penguins_simple.R
+++ b/R/penguins_simple.R
@@ -29,7 +29,7 @@ NULL
 
 get_penguins_simple_task = function() {
   b = as_backend("penguins_simple")
-  task = mlr3::TaskClassif$new("penguins", b, target = "species", label = "Simplified Palmer Penguins")
-  b$hash = task$man = "mlr3data::mlr_tasks_penguins_simple"
+  task = mlr3::TaskClassif$new("penguins", b, target = "species")
+  task$override_info(man = "mlr3data::mlr_tasks_penguins_simple", hash = "mlr3data::mlr_tasks_penguins_simple")
   task
 }
diff --git a/R/titanic.R b/R/titanic.R
index a867cd5..ec3e25f 100644
--- a/R/titanic.R
+++ b/R/titanic.R
@@ -28,7 +28,7 @@ NULL
 
 get_titanic_task = function() {
   b = as_backend("titanic")
-  task = mlr3::TaskClassif$new("titanic", b, target = "survived", positive = "yes", label = "Titanic")
-  b$hash = task$man = "mlr3data::mlr_tasks_titanic"
+  task = mlr3::TaskClassif$new("titanic", b, target = "survived", positive = "yes")
+  task$override_info(man = "mlr3data::mlr_tasks_titanic", hash = "mlr3data::mlr_tasks_titanic")
   task
 }
diff --git a/tests/test_data_sets.R b/tests/test_data_sets.R
index 430995e..9b787cd 100644
--- a/tests/test_data_sets.R
+++ b/tests/test_data_sets.R
@@ -28,8 +28,17 @@ stopifnot(nrow(moneyball) == 1232L, ncol(moneyball) == 15L)
 
 
 if (requireNamespace("mlr3")) {
+  old_opts = options(
+    warnPartialMatchArgs = TRUE,
+    warnPartialMatchAttr = TRUE,
+    warnPartialMatchDollar = TRUE,
+    mlr3.on_deprecated_mlr3component = "error"
+  )
+
   stopifnot(inherits(mlr3::tsk("kc_housing"), "TaskRegr"))
   stopifnot(inherits(mlr3::tsk("titanic"), "TaskClassif"))
   stopifnot(inherits(mlr3::tsk("optdigits"), "TaskClassif"))
   stopifnot(inherits(mlr3::tsk("moneyball"), "TaskRegr"))
+
+  options(old_opts)
 }