diff --git a/Devices/Push2/__init__.py b/Devices/Push2/__init__.py
index 0154c71..533e041 100644
--- a/Devices/Push2/__init__.py
+++ b/Devices/Push2/__init__.py
@@ -1,11 +1,11 @@
 # Embedded file name: /Users/versonator/Jenkins/live/output/mac_64_static/Release/python-bundle/MIDI Remote Scripts/Push2/__init__.py
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import, print_function, unicode_literals
 
 from Ubermap import UbermapDevicesPatches
 
 def get_capabilities():
     from ableton.v2.control_surface import capabilities as caps
-    return {caps.CONTROLLER_ID_KEY: caps.controller_id(vendor_id=10626, product_ids=[6503], model_name='Ableton Push 2'),
+    return {caps.CONTROLLER_ID_KEY: caps.controller_id(vendor_id=10626, product_ids=[6503], model_name=u'Ableton Push 2'),
      caps.PORTS_KEY: [caps.inport(props=[caps.HIDDEN, caps.NOTES_CC, caps.SCRIPT]),
                       caps.inport(props=[]),
                       caps.outport(props=[caps.HIDDEN,
@@ -13,7 +13,7 @@ def get_capabilities():
                        caps.SYNC,
                        caps.SCRIPT]),
                       caps.outport(props=[])],
-     caps.TYPE_KEY: 'push2',
+     caps.TYPE_KEY: u'push2',
      caps.AUTO_LOAD_KEY: True}
 
 
@@ -24,4 +24,4 @@ def create_instance(c_instance):
 
     UbermapDevicesPatches.apply_ubermap_patches()
 
-    return Push2(c_instance=c_instance, model=root)
+    return Push2(c_instance=c_instance, model=root, decoupled_parameter_list_change_notifications=True)
diff --git a/Devices/UbermapDevicesPatches.py b/Devices/UbermapDevicesPatches.py
index 24d2201..8bd6987 100644
--- a/Devices/UbermapDevicesPatches.py
+++ b/Devices/UbermapDevicesPatches.py
@@ -36,7 +36,7 @@ def __getattribute__(self, name):
 ############################################################################################################
 
 # BankingUtil
-from pushbase import banking_util
+from ableton.v2.control_surface import banking_util
 
 def apply_banking_util_patches():
     # device_bank_names - return Ubermap bank names if defined, otherwise use the default
@@ -67,7 +67,7 @@ def device_bank_count(device, bank_size = 8, definition = None, definitions = No
 ############################################################################################################
 
 # DeviceParameterBank
-from pushbase.device_parameter_bank import DeviceParameterBank
+from ableton.v2.control_surface.device_parameter_bank import DeviceParameterBank
 
 def apply_device_parameter_bank_patches():
     # _collect_parameters - this method is called by _update_parameters to determine whether we should
@@ -90,8 +90,8 @@ def _collect_parameters(self):
 ############################################################################################################
 
 # DeviceComponent
-from pushbase.device_component import DeviceComponent
-from pushbase.parameter_provider import ParameterInfo
+from ableton.v2.control_surface.components.device import DeviceComponent
+from ableton.v2.control_surface.parameter_provider import ParameterInfo
 
 def apply_device_component_patches():
     # _get_provided_parameters - return Ubermap parameter names if defined, otherwise use the default