diff --git a/st_graphite_api.h b/st_graphite_api.h
index ffaa3a2..2af7dfa 100644
--- a/st_graphite_api.h
+++ b/st_graphite_api.h
@@ -82,21 +82,21 @@
 
 /* GCS MODULES */
 
-struct graphite_modinfo {
+struct gcs_module_info {
     /* st_hw_session_gcs.c line 632 */
-    unsigned int MID;
-    unsigned int IID;
+    uint32_t MID;
+    uint32_t IID;
 };
 
 struct gcs_module_param_info { /* st_hw_session_gcs line 522 */
-    struct graphite_modinfo module_info;
-    unsigned int PID; /* st_hw_session_gcs.c line 206 */
+    struct gcs_module_info module_info;
+    uint32_t PID; /* st_hw_session_gcs.c line 206 */
 };
 
 struct gcs_event_rsp {
     struct gcs_module_param_info module_param_info;
+    uint32_t payload_size;
     void *payload;
-    uint32_t payload_size; /* 32bits?? */
 };
 
 /* MODULES END */
diff --git a/st_hw_session_gcs.c b/st_hw_session_gcs.c
index cc29a20..4a41dc9 100644
--- a/st_hw_session_gcs.c
+++ b/st_hw_session_gcs.c
@@ -113,7 +113,7 @@
 /* Line 242: gcs_data_cmdrsp_cb */
 typedef int32_t(*data_cmd_cb_ptr)(uint32_t graph_handle,
     void *rsp,
-    size_t rsp_size,
+    uint32_t rsp_size,
     void *cookie, int32_t cmd_status);
 
 /* gcs functions loaded from dynamic library */