diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index 810ec67ccff..54e8cc5e3cc 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -729,7 +729,7 @@ pan_alloc_staging(struct panfrost_context *ctx, struct panfrost_resource *rsc,
 }
 
 static void
-pan_blit_from_staging(struct pipe_context *pctx, struct panfrost_gtransfer *trans)
+pan_blit_from_staging(struct pipe_context *pctx, struct panfrost_transfer *trans)
 {
         struct pipe_resource *dst = trans->base.resource;
         struct pipe_blit_info blit = {0};
@@ -749,7 +749,7 @@ pan_blit_from_staging(struct pipe_context *pctx, struct panfrost_gtransfer *tran
 }
 
 static void
-pan_blit_to_staging(struct pipe_context *pctx, struct panfrost_gtransfer *trans)
+pan_blit_to_staging(struct pipe_context *pctx, struct panfrost_transfer *trans)
 {
         struct pipe_resource *src = trans->base.resource;
         struct pipe_blit_info blit = {0};
@@ -786,7 +786,7 @@ panfrost_ptr_map(struct pipe_context *pctx,
         if ((usage & PIPE_MAP_DIRECTLY) && rsrc->modifier != DRM_FORMAT_MOD_LINEAR)
                 return NULL;
 
-        struct panfrost_gtransfer *transfer = rzalloc(pctx, struct panfrost_gtransfer);
+        struct panfrost_transfer *transfer = rzalloc(pctx, struct panfrost_transfer);
         transfer->base.level = level;
         transfer->base.usage = usage;
         transfer->base.box = *box;
@@ -984,7 +984,7 @@ panfrost_ptr_unmap(struct pipe_context *pctx,
 {
         /* Gallium expects writeback here, so we tile */
 
-        struct panfrost_gtransfer *trans = pan_transfer(transfer);
+        struct panfrost_transfer *trans = pan_transfer(transfer);
         struct panfrost_resource *prsrc = (struct panfrost_resource *) transfer->resource;
         struct panfrost_device *dev = pan_device(pctx->screen);
 
diff --git a/src/gallium/drivers/panfrost/pan_resource.h b/src/gallium/drivers/panfrost/pan_resource.h
index 009f13c0f86..121a7ab6f08 100644
--- a/src/gallium/drivers/panfrost/pan_resource.h
+++ b/src/gallium/drivers/panfrost/pan_resource.h
@@ -82,7 +82,7 @@ pan_resource(struct pipe_resource *p)
         return (struct panfrost_resource *)p;
 }
 
-struct panfrost_gtransfer {
+struct panfrost_transfer {
         struct pipe_transfer base;
         void *map;
         struct {
@@ -91,10 +91,10 @@ struct panfrost_gtransfer {
         } staging;
 };
 
-static inline struct panfrost_gtransfer *
+static inline struct panfrost_transfer *
 pan_transfer(struct pipe_transfer *p)
 {
-        return (struct panfrost_gtransfer *)p;
+        return (struct panfrost_transfer *)p;
 }
 
 mali_ptr