diff --git a/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c b/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c
index 11d27b474..2b0211dac 100644
--- a/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c
+++ b/drivers/gpu/nvgpu/os/linux/nvidia_p2p.c
@@ -167,7 +167,7 @@ int nvidia_p2p_free_page_table(struct nvidia_p2p_page_table *page_table)
 }
 EXPORT_SYMBOL(nvidia_p2p_free_page_table);
 
-int nvidia_p2p_map_pages(struct device *dev,
+int nvidia_p2p_dma_map_pages(struct device *dev,
 		struct nvidia_p2p_page_table *page_table,
 		struct nvidia_p2p_dma_mapping **dma_mapping,
 		enum dma_data_direction direction)
@@ -254,9 +254,9 @@ free_dma_mapping:
 
 	return ret;
 }
-EXPORT_SYMBOL(nvidia_p2p_map_pages);
+EXPORT_SYMBOL(nvidia_p2p_dma_map_pages);
 
-int nvidia_p2p_unmap_pages(struct nvidia_p2p_dma_mapping *dma_mapping)
+int nvidia_p2p_dma_unmap_pages(struct nvidia_p2p_dma_mapping *dma_mapping)
 {
 	struct nvidia_p2p_page_table *page_table = NULL;
 
@@ -287,10 +287,10 @@ int nvidia_p2p_unmap_pages(struct nvidia_p2p_dma_mapping *dma_mapping)
 
 	return 0;
 }
-EXPORT_SYMBOL(nvidia_p2p_unmap_pages);
+EXPORT_SYMBOL(nvidia_p2p_dma_unmap_pages);
 
 int nvidia_p2p_free_dma_mapping(struct nvidia_p2p_dma_mapping *dma_mapping)
 {
-	return nvidia_p2p_unmap_pages(dma_mapping);
+	return nvidia_p2p_dma_unmap_pages(dma_mapping);
 }
 EXPORT_SYMBOL(nvidia_p2p_free_dma_mapping);
diff --git a/include/linux/nv-p2p.h b/include/linux/nv-p2p.h
index 40e827969..137519b77 100644
--- a/include/linux/nv-p2p.h
+++ b/include/linux/nv-p2p.h
@@ -159,13 +159,13 @@ int nvidia_p2p_free_page_table(struct nvidia_p2p_page_table *page_table);
  *    0           upon successful completion.
  *    Negative number if any other error
  */
-int nvidia_p2p_map_pages(struct device *dev,
+int nvidia_p2p_dma_map_pages(struct device *dev,
 		struct nvidia_p2p_page_table *page_table,
 		struct nvidia_p2p_dma_mapping **map,
 		enum dma_data_direction direction);
 /*
  * @brief
- *   Unmap the pages previously mapped using nvidia_p2p_map_pages
+ *   Unmap the pages previously mapped using nvidia_p2p_dma_map_pages
  *
  * @param[in]	*map
  *   A pointer to struct nvidia_p2p_dma_mapping.
@@ -175,11 +175,11 @@ int nvidia_p2p_map_pages(struct device *dev,
  *    0           upon successful completion.
  *    Negative number if any other error
  */
-int nvidia_p2p_unmap_pages(struct nvidia_p2p_dma_mapping *map);
+int nvidia_p2p_dma_unmap_pages(struct nvidia_p2p_dma_mapping *map);
 
 /*
  * @brief
- *   Unmap the pages previously mapped using nvidia_p2p_map_pages.
+ *   Unmap the pages previously mapped using nvidia_p2p_dma_map_pages.
  *  This is called  during the  execution of the free_callback().
  *
  * @param[in]	*map