diff --git a/tests/bench_libstl/bench_libstl.pro b/tests/bench_libstl/bench_libstl.pro
index 45dd3a5..3e9b1c5 100644
--- a/tests/bench_libstl/bench_libstl.pro
+++ b/tests/bench_libstl/bench_libstl.pro
@@ -3,7 +3,7 @@ include(../../qmake.build/config.pri)
 TEMPLATE = app
 TARGET = bench_libstl$$TARGET_SUFFIX
 
-INCLUDEPATH += $$FOUG_DATAEX_ROOT/include
+INCLUDEPATH += $$FOUG_DATAX_ROOT/include
 
 HEADERS += ../commons/bench_tools.h
 
@@ -13,5 +13,5 @@ SOURCES += \
 
 DEFINES += FOUG_USE_STDINT_H
 
-LIBS *= -L$$FOUG_DATAEX_ROOT/lib -lfougstl-c$$TARGET_SUFFIX
-QMAKE_RPATHDIR *= $$FOUG_DATAEX_ROOT/lib
+LIBS *= -L$$FOUG_DATAX_ROOT/lib -lfougdatax-c$$TARGET_SUFFIX
+QMAKE_RPATHDIR *= $$FOUG_DATAX_ROOT/lib
diff --git a/tests/bench_libstl/main.c b/tests/bench_libstl/main.c
index 8b981ca..0c62f86 100644
--- a/tests/bench_libstl/main.c
+++ b/tests/bench_libstl/main.c
@@ -1,4 +1,6 @@
-#include <dataex/c/libstl/stlb_read.h>
+#include <datax/c/libstl/stla_read.h>
+#include <datax/c/libstl/stlb_read.h>
+#include <datax/c/error.h>
 
 #include "../commons/bench_tools.h"
 #include <stdio.h>
@@ -12,52 +14,74 @@ typedef struct my_igeom
 static void dummy_process_next_triangle(foug_stlb_geom_input_t* igeom,
                                         const foug_stlb_triangle_t* triangle)
 {
-  my_igeom_t* my_igeom = (my_igeom_t*)foug_stlb_geom_input_get_cookie(igeom);
+  my_igeom_t* my_igeom = (my_igeom_t*)(igeom->cookie);
   if (my_igeom != NULL)
     ++(my_igeom->facet_count);
 }
 
 static void libstl_foug_stlb_read(const char* filepath)
 {
-  FILE* file = fopen(filepath, "r");
+  FILE* file = fopen(filepath, "rb");
   if (file == NULL) {
-    fprintf(stderr, "Failed to open STL file %s\n", filepath);
+    fprintf(stderr, "Failed to open binary STL file %s\n", filepath);
     return;
   }
 
-  foug_stlb_geom_input_manip_t igeom_manip;
-  memset(&igeom_manip, 0, sizeof(foug_stlb_geom_input_manip_t));
-/*  igeom_manip.process_header_func = igeom_process_header; */
-/*  igeom_manip.begin_triangles_func = igeom_begin_triangles; */
-  igeom_manip.process_next_triangle_func = dummy_process_next_triangle;
-/*  igeom_manip.end_triangles_func = NULL; */
+  my_igeom_t cookie;
+  cookie.facet_count = 0;
+  foug_stlb_geom_input_t geom;
+  memset(&geom, 0, sizeof(foug_stlb_geom_input_t));
+  geom.cookie = &cookie;
+  geom.process_next_triangle_func = dummy_process_next_triangle;
 
-  my_igeom_t igeom;
-  igeom.facet_count = 0;
+  foug_transfer_t trsf;
+  memset(&trsf, 0, sizeof(foug_transfer_t));
+  foug_stream_set_stdio(&trsf.stream, file);
+  trsf.buffer = (uint8_t*)malloc(512 * 1024);
+  trsf.buffer_size = 512 * 1024;
 
-  foug_stlb_read_args_t args;
-  args.geom_input = foug_stlb_geom_input_create(malloc, &igeom, igeom_manip);
-  args.stream = foug_stream_create(&malloc, file, foug_stream_manip_stdio());;
-  args.task_control = NULL;
-
-  args.buffer = (uint8_t*)malloc(512 * 1024);
-  args.buffer_size = 512 * 1024;
-
-  int result = foug_stlb_read(args);
-  if (result != FOUG_STLB_READ_NO_ERROR)
+  const int result = foug_stlb_read(&geom, &trsf, FOUG_LITTLE_ENDIAN);
+  if (foug_datax_error(result))
     fprintf(stderr, "foug_stlb_read() error %i", result);
 
-  fprintf(stdout, "Facet count: %i\n", igeom.facet_count);
+  fprintf(stdout, "Facet count: %i\n", cookie.facet_count);
+
+  free(trsf.buffer);
+  fclose(file);
+}
+
+static void libstl_foug_stla_read(const char* filepath)
+{
+  FILE* file = fopen(filepath, "r");
+  if (file == NULL) {
+    fprintf(stderr, "Failed to open ascii STL file %s\n", filepath);
+    return;
+  }
+
+  foug_transfer_t trsf;
+  memset(&trsf, 0, sizeof(foug_transfer_t));
+  foug_stream_set_stdio(&trsf.stream, file);
+  trsf.buffer = (char*)malloc(512 * 1024);
+  trsf.buffer_size = 512 * 1024;
+
+  const int result = foug_stla_read(NULL, &trsf, 0);
+  if (foug_datax_error(result))
+    fprintf(stderr, "foug_stla_read() error %i", result);
+
+  /* fprintf(stdout, "Facet count: %i\n", igeom.facet_count); */
 
-  free(args.geom_input);
-  free(args.stream);
-  free(args.buffer);
   fclose(file);
 }
 
 int main(int argc, char** argv)
 {
-  if (argc > 1)
-    benchmark(&libstl_foug_stlb_read, "foug_stlb_read()", argc - 1, argv + 1);
+  if (argc < 3)
+    return -1;
+
+  if (strcmp(argv[1], "--stla") == 0)
+    benchmark(&libstl_foug_stla_read, "foug_stla_read()", argc - 2, argv + 2);
+  else if (strcmp(argv[1], "--stlb") == 0)
+    benchmark(&libstl_foug_stlb_read, "foug_stlb_read()", argc - 2, argv + 2);
+
   return 0;
 }