diff --git a/blast/api/mdaAPI.py b/blast/api/mda_api.py
similarity index 98%
rename from blast/api/mdaAPI.py
rename to blast/api/mda_api.py
index 9535530694732a14624406cc89f60643dcb40b5f..6918badec5cb70d3bda498e102b197543c28bbf7 100644
--- a/blast/api/mdaAPI.py
+++ b/blast/api/mda_api.py
@@ -23,7 +23,7 @@ import numpy as np
 from fwk.coloring import ccolors
 import openmdao.api as om
 import blast
-import blast.utils as viscUtils
+import blast.utils as vutils
 from pygeo import DVGeometryCST
 from scipy.optimize import least_squares
 import fwk
@@ -185,7 +185,7 @@ class BlasterSolver(om.ExplicitComponent):
 
     def __write(self, sfx='0'):
         sfx = '_'+sfx
-        viscUtils.getSolution(self.isol.sec, write=True, toW=['x', 'y', 'cf'], sfx=sfx) # Boundary layer
+        vutils.getSolution(self.isol.sec, write=True, toW=['x', 'y', 'cf'], sfx=sfx) # Boundary layer
         self.isol.writeCp(sfx=sfx) # Cp
         self.isol.iobj['wrt'].save(self.isol.iobj['pbl'].msh.name + sfx) # Mesh
         self.isol.save(sfx) # Solution
@@ -473,12 +473,6 @@ class BlasterFFDGeometry(om.ExplicitComponent):
         # Fit circle to leading edge points
         center, radius = self.fit_circle(le_points_combined[:, 0], le_points_combined[:, 1])
 
-        # print('Upper shape', inputs['upper_shape'])
-        # print('Lower shape', inputs['lower_shape'])
-        # print('Max thickness', round(maxThickness, 4))
-        # print('Center:', center)
-        # print('Radius:', radius)
-
         # Go back to normal mesh
         x_aero_out = np.zeros(len(inputs['x_aero0']))
         for i, val in enumerate(self.options['nodeRows']):
diff --git a/blast/mdao/opti_NACA.py b/blast/mdao/opti_NACA.py
index e14e0f217894f4925efa241645eed99b1c831f9e..7a8729ad4dd1306a6ce41c1a3822de91815a2073 100644
--- a/blast/mdao/opti_NACA.py
+++ b/blast/mdao/opti_NACA.py
@@ -1,4 +1,4 @@
-import blast.utils as viscUtils
+import blast.utils as vutils
 import numpy as np
 
 from fwk.wutils import parseargs
@@ -6,8 +6,8 @@ import fwk
 from fwk.testing import *
 from fwk.coloring import ccolors
 
-from blast.api.mdaAPI import BlasterSolver
-from blast.api.mdaAPI import BlasterModeUpdater
+from blast.api.mda_api import BlasterSolver
+from blast.api.mda_api import BlasterModeUpdater
 
 import openmdao.api as om
 
diff --git a/blast/mdao/opti_subsonic.py b/blast/mdao/opti_subsonic.py
index 2228498dc3bf89be4d9c8b264c1c3e6a287723b9..a5f86f6555367f00bf90224dbe9ce9d7041c37d2 100644
--- a/blast/mdao/opti_subsonic.py
+++ b/blast/mdao/opti_subsonic.py
@@ -1,4 +1,4 @@
-import blast.utils as viscUtils
+import blast.utils as vutils
 import numpy as np
 
 from fwk.wutils import parseargs
@@ -6,8 +6,8 @@ import fwk
 from fwk.testing import *
 from fwk.coloring import ccolors
 
-from blast.api.mdaAPI import BlasterSolver
-from blast.api.mdaAPI import BlasterModeUpdater
+from blast.api.mda_api import BlasterSolver
+from blast.api.mda_api import BlasterModeUpdater
 
 import openmdao.api as om
 
@@ -34,7 +34,6 @@ def cfgInviscid(nthrds, verb):
     'Wake' : 'wake', # LIST of names of physical group containing the wake
     'WakeTip' : 'wakeTip', # LIST of names of physical group containing the edge of the wake
     'Te' : 'te', # LIST of names of physical group containing the trailing edge
-    'dbc' : False,
     'Upstream' : 'upstream',
     # Freestream
     'M_inf' : 0.1, # freestream Mach number
diff --git a/blast/mdao/opti_transonic.py b/blast/mdao/opti_transonic.py
index 5a91629481068fc25843357759c77f1bcb0a99ec..b88660987758f6261fb7013ea1315959f9c4c7a7 100644
--- a/blast/mdao/opti_transonic.py
+++ b/blast/mdao/opti_transonic.py
@@ -1,4 +1,4 @@
-import blast.utils as viscUtils
+import blast.utils as vutils
 import numpy as np
 
 from fwk.wutils import parseargs
@@ -6,8 +6,8 @@ import fwk
 from fwk.testing import *
 from fwk.coloring import ccolors
 
-from blast.api.mdaAPI import BlasterSolver
-from blast.api.mdaAPI import BlasterModeUpdater
+from blast.api.mda_api import BlasterSolver
+from blast.api.mda_api import BlasterModeUpdater
 
 import openmdao.api as om
 
@@ -34,7 +34,6 @@ def cfgInviscid(nthrds, verb):
     'Wake' : 'wake', # LIST of names of physical group containing the wake
     'WakeTip' : 'wakeTip', # LIST of names of physical group containing the edge of the wake
     'Te' : 'te', # LIST of names of physical group containing the trailing edge
-    'dbc' : False,
     'Upstream' : 'upstream',
     # Freestream
     'M_inf' : 0.78, # freestream Mach number