diff --git a/qiskit/compiler/transpile.py b/qiskit/compiler/transpile.py
index 322bccc5aa0d..a77e1a171229 100644
--- a/qiskit/compiler/transpile.py
+++ b/qiskit/compiler/transpile.py
@@ -241,7 +241,7 @@ def _parse_basis_gates(basis_gates, backend, circuits):
         if basis is None:
             gates_in_circuit = set(inst.name for inst, _, _ in circuit.data)
             # Other passes might add new gates that need to be supported
-            basis_gates[index] = list(gates_in_circuit.union(['U', 'CX']))
+            basis_gates[index] = list(gates_in_circuit.union(['u3', 'cx']))
     return basis_gates
 
 
diff --git a/qiskit/transpiler/preset_passmanagers/level1.py b/qiskit/transpiler/preset_passmanagers/level1.py
index 8abdd8f43de5..e7793d2d0bde 100644
--- a/qiskit/transpiler/preset_passmanagers/level1.py
+++ b/qiskit/transpiler/preset_passmanagers/level1.py
@@ -129,6 +129,6 @@ def _opt_control(property_set):
         # pm1.append(_direction_check)  # TODO
         pm1.append(_direction, condition=_direction_condition)
     pm1.append(_reset)
-    pm1.append(_opt + _depth_check, do_while=_opt_control)
+    pm1.append(_depth_check + _opt, do_while=_opt_control)
 
     return pm1
diff --git a/qiskit/transpiler/preset_passmanagers/level2.py b/qiskit/transpiler/preset_passmanagers/level2.py
index 8dccb36c10c4..934480369b3a 100644
--- a/qiskit/transpiler/preset_passmanagers/level2.py
+++ b/qiskit/transpiler/preset_passmanagers/level2.py
@@ -126,6 +126,6 @@ def _opt_control(property_set):
         # pm2.append(_direction_check)  # TODO
         pm2.append(_direction, condition=_direction_condition)
     pm2.append(_reset)
-    pm2.append(_opt + _depth_check, do_while=_opt_control)
+    pm2.append(_depth_check + _opt, do_while=_opt_control)
 
     return pm2
diff --git a/qiskit/transpiler/preset_passmanagers/level3.py b/qiskit/transpiler/preset_passmanagers/level3.py
index b96585539045..5336a82e00d2 100644
--- a/qiskit/transpiler/preset_passmanagers/level3.py
+++ b/qiskit/transpiler/preset_passmanagers/level3.py
@@ -118,6 +118,6 @@ def _opt_control(property_set):
     if coupling_map:
         pm3.append(_swap_check)
         pm3.append(_swap, condition=_swap_condition)
-    pm3.append(_opt + _depth_check, do_while=_opt_control)
+    pm3.append(_depth_check + _optdo_while=_opt_control)
 
     return pm3