diff --git a/CHANGES.rst b/CHANGES.rst
index 6244ce5..12ead86 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,7 @@ Changelog
 ------------------
 
 - #47 Update permissions imports
+- #46 Compatibility with core#2584 (SampleType to DX)
 - #44 Compatibility with core#2567 (AnalysisCategory to DX)
 - #42 Compatibility with core#2471 (Department to DX)
 - #39 Add storage settings for auto-store/recover of primary sample
diff --git a/src/senaite/storage/tests/doctests/PrimarySample.rst b/src/senaite/storage/tests/doctests/PrimarySample.rst
index 48337d5..ab94936 100644
--- a/src/senaite/storage/tests/doctests/PrimarySample.rst
+++ b/src/senaite/storage/tests/doctests/PrimarySample.rst
@@ -59,7 +59,7 @@ Create some baseline objects for the test:
 
     >>> client = api.create(portal.clients, "Client", Name="Happy Hills", ClientID="HH", MemberDiscountApplies=True)
     >>> contact = api.create(client, "Contact", Firstname="Rita", Lastname="Mohale")
-    >>> sampletype = api.create(setup.bika_sampletypes, "SampleType", title="Water", Prefix="W")
+    >>> sampletype = api.create(setup.sampletypes, "SampleType", title="Water", Prefix="W")
     >>> labcontact = api.create(setup.bika_labcontacts, "LabContact", Firstname="Lab", Lastname="Manager")
     >>> department = api.create(portal.setup.departments, "Department", title="Chemistry", Manager=labcontact)
     >>> category = api.create(portal.setup.analysiscategories, "AnalysisCategory", title="Metals", Department=department)
diff --git a/src/senaite/storage/tests/doctests/StorageWorkflow.rst b/src/senaite/storage/tests/doctests/StorageWorkflow.rst
index 2dc9d38..550e99a 100644
--- a/src/senaite/storage/tests/doctests/StorageWorkflow.rst
+++ b/src/senaite/storage/tests/doctests/StorageWorkflow.rst
@@ -61,7 +61,7 @@ We need to create some basic objects for the test:
     >>> setRoles(portal, TEST_USER_ID, ['LabManager',])
     >>> client = api.create(portal.clients, "Client", Name="Happy Hills", ClientID="HH", MemberDiscountApplies=True)
     >>> contact = api.create(client, "Contact", Firstname="Rita", Lastname="Mohale")
-    >>> sampletype = api.create(setup.bika_sampletypes, "SampleType", title="Water", Prefix="W")
+    >>> sampletype = api.create(portal.setup.sampletypes, "SampleType", title="Water", Prefix="W")
     >>> labcontact = api.create(setup.bika_labcontacts, "LabContact", Firstname="Lab", Lastname="Manager")
     >>> department = api.create(portal.setup.departments, "Department", title="Chemistry", Manager=labcontact)
     >>> category = api.create(portal.setup.analysiscategories, "AnalysisCategory", title="Metals", Department=department)