diff --git a/drivers/gpu/nvgpu/include/nvgpu/gops_mm.h b/drivers/gpu/nvgpu/include/nvgpu/gops_mm.h
index 0e9b86737..7b9115531 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gops_mm.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gops_mm.h
@@ -230,7 +230,7 @@ struct gops_mm {
 	 * This structure describes the HAL functions related to
 	 * GMMU fault handling.
 	 */
-	struct {
+	struct gops_mm_mmu_fault {
 		/**
 		 * @brief HAL to initialize the software setup of
 		 *        GMMU fault buffer.
@@ -288,7 +288,7 @@ struct gops_mm {
 	 * This structure describes the HAL functions related to
 	 * fb and L2 hardware operations.
 	 */
-	struct {
+	struct gops_mm_cache {
 		/**
 		 * @brief HAL to flush the frame buffer memory.
 		 *
@@ -358,7 +358,7 @@ struct gops_mm {
 	 * This structure describes the HAL functions related to
 	 * GMMU operations.
 	 */
-	struct {
+	struct gops_mm_gmmu {
 		/**
 		 * @brief HAL to get the GMMU level mapping info structure.
 		 *
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gops_sync.h b/drivers/gpu/nvgpu/include/nvgpu/gops_sync.h
index 35b309fa6..fbe919281 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gops_sync.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gops_sync.h
@@ -45,7 +45,7 @@ struct nvgpu_semaphore;
 struct gops_sync {
 
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
-	struct {
+	struct gops_sync_syncpt {
 		/**
 		 * @brief Map syncpoint aperture as read-only.
 		 *
@@ -93,7 +93,7 @@ struct gops_sync {
 
 #ifdef CONFIG_NVGPU_KERNEL_MODE_SUBMIT
 /** @cond DOXYGEN_SHOULD_SKIP_THIS */
-	struct {
+	struct gops_sync_sema {
 		u32 (*get_wait_cmd_size)(void);
 		u32 (*get_incr_cmd_size)(void);
 		void (*add_cmd)(struct gk20a *g,