diff --git a/porting/lv_port_disp_template.c b/porting/lv_port_disp_template.c
index 7fdfa79bc..1f4502720 100644
--- a/porting/lv_port_disp_template.c
+++ b/porting/lv_port_disp_template.c
@@ -24,7 +24,7 @@
  **********************/
 static void disp_init(void);
 
-static void disp_flush(lv_disp_t * disp, const lv_area_t * area, lv_color_t * color_p);
+static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p);
 #if LV_USE_GPU
 static void mem_blend(lv_color_t * dest, const lv_color_t * src, uint32_t length, lv_opa_t opa);
 static void mem_fill(lv_color_t * dest, uint32_t length, lv_color_t color);
@@ -135,7 +135,7 @@ static void disp_init(void)
 /* Flush the content of the internal buffer the specific area on the display
  * You can use DMA or any hardware acceleration to do this operation in the background but
  * 'lv_disp_flush_ready()' has to be called when finished. */
-static void disp_flush(lv_disp_t * disp, const lv_area_t * area, lv_color_t * color_p)
+static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p)
 {
     /*The most simple case (but also the slowest) to put all pixels to the screen one-by-one*/
 
diff --git a/porting/lv_port_indev_template.c b/porting/lv_port_indev_template.c
index 98fe79b1d..2e243190f 100644
--- a/porting/lv_port_indev_template.c
+++ b/porting/lv_port_indev_template.c
@@ -24,25 +24,25 @@
  **********************/
 
 static void touchpad_init(void);
-static bool touchpad_read(lv_indev_t * indev, lv_indev_data_t * data);
+static bool touchpad_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
 static bool touchpad_is_pressed(void);
 static void touchpad_get_xy(lv_coord_t * x, lv_coord_t * y);
 
 static void mouse_init(void);
-static bool mouse_read(lv_indev_t * indev, lv_indev_data_t * data);
+static bool mouse_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
 static bool mouse_is_pressed(void);
 static void mouse_get_xy(lv_coord_t * x, lv_coord_t * y);
 
 static void keypad_init(void);
-static bool keypad_read(lv_indev_t * indev, lv_indev_data_t * data);
+static bool keypad_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
 static uint32_t keypad_get_key(void);
 
 static void encoder_init(void);
-static bool encoder_read(lv_indev_t * indev, lv_indev_data_t * data);
+static bool encoder_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
 static void encoder_handler(void);
 
 static void button_init(void);
-static bool button_read(lv_indev_t * indev, lv_indev_data_t * data);
+static bool button_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data);
 static int8_t button_get_pressed_id(void);
 static bool button_is_pressed(uint8_t id);
 
@@ -187,7 +187,7 @@ static void touchpad_init(void)
 }
 
 /* Will be called by the library to read the touchpad */
-static bool touchpad_read(lv_indev_t * indev, lv_indev_data_t * data)
+static bool touchpad_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
 {
     static lv_coord_t last_x = 0;
     static lv_coord_t last_y = 0;
@@ -237,7 +237,7 @@ static void mouse_init(void)
 }
 
 /* Will be called by the library to read the mouse */
-static bool mouse_read(lv_indev_t * indev, lv_indev_data_t * data)
+static bool mouse_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
 {
     /*Get the current x and y coordinates*/
     mouse_get_xy(&data->point.x, &data->point.y);
@@ -281,7 +281,7 @@ static void keypad_init(void)
 }
 
 /* Will be called by the library to read the mouse */
-static bool keypad_read(lv_indev_t * indev, lv_indev_data_t * data)
+static bool keypad_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
 {
     static uint32_t last_key = 0;
 
@@ -342,7 +342,7 @@ static void encoder_init(void)
 }
 
 /* Will be called by the library to read the encoder */
-static bool encoder_read(lv_indev_t * indev, lv_indev_data_t * data)
+static bool encoder_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
 {
 
     data->enc_diff = encoder_diff;
@@ -373,7 +373,7 @@ static void button_init(void)
 }
 
 /* Will be called by the library to read the button */
-static bool button_read(lv_indev_t * indev, lv_indev_data_t * data)
+static bool button_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
 {
 
     static uint8_t last_btn = 0;