diff --git a/src/broadcom/simulator/v3d_simulator.c b/src/broadcom/simulator/v3d_simulator.c
index 8d43bf6d58d..fa99750190f 100644
--- a/src/broadcom/simulator/v3d_simulator.c
+++ b/src/broadcom/simulator/v3d_simulator.c
@@ -24,10 +24,10 @@
 /**
  * @file v3d_simulator.c
  *
- * Implements VC5 simulation on top of a non-VC5 GEM fd.
+ * Implements V3D simulation on top of a non-V3D GEM fd.
  *
- * This file's goal is to emulate the VC5 ioctls' behavior in the kernel on
- * top of the simpenrose software simulator.  Generally, VC5 driver BOs have a
+ * This file's goal is to emulate the V3D ioctls' behavior in the kernel on
+ * top of the simpenrose software simulator.  Generally, V3D driver BOs have a
  * GEM-side copy of their contents and a simulator-side memory area that the
  * GEM contents get copied into during simulation.  Once simulation is done,
  * the simulator's data is copied back out to the GEM BOs, so that rendering
@@ -40,8 +40,8 @@
  * outside of this file still call ioctls directly on the fd).
  *
  * Another limitation is that BO import doesn't work unless the underlying
- * window system's BO size matches what VC5 is going to use, which of course
- * doesn't work out in practice.  This means that for now, only DRI3 (VC5
+ * window system's BO size matches what V3D is going to use, which of course
+ * doesn't work out in practice.  This means that for now, only DRI3 (V3D
  * makes the winsys BOs) is supported, not DRI2 (window system makes the winys
  * BOs).
  */
@@ -402,9 +402,9 @@ void v3d_simulator_open_from_handle(int fd, int handle, uint32_t size)
 }
 
 /**
- * Simulated ioctl(fd, DRM_VC5_CREATE_BO) implementation.
+ * Simulated ioctl(fd, DRM_V3D_CREATE_BO) implementation.
  *
- * Making a VC5 BO is just a matter of making a corresponding BO on the host.
+ * Making a V3D BO is just a matter of making a corresponding BO on the host.
  */
 static int
 v3d_simulator_create_bo_ioctl(int fd, struct drm_v3d_create_bo *args)
@@ -447,7 +447,7 @@ v3d_simulator_create_bo_ioctl(int fd, struct drm_v3d_create_bo *args)
 }
 
 /**
- * Simulated ioctl(fd, DRM_VC5_MMAP_BO) implementation.
+ * Simulated ioctl(fd, DRM_V3D_MMAP_BO) implementation.
  *
  * We've already grabbed the mmap offset when we created the sim bo, so just
  * return it.
diff --git a/src/broadcom/simulator/v3dx_simulator.c b/src/broadcom/simulator/v3dx_simulator.c
index cbf257859b3..15772085a27 100644
--- a/src/broadcom/simulator/v3dx_simulator.c
+++ b/src/broadcom/simulator/v3dx_simulator.c
@@ -24,7 +24,7 @@
 /**
  * @file v3dx_simulator.c
  *
- * Implements the actual HW interaction betweeh the GL driver's VC5 simulator and the simulator.
+ * Implements the actual HW interaction betweeh the GL driver's V3D simulator and the simulator.
  *
  * The register headers between V3D versions will have conflicting defines, so
  * all register interactions appear in this file and are compiled per V3D version
@@ -241,7 +241,7 @@ v3dX(simulator_get_param_ioctl)(struct v3d_hw *v3d,
                 return 0;
         }
 
-        fprintf(stderr, "Unknown DRM_IOCTL_VC5_GET_PARAM(%lld)\n",
+        fprintf(stderr, "Unknown DRM_IOCTL_V3D_GET_PARAM(%lld)\n",
                 (long long)args->value);
         abort();
 }