python-control
diff --git a/‎control/bdalg.py
Lines changed: 3 additions & 3 deletions b/‎control/bdalg.py
Lines changed: 3 additions & 3 deletions
diff --git a/‎control/margins.py
Lines changed: 2 additions & 2 deletions b/‎control/margins.py
Lines changed: 2 additions & 2 deletions
diff --git a/‎control/rlocus.py
Lines changed: 2 additions & 2 deletions b/‎control/rlocus.py
Lines changed: 2 additions & 2 deletions
diff --git a/‎control/statesp.py
Lines changed: 1 addition & 1 deletion b/‎control/statesp.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎control/tests/timeresp_test.py
Lines changed: 2 additions & 2 deletions b/‎control/tests/timeresp_test.py
Lines changed: 2 additions & 2 deletions
@@ -239,14 +239,14 @@ def feedback(sys1, sys2=1, sign=-1):
     # its feedback member function.
     if isinstance(sys1, (int, float, complex, np.number)):
         if isinstance(sys2, tf.TransferFunction):
-            sys1 = tf._convertToTransferFunction(sys1)
+            sys1 = tf._convert_to_transfer_function(sys1)
         elif isinstance(sys2, ss.StateSpace):
             sys1 = ss._convertToStateSpace(sys1)
         elif isinstance(sys2, frd.FRD):
             sys1 = ss._convertToFRD(sys1)
         else: # sys2 is a scalar.
-            sys1 = tf._convertToTransferFunction(sys1)
-            sys2 = tf._convertToTransferFunction(sys2)
+            sys1 = tf._convert_to_transfer_function(sys1)
+            sys2 = tf._convert_to_transfer_function(sys2)
 
     return sys1.feedback(sys2, sign)
 
 
@@ -144,7 +144,7 @@ def stability_margins(sysdata, returnall=False, epsw=0.0):
             sys = frdata.FRD(mag * np.exp(1j * phase * math.pi/180),
                              omega, smooth=True)
         else:
-            sys = xferfcn._convertToTransferFunction(sysdata)
+            sys = xferfcn._convert_to_transfer_function(sysdata)
     except Exception as e:
         print (e)
         raise ValueError("Margin sysdata must be either a linear system or "
@@ -299,7 +299,7 @@ def phase_crossover_frequencies(sys):
     """
 
     # Convert to a transfer function
-    tf = xferfcn._convertToTransferFunction(sys)
+    tf = xferfcn._convert_to_transfer_function(sys)
 
     # if not siso, fall back to (0,0) element
     #! TODO: should add a check and warning here
 
@@ -51,7 +51,7 @@
 from math import pi
 import scipy.signal             # signal processing toolbox
 import pylab                    # plotting routines
-from .xferfcn import _convertToTransferFunction
+from .xferfcn import _convert_to_transfer_function
 from .exception import ControlMIMONotImplemented
 from functools import partial
 from .lti import isdtime
@@ -288,7 +288,7 @@ def _systopoly1d(sys):
 
     else:
         # Convert to a transfer function, if needed
-        sys = _convertToTransferFunction(sys)
+        sys = _convert_to_transfer_function(sys)
 
         # Make sure we have a SISO system
         if (sys.inputs > 1 or sys.outputs > 1):
 
@@ -62,7 +62,7 @@
 from scipy.signal import lti, cont2discrete
 from warnings import warn
 from .lti import LTI, timebase, timebaseEqual, isdtime
-from .xferfcn import _convertToTransferFunction
+from .xferfcn import _convert_to_transfer_function
 from copy import deepcopy
 
 __all__ = ['StateSpace', 'ss', 'rss', 'drss', 'tf2ss', 'ssdata']
 
@@ -13,7 +13,7 @@
 # import scipy as sp
 from control.timeresp import *
 from control.statesp import *
-from control.xferfcn import TransferFunction, _convertToTransferFunction
+from control.xferfcn import TransferFunction, _convert_to_transfer_function
 from control.dtime import c2d
 from control.exception import slycot_check
 
@@ -28,7 +28,7 @@ def setUp(self):
 
         # Create some transfer functions
         self.siso_tf1 = TransferFunction([1], [1, 2, 1])
-        self.siso_tf2 = _convertToTransferFunction(self.siso_ss1)
+        self.siso_tf2 = _convert_to_transfer_function(self.siso_ss1)
 
         # Create MIMO system, contains ``siso_ss1`` twice
         A = np.matrix("1. -2. 0.  0.;"