diff --git a/README.md b/README.md
index 101a700..19bc109 100644
--- a/README.md
+++ b/README.md
@@ -20,13 +20,13 @@ The way each implementation stores data is NOT guaranteed to be compatible, plea
 Requires the `redis` extension.
 Valkey is the name of the Linux Foundation's fork of Redis.
 
-### `Index\Data\MariaDb`
+### `Index\Db\MariaDb`
 
 Requires the `mysqli` extension.
 `mysqlnd` is recommended as the underlying driver, but `libmysql` should work without a hitch.
 This driver also works for MySQL as the dependencies would suggest, but you should consider using MariaDB instead of possible.
 
-### `Index\Data\Sqlite`
+### `Index\Db\Sqlite`
 
 Requires the `sqlite3` extension.
 
diff --git a/VERSION b/VERSION
index 88f81de..da0e292 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2410.42227
+0.2410.42235
diff --git a/composer.json b/composer.json
index c802ab5..30593b4 100644
--- a/composer.json
+++ b/composer.json
@@ -13,8 +13,8 @@
         "phpstan/phpstan": "^1.11"
     },
     "suggest": {
-        "ext-mysqli": "Support for the Index\\Data\\MariaDb namespace (both mysqlnd and libmysql are supported).",
-        "ext-sqlite3": "Support for the Index\\Data\\Sqlite namespace."
+        "ext-mysqli": "Support for the Index\\Db\\MariaDb namespace (both mysqlnd and libmysql are supported).",
+        "ext-sqlite3": "Support for the Index\\Db\\Sqlite namespace."
     },
     "authors": [
         {
diff --git a/src/Config/Db/DbConfig.php b/src/Config/Db/DbConfig.php
index 9f822fb..ddc7664 100644
--- a/src/Config/Db/DbConfig.php
+++ b/src/Config/Db/DbConfig.php
@@ -7,7 +7,7 @@ namespace Index\Config\Db;
 
 use InvalidArgumentException;
 use Index\Config\{Config,GetValueInfoTrait,GetValuesTrait,MutableConfigTrait,ScopedConfig};
-use Index\Data\{DbConnection,DbStatementCache,DbTools};
+use Index\Db\{DbConnection,DbStatementCache,DbTools};
 
 /**
  * Provides a configuration based on a {@see DbConnection} instance.
diff --git a/src/Config/Db/DbConfigValueInfo.php b/src/Config/Db/DbConfigValueInfo.php
index 380bebc..728d8a0 100644
--- a/src/Config/Db/DbConfigValueInfo.php
+++ b/src/Config/Db/DbConfigValueInfo.php
@@ -7,7 +7,7 @@ namespace Index\Config\Db;
 
 use UnexpectedValueException;
 use Index\Config\ConfigValueInfo;
-use Index\Data\DbResult;
+use Index\Db\DbResult;
 
 /**
  * Provides information about a databased configuration value.
diff --git a/src/Data/DbBackend.php b/src/Db/DbBackend.php
similarity index 96%
rename from src/Data/DbBackend.php
rename to src/Db/DbBackend.php
index 7e079f9..fee1621 100644
--- a/src/Data/DbBackend.php
+++ b/src/Db/DbBackend.php
@@ -1,9 +1,9 @@
 <?php
 // DbBackend.php
 // Created: 2021-04-30
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data;
+namespace Index\Db;
 
 /**
  * Information about a database layer. Should not have any external dependencies.
diff --git a/src/Data/DbConnection.php b/src/Db/DbConnection.php
similarity index 97%
rename from src/Data/DbConnection.php
rename to src/Db/DbConnection.php
index dc8591d..4690aba 100644
--- a/src/Data/DbConnection.php
+++ b/src/Db/DbConnection.php
@@ -1,9 +1,9 @@
 <?php
 // DbConnection.php
 // Created: 2021-04-30
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data;
+namespace Index\Db;
 
 use Index\Closeable;
 
diff --git a/src/Data/DbConnectionInfo.php b/src/Db/DbConnectionInfo.php
similarity index 84%
rename from src/Data/DbConnectionInfo.php
rename to src/Db/DbConnectionInfo.php
index 51a75d5..8e103cb 100644
--- a/src/Data/DbConnectionInfo.php
+++ b/src/Db/DbConnectionInfo.php
@@ -1,9 +1,9 @@
 <?php
 // DbConnectionInfo.php
 // Created: 2021-04-30
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data;
+namespace Index\Db;
 
 /**
  * Base type for database connection info.
diff --git a/src/Data/DbResult.php b/src/Db/DbResult.php
similarity index 98%
rename from src/Data/DbResult.php
rename to src/Db/DbResult.php
index 44be9de..bc32807 100644
--- a/src/Data/DbResult.php
+++ b/src/Db/DbResult.php
@@ -1,9 +1,9 @@
 <?php
 // DbResult.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data;
+namespace Index\Db;
 
 use Index\Closeable;
 
diff --git a/src/Data/DbResultIterator.php b/src/Db/DbResultIterator.php
similarity index 96%
rename from src/Data/DbResultIterator.php
rename to src/Db/DbResultIterator.php
index 2df7bf8..c2dea88 100644
--- a/src/Data/DbResultIterator.php
+++ b/src/Db/DbResultIterator.php
@@ -1,9 +1,9 @@
 <?php
 // DbResultIterator.php
 // Created: 2024-02-06
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data;
+namespace Index\Db;
 
 use InvalidArgumentException;
 use Iterator;
diff --git a/src/Data/DbResultTrait.php b/src/Db/DbResultTrait.php
similarity index 96%
rename from src/Data/DbResultTrait.php
rename to src/Db/DbResultTrait.php
index 2b78a74..e7d8bd6 100644
--- a/src/Data/DbResultTrait.php
+++ b/src/Db/DbResultTrait.php
@@ -1,9 +1,9 @@
 <?php
 // DbResultTrait.php
 // Created: 2023-11-09
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data;
+namespace Index\Db;
 
 /**
  * Implements common DbResult methods.
diff --git a/src/Data/DbStatement.php b/src/Db/DbStatement.php
similarity index 97%
rename from src/Data/DbStatement.php
rename to src/Db/DbStatement.php
index 1d798b5..e75822a 100644
--- a/src/Data/DbStatement.php
+++ b/src/Db/DbStatement.php
@@ -1,9 +1,9 @@
 <?php
 // DbStatement.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data;
+namespace Index\Db;
 
 use InvalidArgumentException;
 use RuntimeException;
diff --git a/src/Data/DbStatementCache.php b/src/Db/DbStatementCache.php
similarity index 97%
rename from src/Data/DbStatementCache.php
rename to src/Db/DbStatementCache.php
index 4c5899f..1e312ca 100644
--- a/src/Data/DbStatementCache.php
+++ b/src/Db/DbStatementCache.php
@@ -1,9 +1,9 @@
 <?php
 // DbStatementCache.php
 // Created: 2023-07-21
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data;
+namespace Index\Db;
 
 /**
  * Container to avoid having many prepared instances of the same query.
diff --git a/src/Data/DbTools.php b/src/Db/DbTools.php
similarity index 94%
rename from src/Data/DbTools.php
rename to src/Db/DbTools.php
index 572dda6..bfa66bd 100644
--- a/src/Data/DbTools.php
+++ b/src/Db/DbTools.php
@@ -1,9 +1,9 @@
 <?php
 // DbTools.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data;
+namespace Index\Db;
 
 use Countable;
 use InvalidArgumentException;
@@ -18,9 +18,9 @@ use RuntimeException;
  *  the rest of the URL is described in the documentation of the parseDsn implementation of the respective backend.
  *
  * The scheme can be a PHP classpath to an implementation of DbBackend, or any of these aliases:
- *  - `null`: maps to `NullDb\NullDbBackend` or `Index-Data-NullDb-NullDbBackend`, provides a fallback blackhole database backend.
- *  - `mariadb`, `mysql`: maps to `MariaDb\MariaDbBackend` or `Index-Data-MariaDb-MariaDbBackend`, provides a backend based on the mysqli extension.
- *  - `sqlite`, `sqlite3`: maps to `Sqlite\SqliteBackend` or `Index-Data-Sqlite-SqliteBackend`, provides a backend based on the sqlite3 extension.
+ *  - `null`: maps to `NullDb\NullDbBackend` or `Index-Db-NullDb-NullDbBackend`, provides a fallback blackhole database backend.
+ *  - `mariadb`, `mysql`: maps to `MariaDb\MariaDbBackend` or `Index-Db-MariaDb-MariaDbBackend`, provides a backend based on the mysqli extension.
+ *  - `sqlite`, `sqlite3`: maps to `Sqlite\SqliteBackend` or `Index-Db-Sqlite-SqliteBackend`, provides a backend based on the sqlite3 extension.
  *
  * Short names are currently hardcoded and cannot be expanded.
  */
diff --git a/src/Data/DbTransactions.php b/src/Db/DbTransactions.php
similarity index 97%
rename from src/Data/DbTransactions.php
rename to src/Db/DbTransactions.php
index be3ea46..fcdafee 100644
--- a/src/Data/DbTransactions.php
+++ b/src/Db/DbTransactions.php
@@ -1,9 +1,9 @@
 <?php
 // DbTransactions.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data;
+namespace Index\Db;
 
 /**
  * Indicates supports for transactions in a database connection.
diff --git a/src/Data/DbType.php b/src/Db/DbType.php
similarity index 94%
rename from src/Data/DbType.php
rename to src/Db/DbType.php
index ef02e28..f1e4b9c 100644
--- a/src/Data/DbType.php
+++ b/src/Db/DbType.php
@@ -1,9 +1,9 @@
 <?php
 // DbType.php
 // Created: 2021-05-02
-// Updated: 2021-05-04
+// Updated: 2024-10-04
 
-namespace Index\Data;
+namespace Index\Db;
 
 /**
  * Map of common database types.
diff --git a/src/Data/MariaDb/MariaDbBackend.php b/src/Db/MariaDb/MariaDbBackend.php
similarity index 98%
rename from src/Data/MariaDb/MariaDbBackend.php
rename to src/Db/MariaDb/MariaDbBackend.php
index 6ece5b1..2549a0b 100644
--- a/src/Data/MariaDb/MariaDbBackend.php
+++ b/src/Db/MariaDb/MariaDbBackend.php
@@ -1,12 +1,12 @@
 <?php
 // MariaDbBackend.php
 // Created: 2021-04-30
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\MariaDb;
+namespace Index\Db\MariaDb;
 
 use InvalidArgumentException;
-use Index\Data\{DbBackend,DbConnection,DbConnectionInfo};
+use Index\Db\{DbBackend,DbConnection,DbConnectionInfo};
 use Index\Net\{EndPoint,UnixEndPoint};
 
 /**
diff --git a/src/Data/MariaDb/MariaDbCharacterSetInfo.php b/src/Db/MariaDb/MariaDbCharacterSetInfo.php
similarity index 98%
rename from src/Data/MariaDb/MariaDbCharacterSetInfo.php
rename to src/Db/MariaDb/MariaDbCharacterSetInfo.php
index c1fc5a1..b5c77ea 100644
--- a/src/Data/MariaDb/MariaDbCharacterSetInfo.php
+++ b/src/Db/MariaDb/MariaDbCharacterSetInfo.php
@@ -1,9 +1,9 @@
 <?php
 // MariaDbCharacterSetInfo.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\MariaDb;
+namespace Index\Db\MariaDb;
 
 /**
  * Contains information about the character set.
diff --git a/src/Data/MariaDb/MariaDbConnection.php b/src/Db/MariaDb/MariaDbConnection.php
similarity index 99%
rename from src/Data/MariaDb/MariaDbConnection.php
rename to src/Db/MariaDb/MariaDbConnection.php
index d98f6f0..04544a7 100644
--- a/src/Data/MariaDb/MariaDbConnection.php
+++ b/src/Db/MariaDb/MariaDbConnection.php
@@ -1,16 +1,16 @@
 <?php
 // MariaDbConnection.php
 // Created: 2021-04-30
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\MariaDb;
+namespace Index\Db\MariaDb;
 
 use mysqli;
 use mysqli_sql_exception;
 use stdClass;
 use InvalidArgumentException;
 use RuntimeException;
-use Index\Data\{DbConnection,DbTransactions};
+use Index\Db\{DbConnection,DbTransactions};
 
 /**
  * Represents a connection with a MariaDB or MySQL database server.
diff --git a/src/Data/MariaDb/MariaDbConnectionInfo.php b/src/Db/MariaDb/MariaDbConnectionInfo.php
similarity index 99%
rename from src/Data/MariaDb/MariaDbConnectionInfo.php
rename to src/Db/MariaDb/MariaDbConnectionInfo.php
index 7606eff..945cf8b 100644
--- a/src/Data/MariaDb/MariaDbConnectionInfo.php
+++ b/src/Db/MariaDb/MariaDbConnectionInfo.php
@@ -1,12 +1,12 @@
 <?php
 // MariaDbConnectionInfo.php
 // Created: 2021-04-30
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\MariaDb;
+namespace Index\Db\MariaDb;
 
 use InvalidArgumentException;
-use Index\Data\DbConnectionInfo;
+use Index\Db\DbConnectionInfo;
 use Index\Net\{EndPoint,DnsEndPoint,IpEndPoint,UnixEndPoint};
 
 /**
diff --git a/src/Data/MariaDb/MariaDbParameter.php b/src/Db/MariaDb/MariaDbParameter.php
similarity index 94%
rename from src/Data/MariaDb/MariaDbParameter.php
rename to src/Db/MariaDb/MariaDbParameter.php
index 1ac950e..e0f0d26 100644
--- a/src/Data/MariaDb/MariaDbParameter.php
+++ b/src/Db/MariaDb/MariaDbParameter.php
@@ -1,11 +1,11 @@
 <?php
 // MariaDbParameter.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\MariaDb;
+namespace Index\Db\MariaDb;
 
-use Index\Data\{DbTools,DbType};
+use Index\Db\{DbTools,DbType};
 
 /**
  * Represents a bound parameter.
diff --git a/src/Data/MariaDb/MariaDbResult.php b/src/Db/MariaDb/MariaDbResult.php
similarity index 94%
rename from src/Data/MariaDb/MariaDbResult.php
rename to src/Db/MariaDb/MariaDbResult.php
index 89099e8..0fc8a96 100644
--- a/src/Data/MariaDb/MariaDbResult.php
+++ b/src/Db/MariaDb/MariaDbResult.php
@@ -1,14 +1,14 @@
 <?php
 // MariaDbResult.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\MariaDb;
+namespace Index\Db\MariaDb;
 
 use mysqli_result;
 use mysqli_stmt;
 use InvalidArgumentException;
-use Index\Data\{DbResult,DbResultTrait};
+use Index\Db\{DbResult,DbResultTrait};
 
 /**
  * Represents a MariaDB/MySQL database result.
diff --git a/src/Data/MariaDb/MariaDbResultLib.php b/src/Db/MariaDb/MariaDbResultLib.php
similarity index 96%
rename from src/Data/MariaDb/MariaDbResultLib.php
rename to src/Db/MariaDb/MariaDbResultLib.php
index 457194b..3ac7669 100644
--- a/src/Data/MariaDb/MariaDbResultLib.php
+++ b/src/Db/MariaDb/MariaDbResultLib.php
@@ -1,9 +1,9 @@
 <?php
 // MariaDbResultLib.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\MariaDb;
+namespace Index\Db\MariaDb;
 
 use mysqli_stmt;
 use RuntimeException;
diff --git a/src/Data/MariaDb/MariaDbResultNative.php b/src/Db/MariaDb/MariaDbResultNative.php
similarity index 95%
rename from src/Data/MariaDb/MariaDbResultNative.php
rename to src/Db/MariaDb/MariaDbResultNative.php
index f70b89b..0e7242b 100644
--- a/src/Data/MariaDb/MariaDbResultNative.php
+++ b/src/Db/MariaDb/MariaDbResultNative.php
@@ -1,9 +1,9 @@
 <?php
 // MariaDbResultNative.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\MariaDb;
+namespace Index\Db\MariaDb;
 
 use mysqli_result;
 use mysqli_stmt;
diff --git a/src/Data/MariaDb/MariaDbStatement.php b/src/Db/MariaDb/MariaDbStatement.php
similarity index 98%
rename from src/Data/MariaDb/MariaDbStatement.php
rename to src/Db/MariaDb/MariaDbStatement.php
index 1bb0b6b..c4eeea5 100644
--- a/src/Data/MariaDb/MariaDbStatement.php
+++ b/src/Db/MariaDb/MariaDbStatement.php
@@ -1,15 +1,15 @@
 <?php
 // MariaDbStatement.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\MariaDb;
+namespace Index\Db\MariaDb;
 
 use mysqli_stmt;
 use InvalidArgumentException;
 use RuntimeException;
 use Stringable;
-use Index\Data\{DbType,DbStatement};
+use Index\Db\{DbType,DbStatement};
 
 /**
  * Represents a MariaDB/MySQL prepared statement.
diff --git a/src/Data/MariaDb/MariaDbWarning.php b/src/Db/MariaDb/MariaDbWarning.php
similarity index 97%
rename from src/Data/MariaDb/MariaDbWarning.php
rename to src/Db/MariaDb/MariaDbWarning.php
index 56e5578..c1b6c94 100644
--- a/src/Data/MariaDb/MariaDbWarning.php
+++ b/src/Db/MariaDb/MariaDbWarning.php
@@ -1,9 +1,9 @@
 <?php
 // MariaDbWarning.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\MariaDb;
+namespace Index\Db\MariaDb;
 
 use mysqli_warning;
 use Stringable;
diff --git a/src/Data/Migration/DbMigration.php b/src/Db/Migration/DbMigration.php
similarity index 81%
rename from src/Data/Migration/DbMigration.php
rename to src/Db/Migration/DbMigration.php
index fb1f690..087f631 100644
--- a/src/Data/Migration/DbMigration.php
+++ b/src/Db/Migration/DbMigration.php
@@ -1,11 +1,11 @@
 <?php
 // DbMigration.php
 // Created: 2023-01-07
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\Migration;
+namespace Index\Db\Migration;
 
-use Index\Data\DbConnection;
+use Index\Db\DbConnection;
 
 /**
  * Interface for migration classes to inherit.
diff --git a/src/Data/Migration/DbMigrationInfo.php b/src/Db/Migration/DbMigrationInfo.php
similarity index 89%
rename from src/Data/Migration/DbMigrationInfo.php
rename to src/Db/Migration/DbMigrationInfo.php
index 7f6aca0..7a4d93e 100644
--- a/src/Data/Migration/DbMigrationInfo.php
+++ b/src/Db/Migration/DbMigrationInfo.php
@@ -1,11 +1,11 @@
 <?php
 // DbMigrationInfo.php
 // Created: 2023-01-07
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\Migration;
+namespace Index\Db\Migration;
 
-use Index\Data\DbConnection;
+use Index\Db\DbConnection;
 
 /**
  * Information on a migration repository item.
diff --git a/src/Data/Migration/DbMigrationManager.php b/src/Db/Migration/DbMigrationManager.php
similarity index 97%
rename from src/Data/Migration/DbMigrationManager.php
rename to src/Db/Migration/DbMigrationManager.php
index 9e8149f..b67a6c0 100644
--- a/src/Data/Migration/DbMigrationManager.php
+++ b/src/Db/Migration/DbMigrationManager.php
@@ -1,9 +1,9 @@
 <?php
 // DbMigrationManager.php
 // Created: 2023-01-07
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\Migration;
+namespace Index\Db\Migration;
 
 use stdClass;
 use DateTimeImmutable;
@@ -11,8 +11,8 @@ use DateTimeInterface;
 use InvalidArgumentException;
 use RuntimeException;
 use Index\XDateTime;
-use Index\Data\{DbConnection,DbStatement,DbType};
-use Index\Data\Sqlite\SqliteConnection;
+use Index\Db\{DbConnection,DbStatement,DbType};
+use Index\Db\Sqlite\SqliteConnection;
 
 /**
  * Provides a common interface for database migrations.
@@ -34,8 +34,8 @@ class DbMigrationManager {
 
     private const TEMPLATE = <<<EOF
 <?php
-use Index\Data\DbConnection;
-use Index\Data\Migration\DbMigration;
+use Index\Db\DbConnection;
+use Index\Db\Migration\DbMigration;
 
 final class %s implements DbMigration {
     public function migrate(DbConnection \$conn): void {
diff --git a/src/Data/Migration/DbMigrationRepo.php b/src/Db/Migration/DbMigrationRepo.php
similarity index 85%
rename from src/Data/Migration/DbMigrationRepo.php
rename to src/Db/Migration/DbMigrationRepo.php
index c03a77a..755983a 100644
--- a/src/Data/Migration/DbMigrationRepo.php
+++ b/src/Db/Migration/DbMigrationRepo.php
@@ -1,9 +1,9 @@
 <?php
 // DbMigrationRepo.php
 // Created: 2023-01-07
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\Migration;
+namespace Index\Db\Migration;
 
 /**
  * Represents a repository of migrations.
diff --git a/src/Data/Migration/FsDbMigrationInfo.php b/src/Db/Migration/FsDbMigrationInfo.php
similarity index 93%
rename from src/Data/Migration/FsDbMigrationInfo.php
rename to src/Db/Migration/FsDbMigrationInfo.php
index c9a1ec2..96e94ff 100644
--- a/src/Data/Migration/FsDbMigrationInfo.php
+++ b/src/Db/Migration/FsDbMigrationInfo.php
@@ -1,11 +1,11 @@
 <?php
 // FsDbMigrationInfo.php
 // Created: 2023-01-07
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\Migration;
+namespace Index\Db\Migration;
 
-use Index\Data\DbConnection;
+use Index\Db\DbConnection;
 
 class FsDbMigrationInfo implements DbMigrationInfo {
     private string $name;
diff --git a/src/Data/Migration/FsDbMigrationRepo.php b/src/Db/Migration/FsDbMigrationRepo.php
similarity index 95%
rename from src/Data/Migration/FsDbMigrationRepo.php
rename to src/Db/Migration/FsDbMigrationRepo.php
index f9595a7..75358aa 100644
--- a/src/Data/Migration/FsDbMigrationRepo.php
+++ b/src/Db/Migration/FsDbMigrationRepo.php
@@ -1,9 +1,9 @@
 <?php
 // FsDbMigrationRepo.php
 // Created: 2023-01-07
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\Migration;
+namespace Index\Db\Migration;
 
 use RuntimeException;
 
diff --git a/src/Data/NullDb/NullDbBackend.php b/src/Db/NullDb/NullDbBackend.php
similarity index 89%
rename from src/Data/NullDb/NullDbBackend.php
rename to src/Db/NullDb/NullDbBackend.php
index 03fdee2..d2b5bf5 100644
--- a/src/Data/NullDb/NullDbBackend.php
+++ b/src/Db/NullDb/NullDbBackend.php
@@ -1,11 +1,11 @@
 <?php
 // NullDbBackend.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\NullDb;
+namespace Index\Db\NullDb;
 
-use Index\Data\{DbBackend,DbConnection,DbConnectionInfo};
+use Index\Db\{DbBackend,DbConnection,DbConnectionInfo};
 
 /**
  * Information about the dummy database layer.
diff --git a/src/Data/NullDb/NullDbConnection.php b/src/Db/NullDb/NullDbConnection.php
similarity index 85%
rename from src/Data/NullDb/NullDbConnection.php
rename to src/Db/NullDb/NullDbConnection.php
index facb4f6..3661d5d 100644
--- a/src/Data/NullDb/NullDbConnection.php
+++ b/src/Db/NullDb/NullDbConnection.php
@@ -1,11 +1,11 @@
 <?php
 // NullDbConnection.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\NullDb;
+namespace Index\Db\NullDb;
 
-use Index\Data\{DbConnection,DbStatement,DbResult};
+use Index\Db\{DbConnection,DbStatement,DbResult};
 
 /**
  * Represents a dummy database connection.
diff --git a/src/Data/NullDb/NullDbConnectionInfo.php b/src/Db/NullDb/NullDbConnectionInfo.php
similarity index 65%
rename from src/Data/NullDb/NullDbConnectionInfo.php
rename to src/Db/NullDb/NullDbConnectionInfo.php
index fdf9a38..f63f183 100644
--- a/src/Data/NullDb/NullDbConnectionInfo.php
+++ b/src/Db/NullDb/NullDbConnectionInfo.php
@@ -1,11 +1,11 @@
 <?php
 // NullDbConnectionInfo.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\NullDb;
+namespace Index\Db\NullDb;
 
-use Index\Data\DbConnectionInfo;
+use Index\Db\DbConnectionInfo;
 
 /**
  * Represents dummy connection info.
diff --git a/src/Data/NullDb/NullDbResult.php b/src/Db/NullDb/NullDbResult.php
similarity index 92%
rename from src/Data/NullDb/NullDbResult.php
rename to src/Db/NullDb/NullDbResult.php
index 5dbcd54..fd3dab2 100644
--- a/src/Data/NullDb/NullDbResult.php
+++ b/src/Db/NullDb/NullDbResult.php
@@ -1,11 +1,11 @@
 <?php
 // NullDbResult.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\NullDb;
+namespace Index\Db\NullDb;
 
-use Index\Data\{DbResult,DbResultIterator};
+use Index\Db\{DbResult,DbResultIterator};
 
 /**
  * Represents a dummy database result.
diff --git a/src/Data/NullDb/NullDbStatement.php b/src/Db/NullDb/NullDbStatement.php
similarity index 87%
rename from src/Data/NullDb/NullDbStatement.php
rename to src/Db/NullDb/NullDbStatement.php
index 5e1cf18..646d50c 100644
--- a/src/Data/NullDb/NullDbStatement.php
+++ b/src/Db/NullDb/NullDbStatement.php
@@ -1,11 +1,11 @@
 <?php
 // NullDbStatement.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\NullDb;
+namespace Index\Db\NullDb;
 
-use Index\Data\{DbType,DbResult,DbStatement};
+use Index\Db\{DbType,DbResult,DbStatement};
 
 /**
  * Represents a dummy database statement.
diff --git a/src/Data/Sqlite/SqliteBackend.php b/src/Db/Sqlite/SqliteBackend.php
similarity index 95%
rename from src/Data/Sqlite/SqliteBackend.php
rename to src/Db/Sqlite/SqliteBackend.php
index e1a6487..c3d4495 100644
--- a/src/Data/Sqlite/SqliteBackend.php
+++ b/src/Db/Sqlite/SqliteBackend.php
@@ -1,13 +1,13 @@
 <?php
 // SqliteBackend.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\Sqlite;
+namespace Index\Db\Sqlite;
 
 use SQLite3;
 use InvalidArgumentException;
-use Index\Data\{DbBackend,DbConnection,DbConnectionInfo};
+use Index\Db\{DbBackend,DbConnection,DbConnectionInfo};
 
 /**
  * Information about the SQLite 3 database layer.
diff --git a/src/Data/Sqlite/SqliteConnection.php b/src/Db/Sqlite/SqliteConnection.php
similarity index 99%
rename from src/Data/Sqlite/SqliteConnection.php
rename to src/Db/Sqlite/SqliteConnection.php
index 2214d83..cecbcf0 100644
--- a/src/Data/Sqlite/SqliteConnection.php
+++ b/src/Db/Sqlite/SqliteConnection.php
@@ -1,13 +1,13 @@
 <?php
 // SqliteConnection.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\Sqlite;
+namespace Index\Db\Sqlite;
 
 use RuntimeException;
 use SQLite3;
-use Index\Data\{DbConnection,DbTransactions,DbStatement,DbResult};
+use Index\Db\{DbConnection,DbTransactions,DbStatement,DbResult};
 
 /**
  * Represents a client for an SQLite database.
diff --git a/src/Data/Sqlite/SqliteConnectionInfo.php b/src/Db/Sqlite/SqliteConnectionInfo.php
similarity index 97%
rename from src/Data/Sqlite/SqliteConnectionInfo.php
rename to src/Db/Sqlite/SqliteConnectionInfo.php
index 7fee061..8fbb587 100644
--- a/src/Data/Sqlite/SqliteConnectionInfo.php
+++ b/src/Db/Sqlite/SqliteConnectionInfo.php
@@ -1,11 +1,11 @@
 <?php
 // SqliteConnectionInfo.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\Sqlite;
+namespace Index\Db\Sqlite;
 
-use Index\Data\DbConnectionInfo;
+use Index\Db\DbConnectionInfo;
 
 /**
  * Represents information about a SQLite Client.
diff --git a/src/Data/Sqlite/SqliteResult.php b/src/Db/Sqlite/SqliteResult.php
similarity index 93%
rename from src/Data/Sqlite/SqliteResult.php
rename to src/Db/Sqlite/SqliteResult.php
index c51cdb8..faa9ebd 100644
--- a/src/Data/Sqlite/SqliteResult.php
+++ b/src/Db/Sqlite/SqliteResult.php
@@ -1,13 +1,13 @@
 <?php
 // SqliteResult.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\Sqlite;
+namespace Index\Db\Sqlite;
 
 use SQLite3Result;
 use InvalidArgumentException;
-use Index\Data\{DbResult,DbResultTrait};
+use Index\Db\{DbResult,DbResultTrait};
 
 /**
  * Represents an SQLite result set.
diff --git a/src/Data/Sqlite/SqliteStatement.php b/src/Db/Sqlite/SqliteStatement.php
similarity index 97%
rename from src/Data/Sqlite/SqliteStatement.php
rename to src/Db/Sqlite/SqliteStatement.php
index 0eb94c6..f69d4cf 100644
--- a/src/Data/Sqlite/SqliteStatement.php
+++ b/src/Db/Sqlite/SqliteStatement.php
@@ -1,15 +1,15 @@
 <?php
 // SqliteStatement.php
 // Created: 2021-05-02
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
-namespace Index\Data\Sqlite;
+namespace Index\Db\Sqlite;
 
 use SQLite3Result;
 use SQLite3Stmt;
 use InvalidArgumentException;
 use RuntimeException;
-use Index\Data\{DbTools,DbType,DbStatement,DbResult};
+use Index\Db\{DbTools,DbType,DbStatement,DbResult};
 
 /**
  * Represents a prepared SQLite SQL statement.
diff --git a/tests/DbConfigTest.php b/tests/DbConfigTest.php
index 3545395..5dc8778 100644
--- a/tests/DbConfigTest.php
+++ b/tests/DbConfigTest.php
@@ -9,7 +9,7 @@ use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
 use Index\Config\{GetValueInfoTrait,GetValuesTrait,MutableConfigTrait};
 use Index\Config\Db\{DbConfig,DbConfigValueInfo};
-use Index\Data\{DbConnection,DbTools};
+use Index\Db\{DbConnection,DbTools};
 
 #[CoversClass(DbConfig::class)]
 #[CoversClass(DbConfigValueInfo::class)]
diff --git a/tests/DbToolsTest.php b/tests/DbToolsTest.php
index 00e0165..a315cab 100644
--- a/tests/DbToolsTest.php
+++ b/tests/DbToolsTest.php
@@ -1,16 +1,16 @@
 <?php
 // DbToolsTest.php
 // Created: 2021-04-28
-// Updated: 2024-10-02
+// Updated: 2024-10-04
 
 declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\{CoversClass,UsesClass};
-use Index\Data\{DbTools,DbType};
-use Index\Data\MariaDb\MariaDbBackend;
-use Index\Data\NullDb\NullDbConnection;
-use Index\Data\Sqlite\SqliteBackend;
+use Index\Db\{DbTools,DbType};
+use Index\Db\MariaDb\MariaDbBackend;
+use Index\Db\NullDb\NullDbConnection;
+use Index\Db\Sqlite\SqliteBackend;
 
 #[CoversClass(DbTools::class)]
 #[CoversClass(DbType::class)]
@@ -38,7 +38,7 @@ final class DbToolsTest extends TestCase {
         $nullDbConn1 = DbTools::create('null:');
         $this->assertInstanceOf(NullDbConnection::class, $nullDbConn1);
 
-        $nullDbConn2 = DbTools::create('Index-Data-NullDb-NullDbBackend:');
+        $nullDbConn2 = DbTools::create('Index-Db-NullDb-NullDbBackend:');
         $this->assertInstanceOf(NullDbConnection::class, $nullDbConn2);
 
         $maria = new MariaDbBackend;