diff --git a/draining/src/main/scala/com/dwolla/autoscaling/ecs/draining/TerminationEventHandler.scala b/draining/src/main/scala/com/dwolla/autoscaling/ecs/draining/TerminationEventHandler.scala
index c349e01..8eb3237 100644
--- a/draining/src/main/scala/com/dwolla/autoscaling/ecs/draining/TerminationEventHandler.scala
+++ b/draining/src/main/scala/com/dwolla/autoscaling/ecs/draining/TerminationEventHandler.scala
@@ -32,10 +32,10 @@ class TerminationEventHandler extends IOLambda[SnsEvent, INothing] {
       given Random[IO] <- Random.scalaUtilRandom[IO].toResource
       entryPoint <- XRay.entryPoint[IO]()
       awsEnv <- AwsEnvironment.default(client, AwsRegion.US_WEST_2)
-      ecs <- AwsClient(ECS, awsEnv).map(_.traceWithInputs).map(EcsAlg(_))
+      ecs <- AwsClient(ECS, awsEnv).map(_.instrumentAndTrace).map(EcsAlg(_))
       autoscalingClient <- AwsClient(AutoScaling, awsEnv)
-      sns <- AwsClient(SNS, awsEnv).map(SnsAlg[IO](_).traceWithInputs)
-      autoscaling = AutoScalingAlg[IO](autoscalingClient, sns).traceWithInputs
+      sns <- AwsClient(SNS, awsEnv).map(SnsAlg[IO](_).instrumentAndTrace)
+      autoscaling = AutoScalingAlg[IO](autoscalingClient, sns).instrumentAndTrace
       bridgeFunction = TerminationEventBridge(ecs, autoscaling)
       given Logger[IO] <- LoggerFactory[IO].create.toResource
     } yield LifecycleHookHandler(entryPoint, "TerminationEventHandler")(bridgeFunction)
diff --git a/registrator-health-check/src/main/scala/com/dwolla/autoscaling/ecs/registrator/ScaleOutPendingEventHandler.scala b/registrator-health-check/src/main/scala/com/dwolla/autoscaling/ecs/registrator/ScaleOutPendingEventHandler.scala
index 40334f9..e261104 100644
--- a/registrator-health-check/src/main/scala/com/dwolla/autoscaling/ecs/registrator/ScaleOutPendingEventHandler.scala
+++ b/registrator-health-check/src/main/scala/com/dwolla/autoscaling/ecs/registrator/ScaleOutPendingEventHandler.scala
@@ -36,7 +36,7 @@ class ScaleOutPendingEventHandler extends IOLambda[SnsEvent, INothing] {
       given Random[IO] <- Random.scalaUtilRandom[IO].toResource
       entryPoint <- XRay.entryPoint[IO]()
       awsEnv <- AwsEnvironment.default(client, AwsRegion.US_WEST_2)
-      ecs <- AwsClient(ECS, awsEnv).map(_.traceWithInputs).map(EcsAlg(_))
+      ecs <- AwsClient(ECS, awsEnv).map(_.instrumentAndTrace).map(EcsAlg(_))
       autoscalingClient <- AwsClient(AutoScaling, awsEnv)
       sns <- AwsClient(SNS, awsEnv).map(SnsAlg[IO](_))
       ec2Client <- AwsClient(EC2, awsEnv).map(Ec2Alg[IO](_))