diff --git a/stories/components/link.stories.tsx b/stories/components/link.stories.tsx
index 38c60175..9083daa1 100644
--- a/stories/components/link.stories.tsx
+++ b/stories/components/link.stories.tsx
@@ -21,7 +21,12 @@
 
 import type { ReactElement } from "react";
 import React from "react";
-import SolidFns from "@inrupt/solid-client";
+import {
+  addUrl,
+  createThing,
+  setThing,
+  createSolidDataset,
+} from "@inrupt/solid-client";
 import { Link } from "../../src/components/link";
 
 export default {
@@ -48,11 +53,7 @@ export default {
 
 export function WithChildren({ property }: { property: string }): ReactElement {
   const exampleUrl = "http://test.url";
-  const exampleThing = SolidFns.addUrl(
-    SolidFns.createThing(),
-    property,
-    exampleUrl,
-  );
+  const exampleThing = addUrl(createThing(), property, exampleUrl);
   return (
     <Link thing={exampleThing} property={property}>
       <span>Example child</span>
@@ -74,11 +75,7 @@ export function WithoutChildren({
   property: string;
 }): ReactElement {
   const exampleUrl = "http://test.url";
-  const exampleThing = SolidFns.addUrl(
-    SolidFns.createThing(),
-    property,
-    exampleUrl,
-  );
+  const exampleThing = addUrl(createThing(), property, exampleUrl);
   return <Link thing={exampleThing} property={property} />;
 }
 
@@ -92,16 +89,9 @@ WithoutChildren.args = {
 
 export function Editable({ property }: { property: string }): ReactElement {
   const exampleUrl = "http://test.url";
-  const exampleThing = SolidFns.addUrl(
-    SolidFns.createThing(),
-    property,
-    exampleUrl,
-  );
+  const exampleThing = addUrl(createThing(), property, exampleUrl);
 
-  const exampleDataset = SolidFns.setThing(
-    SolidFns.createSolidDataset(),
-    exampleThing,
-  );
+  const exampleDataset = setThing(createSolidDataset(), exampleThing);
 
   return (
     <Link
@@ -124,11 +114,7 @@ Editable.args = {
 export function ErrorComponent(): ReactElement {
   const exampleUrl = "http://test.url";
   const property = "http://xmlns.com/foaf/0.1/homepage";
-  const exampleThing = SolidFns.addUrl(
-    SolidFns.createThing(),
-    property,
-    exampleUrl,
-  );
+  const exampleThing = addUrl(createThing(), property, exampleUrl);
   return (
     <Link
       thing={exampleThing}
diff --git a/stories/components/table.stories.tsx b/stories/components/table.stories.tsx
index 9cda0e34..2b4c7f5d 100644
--- a/stories/components/table.stories.tsx
+++ b/stories/components/table.stories.tsx
@@ -21,7 +21,16 @@
 
 import type { ReactElement } from "react";
 import React, { useContext } from "react";
-import SolidFns from "@inrupt/solid-client";
+import type { SolidDataset } from "@inrupt/solid-client";
+import {
+  addDatetime,
+  addStringNoLocale,
+  createSolidDataset,
+  createThing,
+  getThing,
+  getUrl,
+  setThing,
+} from "@inrupt/solid-client";
 import DatasetContext, {
   DatasetProvider,
 } from "../../src/context/datasetContext";
@@ -64,27 +73,23 @@ export function BasicExample(): ReactElement {
   const namePredicate = `http://xmlns.com/foaf/0.1/name`;
   const datePredicate = `http://schema.org/datePublished`;
 
-  const thing1A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing1A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 1`,
   );
-  const thing1 = SolidFns.addDatetime(thing1A, datePredicate, new Date());
+  const thing1 = addDatetime(thing1A, datePredicate, new Date());
 
-  const thing2A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing2A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 2`,
   );
-  const thing2 = SolidFns.addDatetime(
-    thing2A,
-    datePredicate,
-    new Date("1999-01-02"),
-  );
+  const thing2 = addDatetime(thing2A, datePredicate, new Date("1999-01-02"));
 
-  const emptyDataset = SolidFns.createSolidDataset();
-  const datasetWithThing1 = SolidFns.setThing(emptyDataset, thing1);
-  const dataset = SolidFns.setThing(datasetWithThing1, thing2);
+  const emptyDataset = createSolidDataset();
+  const datasetWithThing1 = setThing(emptyDataset, thing1);
+  const dataset = setThing(datasetWithThing1, thing2);
 
   return (
     <Table
@@ -108,41 +113,29 @@ export function MultipleValues(): ReactElement {
   const namePredicate = `http://xmlns.com/foaf/0.1/name`;
   const nickPredicate = `http://xmlns.com/foaf/0.1/nick`;
 
-  const thing1A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing1A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 1`,
   );
-  const thing1B = SolidFns.addStringNoLocale(
-    thing1A,
-    nickPredicate,
-    `Nickname`,
-  );
-  const thing1C = SolidFns.addStringNoLocale(
-    thing1B,
-    nickPredicate,
-    `Alt Nickname`,
-  );
-  const thing1 = SolidFns.addStringNoLocale(
-    thing1C,
-    nickPredicate,
-    `Final Nickname`,
-  );
+  const thing1B = addStringNoLocale(thing1A, nickPredicate, `Nickname`);
+  const thing1C = addStringNoLocale(thing1B, nickPredicate, `Alt Nickname`);
+  const thing1 = addStringNoLocale(thing1C, nickPredicate, `Final Nickname`);
 
-  const thing2A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing2A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 2`,
   );
-  const thing2 = SolidFns.addStringNoLocale(
+  const thing2 = addStringNoLocale(
     thing2A,
     nickPredicate,
     `example nickname 2`,
   );
 
-  const emptyDataset = SolidFns.createSolidDataset();
-  const datasetWithThing1 = SolidFns.setThing(emptyDataset, thing1);
-  const dataset = SolidFns.setThing(datasetWithThing1, thing2);
+  const emptyDataset = createSolidDataset();
+  const datasetWithThing1 = setThing(emptyDataset, thing1);
+  const dataset = setThing(datasetWithThing1, thing2);
 
   return (
     <Table
@@ -172,27 +165,23 @@ export function CustomBodyComponent(): ReactElement {
   const namePredicate = `http://xmlns.com/foaf/0.1/name`;
   const datePredicate = `http://schema.org/datePublished`;
 
-  const thing1A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing1A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 1`,
   );
-  const thing1 = SolidFns.addDatetime(thing1A, datePredicate, new Date());
+  const thing1 = addDatetime(thing1A, datePredicate, new Date());
 
-  const thing2A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing2A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 2`,
   );
-  const thing2 = SolidFns.addDatetime(
-    thing2A,
-    datePredicate,
-    new Date("1999-01-02"),
-  );
+  const thing2 = addDatetime(thing2A, datePredicate, new Date("1999-01-02"));
 
-  const emptyDataset = SolidFns.createSolidDataset();
-  const datasetWithThing1 = SolidFns.setThing(emptyDataset, thing1);
-  const dataset = SolidFns.setThing(datasetWithThing1, thing2);
+  const emptyDataset = createSolidDataset();
+  const datasetWithThing1 = setThing(emptyDataset, thing1);
+  const dataset = setThing(datasetWithThing1, thing2);
 
   type bodyProps = {
     value?: string;
@@ -244,16 +233,13 @@ export function NestedDataExample(): ReactElement {
   }: {
     numberThingIris: [string];
     numberType: string;
-    dataset: SolidFns.SolidDataset;
+    dataset: SolidDataset;
   }) {
     let phoneNumber = "";
     numberThingIris.some((numberThingIri) => {
-      const numberThing = SolidFns.getThing(dataset, numberThingIri);
-      if (
-        numberThing &&
-        SolidFns.getUrl(numberThing, typeProperty) === numberType
-      ) {
-        phoneNumber = SolidFns.getUrl(numberThing, valueProperty) ?? "";
+      const numberThing = getThing(dataset, numberThingIri);
+      if (numberThing && getUrl(numberThing, typeProperty) === numberType) {
+        phoneNumber = getUrl(numberThing, valueProperty) ?? "";
         return true;
       }
       return false;
@@ -267,11 +253,8 @@ export function NestedDataExample(): ReactElement {
     if (!solidDataset) {
       return null;
     }
-    const personThing = SolidFns.getThing(
-      solidDataset,
-      `${host}/example.ttl#me`,
-    );
-    const alterEgoThing = SolidFns.getThing(
+    const personThing = getThing(solidDataset, `${host}/example.ttl#me`);
+    const alterEgoThing = getThing(
       solidDataset,
       `${host}/example.ttl#alterEgo`,
     );
@@ -338,27 +321,23 @@ export function SortableColumns(): ReactElement {
   const namePredicate = `http://xmlns.com/foaf/0.1/name`;
   const datePredicate = `http://schema.org/datePublished`;
 
-  const thing1A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing1A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 1`,
   );
-  const thing1 = SolidFns.addDatetime(thing1A, datePredicate, new Date());
+  const thing1 = addDatetime(thing1A, datePredicate, new Date());
 
-  const thing2A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing2A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 2`,
   );
-  const thing2 = SolidFns.addDatetime(
-    thing2A,
-    datePredicate,
-    new Date("1999-01-02"),
-  );
+  const thing2 = addDatetime(thing2A, datePredicate, new Date("1999-01-02"));
 
-  const emptyDataset = SolidFns.createSolidDataset();
-  const datasetWithThing1 = SolidFns.setThing(emptyDataset, thing1);
-  const dataset = SolidFns.setThing(datasetWithThing1, thing2);
+  const emptyDataset = createSolidDataset();
+  const datasetWithThing1 = setThing(emptyDataset, thing1);
+  const dataset = setThing(datasetWithThing1, thing2);
 
   return (
     <Table
@@ -394,27 +373,23 @@ export function FilterOnFirstColumn({
   const namePredicate = `http://xmlns.com/foaf/0.1/name`;
   const datePredicate = `http://schema.org/datePublished`;
 
-  const thing1A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing1A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 1`,
   );
-  const thing1 = SolidFns.addDatetime(thing1A, datePredicate, new Date());
+  const thing1 = addDatetime(thing1A, datePredicate, new Date());
 
-  const thing2A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing2A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 2`,
   );
-  const thing2 = SolidFns.addDatetime(
-    thing2A,
-    datePredicate,
-    new Date("1999-01-02"),
-  );
+  const thing2 = addDatetime(thing2A, datePredicate, new Date("1999-01-02"));
 
-  const emptyDataset = SolidFns.createSolidDataset();
-  const datasetWithThing1 = SolidFns.setThing(emptyDataset, thing1);
-  const dataset = SolidFns.setThing(datasetWithThing1, thing2);
+  const emptyDataset = createSolidDataset();
+  const datasetWithThing1 = setThing(emptyDataset, thing1);
+  const dataset = setThing(datasetWithThing1, thing2);
 
   return (
     <Table
@@ -449,27 +424,19 @@ export function SortingFunctionOnFirstColumn(): ReactElement {
   const namePredicate = `http://xmlns.com/foaf/0.1/name`;
   const datePredicate = `http://schema.org/datePublished`;
 
-  const thing1A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing1A = addStringNoLocale(
+    createThing(),
     namePredicate,
     "Another Name",
   );
-  const thing1 = SolidFns.addDatetime(thing1A, datePredicate, new Date());
+  const thing1 = addDatetime(thing1A, datePredicate, new Date());
 
-  const thing2A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
-    namePredicate,
-    "Name A",
-  );
-  const thing2 = SolidFns.addDatetime(
-    thing2A,
-    datePredicate,
-    new Date("1999-01-02"),
-  );
+  const thing2A = addStringNoLocale(createThing(), namePredicate, "Name A");
+  const thing2 = addDatetime(thing2A, datePredicate, new Date("1999-01-02"));
 
-  const emptyDataset = SolidFns.createSolidDataset();
-  const datasetWithThing1 = SolidFns.setThing(emptyDataset, thing1);
-  const dataset = SolidFns.setThing(datasetWithThing1, thing2);
+  const emptyDataset = createSolidDataset();
+  const datasetWithThing1 = setThing(emptyDataset, thing1);
+  const dataset = setThing(datasetWithThing1, thing2);
 
   const sortFunction = (a: string, b: string) => {
     const valueA = a.split(/\s+/)[1];
@@ -504,27 +471,23 @@ export function NoDataComponent(): ReactElement {
   const namePredicate = `http://xmlns.com/foaf/0.1/name`;
   const datePredicate = `http://schema.org/datePublished`;
 
-  const thing1A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing1A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 1`,
   );
-  const thing1 = SolidFns.addDatetime(thing1A, datePredicate, new Date());
+  const thing1 = addDatetime(thing1A, datePredicate, new Date());
 
-  const thing2A = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing2A = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 2`,
   );
-  const thing2 = SolidFns.addDatetime(
-    thing2A,
-    datePredicate,
-    new Date("1999-01-02"),
-  );
+  const thing2 = addDatetime(thing2A, datePredicate, new Date("1999-01-02"));
 
-  const emptyDataset = SolidFns.createSolidDataset();
-  const datasetWithThing1 = SolidFns.setThing(emptyDataset, thing1);
-  const dataset = SolidFns.setThing(datasetWithThing1, thing2);
+  const emptyDataset = createSolidDataset();
+  const datasetWithThing1 = setThing(emptyDataset, thing1);
+  const dataset = setThing(datasetWithThing1, thing2);
 
   return (
     <Table
diff --git a/stories/components/tableColumn.stories.tsx b/stories/components/tableColumn.stories.tsx
index f859217c..8bf58b94 100644
--- a/stories/components/tableColumn.stories.tsx
+++ b/stories/components/tableColumn.stories.tsx
@@ -21,7 +21,12 @@
 
 import type { ReactElement } from "react";
 import React from "react";
-import SolidFns from "@inrupt/solid-client";
+import {
+  addStringNoLocale,
+  createThing,
+  createSolidDataset,
+  setThing,
+} from "@inrupt/solid-client";
 import { Table, TableColumn } from "../../src/components/table";
 import type { DataType } from "../../src/helpers";
 
@@ -93,21 +98,21 @@ export function BasicExample({
 }: ITableColumn): ReactElement {
   const namePredicate = `http://xmlns.com/foaf/0.1/name`;
 
-  const thing1 = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing1 = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 1`,
   );
 
-  const thing2 = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const thing2 = addStringNoLocale(
+    createThing(),
     namePredicate,
     `example name 2`,
   );
 
-  const emptyDataset = SolidFns.createSolidDataset();
-  const datasetWithThing1 = SolidFns.setThing(emptyDataset, thing1);
-  const dataset = SolidFns.setThing(datasetWithThing1, thing2);
+  const emptyDataset = createSolidDataset();
+  const datasetWithThing1 = setThing(emptyDataset, thing1);
+  const dataset = setThing(datasetWithThing1, thing2);
 
   return (
     <Table
diff --git a/stories/components/text.stories.tsx b/stories/components/text.stories.tsx
index 544c420e..cfd13847 100644
--- a/stories/components/text.stories.tsx
+++ b/stories/components/text.stories.tsx
@@ -22,7 +22,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { ReactElement } from "react";
 import React from "react";
-import SolidFns from "@inrupt/solid-client";
+import {
+  addStringNoLocale,
+  createThing,
+  setThing,
+  createSolidDataset,
+} from "@inrupt/solid-client";
 import { Text } from "../../src/components/text";
 import { DatasetProvider } from "../../src/context/datasetContext";
 import { ThingProvider } from "../../src/context/thingContext";
@@ -107,16 +112,9 @@ export function BasicExample({
 }: IText): ReactElement {
   const exampleNick = "example value";
 
-  const exampleThing = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
-    property,
-    exampleNick,
-  );
+  const exampleThing = addStringNoLocale(createThing(), property, exampleNick);
 
-  const exampleDataset = SolidFns.setThing(
-    SolidFns.createSolidDataset(),
-    exampleThing,
-  );
+  const exampleDataset = setThing(createSolidDataset(), exampleThing);
 
   return (
     <Text
@@ -149,16 +147,13 @@ export function WithLocalData({
   const examplePredicate = `http://xmlns.com/foaf/0.1/nick`;
   const exampleNick = "example value";
 
-  const exampleThing = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const exampleThing = addStringNoLocale(
+    createThing(),
     examplePredicate,
     exampleNick,
   );
 
-  const exampleDataset = SolidFns.setThing(
-    SolidFns.createSolidDataset(),
-    exampleThing,
-  );
+  const exampleDataset = setThing(createSolidDataset(), exampleThing);
 
   return (
     <Text
@@ -221,8 +216,8 @@ WithFetchedData.args = {
 export function ErrorComponent(): ReactElement {
   const exampleName = "Example Name";
   const exampleProperty = "http://xmlns.com/foaf/0.1/name";
-  const exampleThing = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const exampleThing = addStringNoLocale(
+    createThing(),
     exampleProperty,
     exampleName,
   );
diff --git a/stories/components/value.stories.tsx b/stories/components/value.stories.tsx
index 661608fe..c268b0c6 100644
--- a/stories/components/value.stories.tsx
+++ b/stories/components/value.stories.tsx
@@ -22,7 +22,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { ReactElement } from "react";
 import React from "react";
-import SolidFns from "@inrupt/solid-client";
+import {
+  addStringNoLocale,
+  createThing,
+  setThing,
+  createSolidDataset,
+} from "@inrupt/solid-client";
 import type { DataType } from "../../src/helpers";
 import { Value } from "../../src/components/value";
 import { DatasetProvider } from "../../src/context/datasetContext";
@@ -358,16 +363,9 @@ export function WithUnsavedData(
   } = props;
   const exampleNick = "example value";
 
-  const exampleThing = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
-    property,
-    exampleNick,
-  );
+  const exampleThing = addStringNoLocale(createThing(), property, exampleNick);
 
-  const exampleDataset = SolidFns.setThing(
-    SolidFns.createSolidDataset(),
-    exampleThing,
-  );
+  const exampleDataset = setThing(createSolidDataset(), exampleThing);
 
   return (
     <Value
@@ -429,8 +427,8 @@ WithFetchedData.args = {
 export function ErrorComponent(): ReactElement {
   const exampleName = "Example Name";
   const exampleProperty = "http://xmlns.com/foaf/0.1/name";
-  const exampleThing = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
+  const exampleThing = addStringNoLocale(
+    createThing(),
     exampleProperty,
     exampleName,
   );
diff --git a/stories/components/video.stories.tsx b/stories/components/video.stories.tsx
index 800951bf..a8a39c4b 100644
--- a/stories/components/video.stories.tsx
+++ b/stories/components/video.stories.tsx
@@ -21,7 +21,7 @@
 
 import type { ReactElement } from "react";
 import React from "react";
-import SolidFns from "@inrupt/solid-client";
+import { addUrl, createThing } from "@inrupt/solid-client";
 import { Video } from "../../src/components/video";
 
 export default {
@@ -80,11 +80,7 @@ export function EditFalse({
   const exampleUrl =
     "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4";
   const exampleProperty = `http://www.w3.org/2006/vcard/ns#hasPhoto`;
-  const exampleThing = SolidFns.addUrl(
-    SolidFns.createThing(),
-    exampleProperty,
-    exampleUrl,
-  );
+  const exampleThing = addUrl(createThing(), exampleProperty, exampleUrl);
   return (
     <Video
       thing={exampleThing}
@@ -119,11 +115,7 @@ export function EditTrue({
   const exampleUrl =
     "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4";
   const exampleProperty = `http://www.w3.org/2006/vcard/ns#hasPhoto`;
-  const exampleThing = SolidFns.addUrl(
-    SolidFns.createThing(),
-    exampleProperty,
-    exampleUrl,
-  );
+  const exampleThing = addUrl(createThing(), exampleProperty, exampleUrl);
 
   return (
     <Video
@@ -152,11 +144,7 @@ export function ErrorComponent(): ReactElement {
     "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4";
 
   const exampleProperty = `http://www.w3.org/2006/vcard/ns#hasPhoto`;
-  const exampleThing = SolidFns.addUrl(
-    SolidFns.createThing(),
-    exampleProperty,
-    exampleUrl,
-  );
+  const exampleThing = addUrl(createThing(), exampleProperty, exampleUrl);
 
   return (
     <Video
diff --git a/stories/providers/combinedProvider.stories.tsx b/stories/providers/combinedProvider.stories.tsx
index 192c5dca..357f90b1 100644
--- a/stories/providers/combinedProvider.stories.tsx
+++ b/stories/providers/combinedProvider.stories.tsx
@@ -21,7 +21,13 @@
 
 import type { ReactElement } from "react";
 import React, { useContext, useState, useEffect } from "react";
-import SolidFns from "@inrupt/solid-client";
+import {
+  getStringNoLocale,
+  addStringNoLocale,
+  createThing,
+  setThing,
+  createSolidDataset,
+} from "@inrupt/solid-client";
 import ThingContext from "../../src/context/thingContext";
 import CombinedDataProvider from "../../src/context/combinedDataContext";
 import config from "../config";
@@ -79,7 +85,7 @@ function ExampleComponent({
 
   useEffect(() => {
     if (thing) {
-      const fetchedProperty = SolidFns.getStringNoLocale(thing, propertyUrl);
+      const fetchedProperty = getStringNoLocale(thing, propertyUrl);
 
       if (fetchedProperty) {
         setProperty(fetchedProperty);
@@ -106,7 +112,7 @@ function ExampleComponentFetchedData({
 
   useEffect(() => {
     if (thing) {
-      const fetchedProperty = SolidFns.getStringNoLocale(thing, propertyUrl);
+      const fetchedProperty = getStringNoLocale(thing, propertyUrl);
       if (fetchedProperty) {
         setProperty(fetchedProperty);
       }
@@ -124,15 +130,8 @@ export function WithLocalData(): ReactElement {
   const property = "http://xmlns.com/foaf/0.1/name";
   const name = "example value";
 
-  const exampleThing = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
-    property,
-    name,
-  );
-  const dataset = SolidFns.setThing(
-    SolidFns.createSolidDataset(),
-    exampleThing,
-  );
+  const exampleThing = addStringNoLocale(createThing(), property, name);
+  const dataset = setThing(createSolidDataset(), exampleThing);
 
   return (
     <CombinedDataProvider solidDataset={dataset} thing={exampleThing}>
diff --git a/stories/providers/datasetProvider.stories.tsx b/stories/providers/datasetProvider.stories.tsx
index 3ebdc622..7ed1604a 100644
--- a/stories/providers/datasetProvider.stories.tsx
+++ b/stories/providers/datasetProvider.stories.tsx
@@ -21,7 +21,16 @@
 
 import type { ReactElement } from "react";
 import React, { useContext, useState, useEffect } from "react";
-import SolidFns from "@inrupt/solid-client";
+import type { Thing } from "@inrupt/solid-client";
+import {
+  getThing,
+  getStringNoLocale,
+  getThingAll,
+  addStringNoLocale,
+  createThing,
+  setThing,
+  createSolidDataset,
+} from "@inrupt/solid-client";
 import DatasetContext, {
   DatasetProvider,
 } from "../../src/context/datasetContext";
@@ -68,7 +77,7 @@ function ExampleComponentWithDatasetUrl(
 ): ReactElement {
   const { thingUrl, property: propertyUrl } = props;
 
-  const [exampleThing, setExampleThing] = useState<SolidFns.Thing>();
+  const [exampleThing, setExampleThing] = useState<Thing>();
   const [property, setProperty] = useState<string>("fetching in progress");
 
   const datasetContext = useContext(DatasetContext);
@@ -76,17 +85,14 @@ function ExampleComponentWithDatasetUrl(
 
   useEffect(() => {
     if (solidDataset) {
-      const thing = SolidFns.getThing(solidDataset, thingUrl);
+      const thing = getThing(solidDataset, thingUrl);
       setExampleThing(thing || undefined);
     }
   }, [solidDataset, thingUrl]);
 
   useEffect(() => {
     if (exampleThing) {
-      const fetchedProperty = SolidFns.getStringNoLocale(
-        exampleThing,
-        propertyUrl,
-      );
+      const fetchedProperty = getStringNoLocale(exampleThing, propertyUrl);
       if (fetchedProperty) {
         setProperty(fetchedProperty);
       }
@@ -101,7 +107,7 @@ function ExampleComponentWithDatasetUrl(
 }
 
 function ExampleComponentWithDataset(): ReactElement {
-  const [exampleThing, setExampleThing] = useState<SolidFns.Thing>();
+  const [exampleThing, setExampleThing] = useState<Thing>();
   const [property, setProperty] = useState<string>("fetching in progress");
 
   const datasetContext = useContext(DatasetContext);
@@ -109,14 +115,14 @@ function ExampleComponentWithDataset(): ReactElement {
 
   useEffect(() => {
     if (solidDataset) {
-      const things = SolidFns.getThingAll(solidDataset);
+      const things = getThingAll(solidDataset);
       setExampleThing(things[0]);
     }
   }, [solidDataset]);
 
   useEffect(() => {
     if (exampleThing) {
-      const fetchedProperty = SolidFns.getStringNoLocale(
+      const fetchedProperty = getStringNoLocale(
         exampleThing,
         "http://xmlns.com/foaf/0.1/name",
       );
@@ -137,15 +143,8 @@ export function WithLocalDataset(): ReactElement {
   const property = "http://xmlns.com/foaf/0.1/name";
   const name = "example value";
 
-  const exampleThing = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
-    property,
-    name,
-  );
-  const dataset = SolidFns.setThing(
-    SolidFns.createSolidDataset(),
-    exampleThing,
-  );
+  const exampleThing = addStringNoLocale(createThing(), property, name);
+  const dataset = setThing(createSolidDataset(), exampleThing);
 
   return (
     <DatasetProvider solidDataset={dataset}>
diff --git a/stories/providers/thingProvider.stories.tsx b/stories/providers/thingProvider.stories.tsx
index b6f568b8..a9ad3f86 100644
--- a/stories/providers/thingProvider.stories.tsx
+++ b/stories/providers/thingProvider.stories.tsx
@@ -21,7 +21,13 @@
 
 import type { ReactElement } from "react";
 import React, { useContext, useState, useEffect } from "react";
-import SolidFns from "@inrupt/solid-client";
+import type { SolidDataset, WithResourceInfo } from "@inrupt/solid-client";
+import {
+  getStringNoLocale,
+  addStringNoLocale,
+  createThing,
+  getSolidDataset,
+} from "@inrupt/solid-client";
 import { DatasetProvider } from "../../src/context/datasetContext";
 import ThingContext, { ThingProvider } from "../../src/context/thingContext";
 import config from "../config";
@@ -66,10 +72,7 @@ function ExampleComponentWithThingUrl(
 
   useEffect(() => {
     if (thing) {
-      const fetchedProperty = SolidFns.getStringNoLocale(
-        thing,
-        propertyUrl as string,
-      );
+      const fetchedProperty = getStringNoLocale(thing, propertyUrl as string);
 
       if (fetchedProperty) {
         setProperty(fetchedProperty);
@@ -95,7 +98,7 @@ function ExampleComponentWithThing(): ReactElement {
 
   useEffect(() => {
     if (thing) {
-      const fetchedProperty = SolidFns.getStringNoLocale(
+      const fetchedProperty = getStringNoLocale(
         thing,
         "http://xmlns.com/foaf/0.1/name",
       );
@@ -116,11 +119,7 @@ export function WithLocalThing(): ReactElement {
   const property = "http://xmlns.com/foaf/0.1/name";
   const name = "example value";
 
-  const exampleThing = SolidFns.addStringNoLocale(
-    SolidFns.createThing(),
-    property,
-    name,
-  );
+  const exampleThing = addStringNoLocale(createThing(), property, name);
 
   return (
     <ThingProvider thing={exampleThing}>
@@ -138,11 +137,11 @@ interface IWithThingUrl {
 export function WithThingUrl(props: IWithThingUrl): ReactElement {
   const { datasetUrl, thingUrl, property } = props;
   const [litDataset, setSolidDataset] = useState<
-    SolidFns.SolidDataset & SolidFns.WithResourceInfo
+    SolidDataset & WithResourceInfo
   >();
 
   const setDataset = async (url: string) => {
-    await SolidFns.getSolidDataset(url).then((result) => {
+    await getSolidDataset(url).then((result) => {
       setSolidDataset(result);
     });
   };