diff --git a/tests/test_stl_internal.c b/tests/test_stl_internal.c
index 3b1a564..96585d9 100644
--- a/tests/test_stl_internal.c
+++ b/tests/test_stl_internal.c
@@ -36,17 +36,17 @@ const char* test_stl_internal__rw_common()
         UTEST_ASSERT(error == GMIO_ERROR_NULL_TRANSFER);
 
         UTEST_ASSERT(!gmio_check_transfer(&error, &trsf));
-        UTEST_ASSERT(error == GMIO_ERROR_NULL_BUFFER);
+        UTEST_ASSERT(error == GMIO_ERROR_NULL_MEMBLOCK);
 
-        trsf.buffer = gmio_memblock(&buff[0], 0, NULL);
+        trsf.memblock = gmio_memblock(&buff[0], 0, NULL);
         UTEST_ASSERT(!gmio_check_transfer(&error, &trsf));
-        UTEST_ASSERT(error == GMIO_ERROR_INVALID_BUFFER_SIZE);
+        UTEST_ASSERT(error == GMIO_ERROR_INVALID_MEMBLOCK_SIZE);
 
         /* Verify that gmio_check_transfer() doesn't touch error when in case of
          * success */
-        trsf.buffer = gmio_memblock(&buff[0], sizeof(buff), NULL);
+        trsf.memblock = gmio_memblock(&buff[0], sizeof(buff), NULL);
         UTEST_ASSERT(!gmio_check_transfer(&error, &trsf));
-        UTEST_ASSERT(error == GMIO_ERROR_INVALID_BUFFER_SIZE);
+        UTEST_ASSERT(error == GMIO_ERROR_INVALID_MEMBLOCK_SIZE);
 
         error = GMIO_ERROR_OK;
         UTEST_ASSERT(gmio_check_transfer(&error, &trsf));
@@ -87,12 +87,12 @@ const char* test_stl_internal__rw_common()
         UTEST_ASSERT(error == GMIO_ERROR_NULL_TRANSFER);
 
         error = GMIO_ERROR_OK;
-        trsf.buffer = gmio_memblock(&buff[0], GMIO_STLB_MIN_CONTENTS_SIZE / 2, NULL);
+        trsf.memblock = gmio_memblock(&buff[0], GMIO_STLB_MIN_CONTENTS_SIZE / 2, NULL);
         UTEST_ASSERT(!gmio_stlb_check_params(&error, &trsf, GMIO_ENDIANNESS_HOST));
-        UTEST_ASSERT(error == GMIO_ERROR_INVALID_BUFFER_SIZE);
+        UTEST_ASSERT(error == GMIO_ERROR_INVALID_MEMBLOCK_SIZE);
 
         error = GMIO_ERROR_OK;
-        trsf.buffer = gmio_memblock(&buff[0], sizeof(buff), NULL);
+        trsf.memblock = gmio_memblock(&buff[0], sizeof(buff), NULL);
         UTEST_ASSERT(gmio_stlb_check_params(&error, &trsf, GMIO_ENDIANNESS_HOST));
         UTEST_ASSERT(error == GMIO_ERROR_OK);