diff --git a/src/Model/BoundaryCondition/BoundaryCondition.py b/src/Model/BoundaryCondition/BoundaryCondition.py
index d6abb6c9ea8a847ba3c236d517abe5a2f3c4a444..d90c64780d1651ac48ba21076dbdfc40ac1d786f 100644
--- a/src/Model/BoundaryCondition/BoundaryCondition.py
+++ b/src/Model/BoundaryCondition/BoundaryCondition.py
@@ -20,7 +20,7 @@ import logging
 
 from tools import trace, timer, old_pamhyr_date_to_timestamp
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
diff --git a/src/Model/BoundaryCondition/BoundaryConditionList.py b/src/Model/BoundaryCondition/BoundaryConditionList.py
index d4ffc6bf60999f8e4187418f822c861249eff69c..eb612d9fa64b4e799883f11d8d7d3a5eca734d6b 100644
--- a/src/Model/BoundaryCondition/BoundaryConditionList.py
+++ b/src/Model/BoundaryCondition/BoundaryConditionList.py
@@ -19,7 +19,6 @@
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
 from Model.Tools.PamhyrList import PamhyrModelListWithTab
 from Model.Except import NotImplementedMethodeError
 
diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py
index 18167a86a3e30d11d8b8d929c3869ad11dabacec..2ebd2b4e7b333b93c9bd3a0a60d784f951c346c7 100644
--- a/src/Model/Friction/Friction.py
+++ b/src/Model/Friction/Friction.py
@@ -18,7 +18,7 @@
 
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 class Friction(SQLSubModel):
     def __init__(self, name:str = "", status = None):
diff --git a/src/Model/Friction/FrictionList.py b/src/Model/Friction/FrictionList.py
index 0db5e86ff1a1422c4346f965f7c7c98b67d0eef3..215f96ddcd2da2b67e1fd55d0cc02af3d3baa06b 100644
--- a/src/Model/Friction/FrictionList.py
+++ b/src/Model/Friction/FrictionList.py
@@ -21,7 +21,7 @@ import logging
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Tools.PamhyrList import PamhyrModelList
 
 from Model.Friction.Friction import Friction
diff --git a/src/Model/Geometry/PointXYZ.py b/src/Model/Geometry/PointXYZ.py
index 19695c7753c63aa93a81e43d508b64c85208dd7f..a8f19c8b3d3c0d130b73c04b3b55d45466a128be 100644
--- a/src/Model/Geometry/PointXYZ.py
+++ b/src/Model/Geometry/PointXYZ.py
@@ -19,7 +19,7 @@
 from math import dist
 import numpy as np
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Geometry.Point import Point
 
 class PointXYZ(Point, SQLSubModel):
diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py
index e818eabce44a8d5de19c3fc07fad52245f2ffd57..0652d1f3221fa6b0798fe66318363eef4d6e6889 100644
--- a/src/Model/Geometry/ProfileXYZ.py
+++ b/src/Model/Geometry/ProfileXYZ.py
@@ -21,7 +21,7 @@ from typing import List
 
 from tools import timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import ClipboardFormatError
 from Model.Geometry.Profile import Profile
 from Model.Geometry.PointXYZ import PointXYZ
diff --git a/src/Model/Geometry/Reach.py b/src/Model/Geometry/Reach.py
index 0ddf06d8a21510e9f0d89df58889e0bd86430e85..0c6414786ad8ba7efb6cc2bcf9e873887a717970 100644
--- a/src/Model/Geometry/Reach.py
+++ b/src/Model/Geometry/Reach.py
@@ -27,7 +27,7 @@ from functools import reduce
 
 from tools import flatten, timer, trace
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 from Model.Geometry.Profile import Profile
 from Model.Geometry.ProfileXYZ import ProfileXYZ
diff --git a/src/Model/InitialConditions/InitialConditions.py b/src/Model/InitialConditions/InitialConditions.py
index 3bf747b089a6e0d0c9e3dd7d675c57dd80697361..2c50d10c5adeb271325931d2504a5377aee49af0 100644
--- a/src/Model/InitialConditions/InitialConditions.py
+++ b/src/Model/InitialConditions/InitialConditions.py
@@ -20,7 +20,7 @@ from copy import copy, deepcopy
 from tools import trace, timer
 from functools import reduce
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 class Data(SQLSubModel):
     def __init__(self, name:str = "",
diff --git a/src/Model/InitialConditions/InitialConditionsDict.py b/src/Model/InitialConditions/InitialConditionsDict.py
index c3b7d7c6d664cb9d79e74f130d187b9906abcf0a..40fdca495412e1713fabb83760e02b192c502ff0 100644
--- a/src/Model/InitialConditions/InitialConditionsDict.py
+++ b/src/Model/InitialConditions/InitialConditionsDict.py
@@ -19,7 +19,6 @@
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
 from Model.Tools.PamhyrDict import PamhyrModelDict
 from Model.InitialConditions.InitialConditions import InitialConditions
 
diff --git a/src/Model/LateralContribution/LateralContribution.py b/src/Model/LateralContribution/LateralContribution.py
index 38cbada442d04f2e522996d93727ce5d6da82403..727cf21bfdd8a619b5113aa7de89e8c05dc0816e 100644
--- a/src/Model/LateralContribution/LateralContribution.py
+++ b/src/Model/LateralContribution/LateralContribution.py
@@ -20,7 +20,7 @@ import logging
 
 from tools import trace, timer, old_pamhyr_date_to_timestamp
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
diff --git a/src/Model/LateralContribution/LateralContributionList.py b/src/Model/LateralContribution/LateralContributionList.py
index 6622a94f961dcdc2302e3f55f1a7ff8b494d6380..8d0ba37dbd07ca60b037da4d2bbf2aa3cb2a59ff 100644
--- a/src/Model/LateralContribution/LateralContributionList.py
+++ b/src/Model/LateralContribution/LateralContributionList.py
@@ -19,7 +19,6 @@
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
 from Model.Tools.PamhyrList import PamhyrModelListWithTab
 from Model.Except import NotImplementedMethodeError
 
diff --git a/src/Model/River.py b/src/Model/River.py
index 77daf43a0ce310d0e937e6743f2b0b119b15b836..d5dccb9ec7e965cf25e7ecedc3aef1980a22ed0b 100644
--- a/src/Model/River.py
+++ b/src/Model/River.py
@@ -18,7 +18,7 @@
 
 from tools import flatten
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 from Model.Network.Node import Node
 from Model.Network.Edge import Edge
diff --git a/src/Model/SedimentLayer/SedimentLayer.py b/src/Model/SedimentLayer/SedimentLayer.py
index 638212c82a8cb267a856d9d1795f5f6fc0da5121..1438dfa7474bac469109553e57830d8c1821b957 100644
--- a/src/Model/SedimentLayer/SedimentLayer.py
+++ b/src/Model/SedimentLayer/SedimentLayer.py
@@ -2,7 +2,7 @@
 
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
 
 class Layer(SQLSubModel):
diff --git a/src/Model/SedimentLayer/SedimentLayerList.py b/src/Model/SedimentLayer/SedimentLayerList.py
index e9025e01793303662497f9c36e65044e4fb30ecd..53a1a8fdf47618b02a4ae5bfda2021063caad910 100644
--- a/src/Model/SedimentLayer/SedimentLayerList.py
+++ b/src/Model/SedimentLayer/SedimentLayerList.py
@@ -2,7 +2,6 @@
 
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.SedimentLayer.SedimentLayer import SedimentLayer
diff --git a/src/Model/SolverParameters/SolverParametersList.py b/src/Model/SolverParameters/SolverParametersList.py
index bff87d69030fe949afe3916478c07b2f3488375d..ce7ade982ebb48d5e5d091ec989a377ee5f7ef81 100644
--- a/src/Model/SolverParameters/SolverParametersList.py
+++ b/src/Model/SolverParameters/SolverParametersList.py
@@ -21,7 +21,6 @@ from tools import trace, timer
 from Solver.Solvers import solver_type_list
 
 from Model.Tools.PamhyrList import PamhyrModelList
-from Model.DB import SQLSubModel
 
 class Parameter():
     def __init__(self,
@@ -105,7 +104,7 @@ class SolverParametersList(PamhyrModelList):
                 solvers = execute("SELECT DISTINCT solver FROM solver_parameter")
 
                 for solver in solvers:
-                    if solver is not "mage8":
+                    if solver != "mage8":
                         continue
 
                     data = execute("SELECT ind, name, value " +
diff --git a/src/Model/Stricklers/Stricklers.py b/src/Model/Stricklers/Stricklers.py
index baa484fa62664847680e2bc69765519eae2330c1..302862db2f3390828c103eba9e10871f008861b3 100644
--- a/src/Model/Stricklers/Stricklers.py
+++ b/src/Model/Stricklers/Stricklers.py
@@ -18,7 +18,7 @@
 
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 class Stricklers(SQLSubModel):
     _id_cnt = 0
diff --git a/src/Model/Stricklers/StricklersList.py b/src/Model/Stricklers/StricklersList.py
index 640c110cc991e9129288e478f272b648c22d79ad..b000c07e327e971842f25879f4bc16e86f9282d3 100644
--- a/src/Model/Stricklers/StricklersList.py
+++ b/src/Model/Stricklers/StricklersList.py
@@ -18,7 +18,6 @@
 
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
 from Model.Saved import SavedStatus
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.Stricklers.Stricklers import Stricklers
diff --git a/src/Model/Study.py b/src/Model/Study.py
index 774a03d1260504c4f0bb74d34acb23cfac39d166..f022a195c495cc4a8b39ce2cc07c576499e010bc 100644
--- a/src/Model/Study.py
+++ b/src/Model/Study.py
@@ -23,7 +23,7 @@ from datetime import datetime
 
 from tools import timer, timestamp
 
-from Model.DB import SQLModel
+from Model.Tools.PamhyrDB import SQLModel
 from Model.Saved import SavedStatus
 from Model.Serializable import Serializable
 from Model.Except import NotImplementedMethodeError
diff --git a/src/Model/DB.py b/src/Model/Tools/PamhyrDB.py
similarity index 98%
rename from src/Model/DB.py
rename to src/Model/Tools/PamhyrDB.py
index ef7d729db628a9a74971b0aa2445db22e927e215..73174f9483d2cbed1583ebde553457aa032c3979 100644
--- a/src/Model/DB.py
+++ b/src/Model/Tools/PamhyrDB.py
@@ -1,4 +1,4 @@
-# DB.py -- Pamhyr abstract model database classes
+# PamhyrDB.py -- Pamhyr abstract model database classes
 # Copyright (C) 2023  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/src/Model/Tools/PamhyrDict.py b/src/Model/Tools/PamhyrDict.py
index 0c1cc536f648020cabe18c70e217d106eee153f7..aa2d3be35156a4b204d0e9050cc87aba31e80932 100644
--- a/src/Model/Tools/PamhyrDict.py
+++ b/src/Model/Tools/PamhyrDict.py
@@ -21,7 +21,7 @@ import logging
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 logger = logging.getLogger()
 
diff --git a/src/Model/Tools/PamhyrList.py b/src/Model/Tools/PamhyrList.py
index 8807c1493a3aa12b176494f41084b15ed7e78982..4129a7d8429c834f784a5e5c2a91157701f33372 100644
--- a/src/Model/Tools/PamhyrList.py
+++ b/src/Model/Tools/PamhyrList.py
@@ -21,7 +21,7 @@ import logging
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 logger = logging.getLogger()