diff --git a/drivers/gpu/drm/tegra/Makefile b/drivers/gpu/drm/tegra/Makefile
index dc5d6bf4..4ac56fd8 100644
--- a/drivers/gpu/drm/tegra/Makefile
+++ b/drivers/gpu/drm/tegra/Makefile
@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: GPL-2.0-only
-# Copyright (c) 2022-2023, NVIDIA CORPORATION.  All rights reserved.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION.  All rights reserved.
 
 ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG
 ccflags-y += -I$(srctree.nvidia-oot)/drivers/gpu/drm/tegra/include
 ccflags-y += -I$(srctree.hwpm)/include
 
-tegra-drm-next-y := \
+tegra-drm-y := \
 	drm.o \
 	uapi.o \
 	submit.o \
@@ -37,6 +37,6 @@ tegra-drm-next-y := \
 	ofa.o \
 	virt.o
 
-tegra-drm-next-y += trace.o
+tegra-drm-y += trace.o
 
-obj-m := tegra-drm-next.o
+obj-m := tegra-drm.o
diff --git a/drivers/gpu/host1x/Makefile b/drivers/gpu/host1x/Makefile
index 07026c55..91361405 100644
--- a/drivers/gpu/host1x/Makefile
+++ b/drivers/gpu/host1x/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
-# Copyright (c) 2022-2023, NVIDIA CORPORATION.  All rights reserved.
+# Copyright (c) 2022-2024, NVIDIA CORPORATION.  All rights reserved.
 
-host1x-next-y = \
+host1x-y = \
 	bus.o \
 	syncpt.o \
 	dev.o \
@@ -21,7 +21,7 @@ host1x-next-y = \
 	hw/host1x07.o \
 	hw/host1x08.o
 
-host1x-next-$(CONFIG_IOMMU_API) += \
+host1x-$(CONFIG_IOMMU_API) += \
 	context.o
 
-obj-m := host1x-next.o
+obj-m := host1x.o