diff --git a/direct/src/directdevices/DirectJoybox.py b/direct/src/directdevices/DirectJoybox.py
index 08ae2a5bf0..ccb05d07a8 100644
--- a/direct/src/directdevices/DirectJoybox.py
+++ b/direct/src/directdevices/DirectJoybox.py
@@ -214,7 +214,7 @@ class DirectJoybox(DirectObject):
         # Update display
         self.readout.setText(modeText)
         t = taskMgr.doMethodLater(3.0, hideText, self.name + '-showMode')
-        t.uponDeath = hideText
+        t.setUponDeath(hideText)
 
     def acceptUprightCameraEvent(self, button = L_UPPER):
         self.accept(self.getEventName(button),
diff --git a/direct/src/extensions/NodePath-extensions.py b/direct/src/extensions/NodePath-extensions.py
index dec35ee81e..d6902c6a94 100644
--- a/direct/src/extensions/NodePath-extensions.py
+++ b/direct/src/extensions/NodePath-extensions.py
@@ -352,7 +352,7 @@
         lerpTask.functorFunc = functorFunc
         lerpTask.duration = duration
         lerpTask.blendType = LerpBlendHelpers.getBlend(blendType)
-        lerpTask.uponDeath = lerpUponDeath
+        lerpTask.setUponDeath(lerpUponDeath)
 
         if (taskName == None):
             # don't spawn a task, return one instead
diff --git a/direct/src/extensions_native/NodePath_extensions.py b/direct/src/extensions_native/NodePath_extensions.py
index a31bde24b8..b57c6b27b4 100644
--- a/direct/src/extensions_native/NodePath_extensions.py
+++ b/direct/src/extensions_native/NodePath_extensions.py
@@ -448,7 +448,7 @@ def __lerp(self, functorFunc, duration, blendType, taskName=None):
         lerpTask.functorFunc = functorFunc
         lerpTask.duration = duration
         lerpTask.blendType = LerpBlendHelpers.getBlend(blendType)
-        lerpTask.uponDeath = lerpUponDeath
+        lerpTask.setUponDeath(lerpUponDeath)
 
         if (taskName == None):
             # don't spawn a task, return one instead
diff --git a/direct/src/leveleditor/LevelEditor.py b/direct/src/leveleditor/LevelEditor.py
index d5c998db7f..1f2bc808e6 100644
--- a/direct/src/leveleditor/LevelEditor.py
+++ b/direct/src/leveleditor/LevelEditor.py
@@ -2499,7 +2499,7 @@ class LevelEditor(NodePath, DirectObject):
                 t.deltaPos = deltaPos
                 t.deltaHpr = deltaHpr
                 t.selectedNode = selectedNode
-                t.uponDeath = self.autoPositionCleanup
+                t.setUponDeath(self.autoPositionCleanup)
             else:
                 base.direct.grid.setPosHpr(selectedNode, deltaPos, deltaHpr)
 
diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index 0956eee9ab..f0aad18e52 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -2132,7 +2132,7 @@ class ShowBase(DirectObject.DirectObject):
         t.numFrames = int(duration * fps)
         t.source = source
         t.outputString = namePrefix + '_%0' + `sd` + 'd.' + format
-        t.uponDeath = lambda state: globalClock.setMode(ClockObject.MNormal)
+        t.setUponDeath(lambda state: globalClock.setMode(ClockObject.MNormal))
 
     def _movieTask(self, state):
         if state.frameIndex != 0: