diff --git a/drivers/video/tegra/host/nvdla/nvdla.h b/drivers/video/tegra/host/nvdla/nvdla.h
index e4d5fa95..d5aab6a2 100644
--- a/drivers/video/tegra/host/nvdla/nvdla.h
+++ b/drivers/video/tegra/host/nvdla/nvdla.h
@@ -211,7 +211,7 @@ void nvdla_task_get(struct nvdla_task *task);
  */
 struct nvdla_task *nvdla_task_alloc(struct nvhost_queue *queue,
 			struct nvhost_buffers *buffers,
-			struct nvdla_ctrl_ioctl_submit_task *user_task);
+			struct nvdla_ioctl_submit_task *user_task);
 
 /**
  * nvdla_send_postfences()	send back fences to UMD
@@ -224,7 +224,7 @@ struct nvdla_task *nvdla_task_alloc(struct nvhost_queue *queue,
  * This function send post fences back to UMD after task submit
  */
 int nvdla_send_postfences(struct nvdla_task *task,
-			struct nvdla_ctrl_ioctl_submit_task usr_task);
+			struct nvdla_ioctl_submit_task usr_task);
 
 
 #endif /* End of __NVHOST_NVDLA_H__ */
diff --git a/drivers/video/tegra/host/nvdla/nvdla_ioctl.c b/drivers/video/tegra/host/nvdla/nvdla_ioctl.c
index 8aa7e678..4643a98c 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_ioctl.c
+++ b/drivers/video/tegra/host/nvdla/nvdla_ioctl.c
@@ -56,12 +56,12 @@ struct nvdla_private {
 	struct nvhost_buffers *buffers;
 };
 
-static int nvdla_ctrl_pin(struct nvdla_private *priv, void *arg)
+static int nvdla_pin(struct nvdla_private *priv, void *arg)
 {
 	u32 *handles;
 	int err = 0;
-	struct nvdla_ctrl_pin_unpin_args *buf_list =
-			(struct nvdla_ctrl_pin_unpin_args *)arg;
+	struct nvdla_pin_unpin_args *buf_list =
+			(struct nvdla_pin_unpin_args *)arg;
 	u32 count = buf_list->num_buffers;
 	struct platform_device *pdev = priv->pdev;
 
@@ -84,12 +84,12 @@ nvdla_buffer_cpy_err:
 	return err;
 }
 
-static int nvdla_ctrl_unpin(struct nvdla_private *priv, void *arg)
+static int nvdla_unpin(struct nvdla_private *priv, void *arg)
 {
 	u32 *handles;
 	int err = 0;
-	struct nvdla_ctrl_pin_unpin_args *buf_list =
-			(struct nvdla_ctrl_pin_unpin_args *)arg;
+	struct nvdla_pin_unpin_args *buf_list =
+			(struct nvdla_pin_unpin_args *)arg;
 	u32 count = buf_list->num_buffers;
 	struct platform_device *pdev = priv->pdev;
 
@@ -112,8 +112,8 @@ nvdla_buffer_cpy_err:
 	return err;
 }
 
-static int nvdla_ctrl_ping(struct platform_device *pdev,
-			   struct nvdla_ctrl_ping_args *args)
+static int nvdla_ping(struct platform_device *pdev,
+			   struct nvdla_ping_args *args)
 {
 	DEFINE_DMA_ATTRS(ping_attrs);
 	dma_addr_t ping_pa;
@@ -171,12 +171,12 @@ fail_to_on:
 	return err;
 }
 
-static int nvdla_ctrl_submit(struct nvdla_private *priv, void *arg)
+static int nvdla_submit(struct nvdla_private *priv, void *arg)
 {
-	struct nvdla_ctrl_submit_args *args =
-			(struct nvdla_ctrl_submit_args *)arg;
-	struct nvdla_ctrl_ioctl_submit_task __user *user_tasks;
-	struct nvdla_ctrl_ioctl_submit_task *local_tasks;
+	struct nvdla_submit_args *args =
+			(struct nvdla_submit_args *)arg;
+	struct nvdla_ioctl_submit_task __user *user_tasks;
+	struct nvdla_ioctl_submit_task *local_tasks;
 	struct platform_device *pdev;
 	struct nvhost_queue *queue;
 	struct nvhost_buffers *buffers;
@@ -194,7 +194,7 @@ static int nvdla_ctrl_submit(struct nvdla_private *priv, void *arg)
 
 	buffers = priv->buffers;
 
-	user_tasks = (struct nvdla_ctrl_ioctl_submit_task __user *)
+	user_tasks = (struct nvdla_ioctl_submit_task __user *)
 			(uintptr_t)args->tasks;
 	num_tasks = args->num_tasks;
 
@@ -257,14 +257,14 @@ static long nvdla_ioctl(struct file *file, unsigned int cmd,
 {
 	struct nvdla_private *priv = file->private_data;
 	struct platform_device *pdev = priv->pdev;
-	u8 buf[NVDLA_IOCTL_CTRL_MAX_ARG_SIZE] __aligned(sizeof(u64));
+	u8 buf[NVDLA_IOCTL_MAX_ARG_SIZE] __aligned(sizeof(u64));
 	int err = 0;
 
 	/* check for valid IOCTL cmd */
 	if ((_IOC_TYPE(cmd) != NVHOST_NVDLA_IOCTL_MAGIC) ||
 	    (_IOC_NR(cmd) == _IOC_NR(0)) ||
-	    (_IOC_NR(cmd) > NVDLA_IOCTL_CTRL_LAST) ||
-	    (_IOC_SIZE(cmd) > NVDLA_IOCTL_CTRL_MAX_ARG_SIZE)) {
+	    (_IOC_NR(cmd) > NVDLA_IOCTL_LAST) ||
+	    (_IOC_SIZE(cmd) > NVDLA_IOCTL_MAX_ARG_SIZE)) {
 		return -ENOIOCTLCMD;
 	}
 
@@ -277,17 +277,17 @@ static long nvdla_ioctl(struct file *file, unsigned int cmd,
 
 	/* handle IOCTL cmd */
 	switch (cmd) {
-	case NVDLA_IOCTL_CTRL_PING:
-		err = nvdla_ctrl_ping(pdev, (void *)buf);
+	case NVDLA_IOCTL_PING:
+		err = nvdla_ping(pdev, (void *)buf);
 		break;
-	case NVDLA_IOCTL_CTRL_PIN:
-		err = nvdla_ctrl_pin(priv, (void *)buf);
+	case NVDLA_IOCTL_PIN:
+		err = nvdla_pin(priv, (void *)buf);
 		break;
-	case NVDLA_IOCTL_CTRL_UNPIN:
-		err = nvdla_ctrl_unpin(priv, (void *)buf);
+	case NVDLA_IOCTL_UNPIN:
+		err = nvdla_unpin(priv, (void *)buf);
 		break;
-	case NVDLA_IOCTL_CTRL_SUBMIT:
-		err = nvdla_ctrl_submit(priv, (void *)buf);
+	case NVDLA_IOCTL_SUBMIT:
+		err = nvdla_submit(priv, (void *)buf);
 		break;
 	default:
 		err = -ENOIOCTLCMD;
diff --git a/drivers/video/tegra/host/nvdla/nvdla_queue.c b/drivers/video/tegra/host/nvdla/nvdla_queue.c
index 692f9b78..25b5edb3 100644
--- a/drivers/video/tegra/host/nvdla/nvdla_queue.c
+++ b/drivers/video/tegra/host/nvdla/nvdla_queue.c
@@ -46,7 +46,7 @@
 static DEFINE_DMA_ATTRS(attrs);
 
 /* task management API's */
-static int nvdla_get_fences(struct nvdla_ctrl_ioctl_submit_task *user_task,
+static int nvdla_get_fences(struct nvdla_ioctl_submit_task *user_task,
 			struct nvdla_task *task)
 {
 	struct nvdla_fence __user *postfences =
@@ -91,7 +91,7 @@ fail:
 }
 
 int nvdla_send_postfences(struct nvdla_task *task,
-			struct nvdla_ctrl_ioctl_submit_task usr_task)
+			struct nvdla_ioctl_submit_task usr_task)
 {
 	struct nvdla_fence __user *postfences =
 		(struct nvdla_fence __user *)(uintptr_t)usr_task.postfences;
@@ -212,7 +212,7 @@ static void nvdla_queue_update(void *priv, int nr_completed)
 }
 
 static int nvdla_map_task_memory(struct nvhost_buffers *buffers,
-			struct nvdla_ctrl_ioctl_submit_task *user_task,
+			struct nvdla_ioctl_submit_task *user_task,
 			struct nvdla_task *task,
 			struct dla_task_descriptor *task_desc)
 {
@@ -224,7 +224,7 @@ static int nvdla_map_task_memory(struct nvhost_buffers *buffers,
 	dma_addr_t *dma_addr;
 	dma_addr_t *dma_memory;
 	struct dma_buf *buf = NULL;
-	struct nvdla_ctrl_mem_handle *addresses;
+	struct nvdla_mem_handle *addresses;
 
 	task->buffers = buffers;
 	task->num_handles = 0;
@@ -322,7 +322,7 @@ static int nvdla_map_task_memory(struct nvhost_buffers *buffers,
 
 		temp = (uintptr_t)(ptr);
 		addresses =
-			(struct nvdla_ctrl_mem_handle *)
+			(struct nvdla_mem_handle *)
 				(temp + user_task->address_list.offset);
 
 		for (i = 0; i < user_task->num_addresses; i++, addresses++)
@@ -365,7 +365,7 @@ static int nvdla_map_task_memory(struct nvhost_buffers *buffers,
 		dma_addr_list = (uint64_t *)
 				(temp + user_task->address_list.offset);
 		addresses =
-			(struct nvdla_ctrl_mem_handle *)
+			(struct nvdla_mem_handle *)
 				(temp + user_task->address_list.offset);
 
 		task_desc->address_list = (*dma_addr++) +
@@ -408,7 +408,7 @@ fail_to_alloc_handles:
 
 struct nvdla_task *nvdla_task_alloc(struct nvhost_queue *queue,
 			struct nvhost_buffers *buffers,
-			struct nvdla_ctrl_ioctl_submit_task *user_task)
+			struct nvdla_ioctl_submit_task *user_task)
 {
 	struct platform_device *pdev = queue->pool->pdev;
 	u32 num_postfences = user_task->num_postfences;