Did some renaming and made a few simple fixes.basic_rs

9 files changed, 108 insertions, 107 deletions

diff --git a/Makefile.am b/Makefile.am
index 7ac4e10..f442ecf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ INCLUDE = -I$(abs_top_builddir)/include \
 AM_CPPFLAGS = $(CPPFLAGS) $(INCLUDE)
 AM_CPPFLAGS += -Werror -Wall
 
-AM_CFLAGS = -static -fPIC $(AM_CPPFLAGS) @GCOV_FLAGS@ -L/usr/local/lib
+AM_CFLAGS = -fPIC $(AM_CPPFLAGS) @GCOV_FLAGS@ -L/usr/local/lib
 
 include_HEADERS = \
 	include/erasurecode/alg_sig.h \
diff --git a/configure.ac b/configure.ac
index a6a73d3..5c80421 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,8 @@ dnl Needed when reconfiguring with 'autoreconf -i -s'
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_MAINTAINER_MODE([disable])
-#m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
-#AM_SILENT_RULES([yes])
+m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+AM_SILENT_RULES([yes])
 
 dnl Compiling with per-target flags requires AM_PROG_CC_C_O.
 AC_PROG_CC
diff --git a/include/erasurecode/erasurecode.h b/include/erasurecode/erasurecode.h
index cfceb7b..e40c164 100644
--- a/include/erasurecode/erasurecode.h
+++ b/include/erasurecode/erasurecode.h
@@ -46,7 +46,7 @@ typedef enum {
     EC_BACKEND_FLAT_XOR_HD            = 3,
     EC_BACKEND_ISA_L_RS_VAND          = 4,
     EC_BACKEND_SHSS                   = 5,
-    EC_BACKEND_LIBERASURECODE_RS_VAND = 6,
+    EC_BACKEND_INTERNAL_RS_VAND       = 6,
     EC_BACKENDS_MAX,
 } ec_backend_id_t;
 
diff --git a/include/rs_vand/rs_vand_internal.h b/include/rs_vand/rs_vand_internal.h
index a9e26a0..c545333 100644
--- a/include/rs_vand/rs_vand_internal.h
+++ b/include/rs_vand/rs_vand_internal.h
@@ -39,6 +39,6 @@ void print_matrix(int *matrix, int rows, int cols);
 void square_matrix_multiply(int *m1, int *m2, int *prod, int n);
 int create_decoding_matrix(int *gen_matrix, int *dec_matrix, int *missing_idxs, int k, int m);
 int is_identity_matrix(int *matrix, int n);
-int liberasurecode_rs_vand_encode(int *generator_matrix, char **data, char **parity, int k, int m, int blocksize);
-int liberasurecode_rs_vand_decode(int *generator_matrix, char **data, char **parity, int k, int m, int *missing, int blocksize, int rebuild_parity);
-int liberasurecode_rs_vand_reconstruct(int *generator_matrix, char **data, char **parity, int k, int m, int *missing, int destination_idx, int blocksize);
+int internal_rs_vand_encode(int *generator_matrix, char **data, char **parity, int k, int m, int blocksize);
+int internal_rs_vand_decode(int *generator_matrix, char **data, char **parity, int k, int m, int *missing, int blocksize, int rebuild_parity);
+int internal_rs_vand_reconstruct(int *generator_matrix, char **data, char **parity, int k, int m, int *missing, int destination_idx, int blocksize);
diff --git a/src/backends/rs_vand/rs_vand.c b/src/backends/rs_vand/rs_vand.c
index 22500ff..b709e13 100644
--- a/src/backends/rs_vand/rs_vand.c
+++ b/src/backends/rs_vand/rs_vand.c
@@ -31,32 +31,32 @@
 #include "erasurecode_backend.h"
 #include "erasurecode_helpers.h"
 
-#define LIBERASURECODE_RS_VAND_LIB_MAJOR 1
-#define LIBERASURECODE_RS_VAND_LIB_MINOR 0
-#define LIBERASURECODE_RS_VAND_LIB_REV   0
-#define LIBERASURECODE_RS_VAND_LIB_VER_STR "1.0"
-#define LIBERASURECODE_RS_VAND_LIB_NAME "liberasurecode_rsvand"
+#define INTERNAL_RS_VAND_LIB_MAJOR 1
+#define INTERNAL_RS_VAND_LIB_MINOR 0
+#define INTERNAL_RS_VAND_LIB_REV   0
+#define INTERNAL_RS_VAND_LIB_VER_STR "1.0"
+#define INTERNAL_RS_VAND_LIB_NAME "liberasurecode_rsvand"
 #if defined(__MACOS__) || defined(__MACOSX__) || defined(__OSX__) || defined(__APPLE__)
-#define LIBERASURECODE_RS_VAND_SO_NAME "liberasurecode_rsvand.dylib"
+#define INTERNAL_RS_VAND_SO_NAME "liberasurecode_rsvand.dylib"
 #else
-#define LIBERASURECODE_RS_VAND_SO_NAME "liberasurecode_rsvand.so"
+#define INTERNAL_RS_VAND_SO_NAME "liberasurecode_rsvand.so"
 #endif
 
 /* Forward declarations */
-struct ec_backend_op_stubs liberasurecode_rs_vand_ops;
-struct ec_backend liberasurecode_rs_vand;
-struct ec_backend_common backend_liberasurecode_rs_vand;
+struct ec_backend_op_stubs internal_rs_vand_ops;
+struct ec_backend internal_rs_vand;
+struct ec_backend_common backend_internal_rs_vand;
 
-typedef int (*liberasurecode_rs_vand_encode_func)(int *, char **, char **, int, int, int);
-typedef int (*liberasurecode_rs_vand_decode_func)(int *, char **, char **, int, int, int *, int, int);
-typedef int (*liberasurecode_rs_vand_reconstruct_func)(int *, char **, char **, int, int, int *, int, int);
+typedef int (*internal_rs_vand_encode_func)(int *, char **, char **, int, int, int);
+typedef int (*internal_rs_vand_decode_func)(int *, char **, char **, int, int, int *, int, int);
+typedef int (*internal_rs_vand_reconstruct_func)(int *, char **, char **, int, int, int *, int, int);
 typedef void (*init_rs_vand_func)(int, int);
 typedef void (*deinit_rs_vand_func)();
 typedef void (*free_systematic_matrix_func)(int *);
 typedef int* (*make_systematic_matrix_func)(int, int);
 
 
-struct liberasurecode_rs_vand_descriptor {
+struct internal_rs_vand_descriptor {
     /* calls required for init */
     init_rs_vand_func init_rs_vand; 
     deinit_rs_vand_func deinit_rs_vand;
@@ -64,13 +64,13 @@ struct liberasurecode_rs_vand_descriptor {
     make_systematic_matrix_func make_systematic_matrix;
  
     /* calls required for encode */
-    liberasurecode_rs_vand_encode_func liberasurecode_rs_vand_encode;
+    internal_rs_vand_encode_func internal_rs_vand_encode;
      
     /* calls required for decode */
-    liberasurecode_rs_vand_decode_func liberasurecode_rs_vand_decode; 
+    internal_rs_vand_decode_func internal_rs_vand_decode; 
     
     /* calls required for reconstruct */
-    liberasurecode_rs_vand_reconstruct_func liberasurecode_rs_vand_reconstruct;
+    internal_rs_vand_reconstruct_func internal_rs_vand_reconstruct;
 
     /* fields needed to hold state */
     int *matrix;
@@ -79,49 +79,49 @@ struct liberasurecode_rs_vand_descriptor {
     int w;
 };
 
-static int liberasurecode_rs_vand_encode(void *desc, char **data, char **parity,
+static int internal_rs_vand_encode(void *desc, char **data, char **parity,
         int blocksize)
 {
-    struct liberasurecode_rs_vand_descriptor *rs_vand_desc = 
-        (struct liberasurecode_rs_vand_descriptor*) desc;
+    struct internal_rs_vand_descriptor *rs_vand_desc = 
+        (struct internal_rs_vand_descriptor*) desc;
 
     /* FIXME: Should this return something? */
-    rs_vand_desc->liberasurecode_rs_vand_encode(rs_vand_desc->matrix, data, parity,
+    rs_vand_desc->internal_rs_vand_encode(rs_vand_desc->matrix, data, parity,
         rs_vand_desc->k, rs_vand_desc->m, blocksize);
     return 0;
 }
 
-static int liberasurecode_rs_vand_decode(void *desc, char **data, char **parity,
+static int internal_rs_vand_decode(void *desc, char **data, char **parity,
         int *missing_idxs, int blocksize)
 {
-    struct liberasurecode_rs_vand_descriptor *rs_vand_desc = 
-        (struct liberasurecode_rs_vand_descriptor*) desc;
+    struct internal_rs_vand_descriptor *rs_vand_desc = 
+        (struct internal_rs_vand_descriptor*) desc;
 
     /* FIXME: Should this return something? */
-    rs_vand_desc->liberasurecode_rs_vand_decode(rs_vand_desc->matrix, data, parity, 
+    rs_vand_desc->internal_rs_vand_decode(rs_vand_desc->matrix, data, parity, 
         rs_vand_desc->k, rs_vand_desc->m, missing_idxs, blocksize, 1);
 
     return 0;
 }
 
-static int liberasurecode_rs_vand_reconstruct(void *desc, char **data, char **parity,
+static int internal_rs_vand_reconstruct(void *desc, char **data, char **parity,
         int *missing_idxs, int destination_idx, int blocksize)
 {
-    struct liberasurecode_rs_vand_descriptor *rs_vand_desc = 
-        (struct liberasurecode_rs_vand_descriptor*) desc;
+    struct internal_rs_vand_descriptor *rs_vand_desc = 
+        (struct internal_rs_vand_descriptor*) desc;
 
     /* FIXME: Should this return something? */
-    rs_vand_desc->liberasurecode_rs_vand_reconstruct(rs_vand_desc->matrix, data, parity, 
+    rs_vand_desc->internal_rs_vand_reconstruct(rs_vand_desc->matrix, data, parity, 
         rs_vand_desc->k, rs_vand_desc->m, missing_idxs, destination_idx, blocksize);
 
     return 0;
 }
 
-static int liberasurecode_rs_vand_min_fragments(void *desc, int *missing_idxs,
+static int internal_rs_vand_min_fragments(void *desc, int *missing_idxs,
         int *fragments_to_exclude, int *fragments_needed)
 {
-    struct liberasurecode_rs_vand_descriptor *rs_vand_desc = 
-        (struct liberasurecode_rs_vand_descriptor*)desc;
+    struct internal_rs_vand_descriptor *rs_vand_desc = 
+        (struct internal_rs_vand_descriptor*)desc;
 
     uint64_t exclude_bm = convert_list_to_bitmap(fragments_to_exclude);
     uint64_t missing_bm = convert_list_to_bitmap(missing_idxs) | exclude_bm;
@@ -144,13 +144,13 @@ static int liberasurecode_rs_vand_min_fragments(void *desc, int *missing_idxs,
     return ret;
 }
 
-static void * liberasurecode_rs_vand_init(struct ec_backend_args *args,
+static void * internal_rs_vand_init(struct ec_backend_args *args,
         void *backend_sohandle)
 {
-    struct liberasurecode_rs_vand_descriptor *desc = NULL;
+    struct internal_rs_vand_descriptor *desc = NULL;
     
-    desc = (struct liberasurecode_rs_vand_descriptor *)
-           malloc(sizeof(struct liberasurecode_rs_vand_descriptor));
+    desc = (struct internal_rs_vand_descriptor *)
+           malloc(sizeof(struct internal_rs_vand_descriptor));
     if (NULL == desc) {
         return NULL;
     }
@@ -177,9 +177,9 @@ static void * liberasurecode_rs_vand_init(struct ec_backend_args *args,
         deinit_rs_vand_func deinitp;
         free_systematic_matrix_func freematrixp;
         make_systematic_matrix_func makematrixp;
-        liberasurecode_rs_vand_encode_func encodep;
-        liberasurecode_rs_vand_decode_func decodep;
-        liberasurecode_rs_vand_reconstruct_func reconstructp;
+        internal_rs_vand_encode_func encodep;
+        internal_rs_vand_decode_func decodep;
+        internal_rs_vand_reconstruct_func reconstructp;
         void *vptr;
     } func_handle = {.vptr = NULL};
 
@@ -214,23 +214,23 @@ static void * liberasurecode_rs_vand_init(struct ec_backend_args *args,
     }
     
     func_handle.vptr = NULL;
-    func_handle.vptr = dlsym(backend_sohandle, "liberasurecode_rs_vand_encode");
-    desc->liberasurecode_rs_vand_encode = func_handle.encodep;
-    if (NULL == desc->liberasurecode_rs_vand_encode) {
+    func_handle.vptr = dlsym(backend_sohandle, "internal_rs_vand_encode");
+    desc->internal_rs_vand_encode = func_handle.encodep;
+    if (NULL == desc->internal_rs_vand_encode) {
         goto error; 
     }
     
     func_handle.vptr = NULL;
-    func_handle.vptr = dlsym(backend_sohandle, "liberasurecode_rs_vand_decode");
-    desc->liberasurecode_rs_vand_decode = func_handle.decodep;
-    if (NULL == desc->liberasurecode_rs_vand_decode) {
+    func_handle.vptr = dlsym(backend_sohandle, "internal_rs_vand_decode");
+    desc->internal_rs_vand_decode = func_handle.decodep;
+    if (NULL == desc->internal_rs_vand_decode) {
         goto error; 
     }
     
     func_handle.vptr = NULL;
-    func_handle.vptr = dlsym(backend_sohandle, "liberasurecode_rs_vand_reconstruct");
-    desc->liberasurecode_rs_vand_reconstruct = func_handle.reconstructp;
-    if (NULL == desc->liberasurecode_rs_vand_reconstruct) {
+    func_handle.vptr = dlsym(backend_sohandle, "internal_rs_vand_reconstruct");
+    desc->internal_rs_vand_reconstruct = func_handle.reconstructp;
+    if (NULL == desc->internal_rs_vand_reconstruct) {
         goto error; 
     }
   
@@ -258,20 +258,20 @@ error:
  * Returns the size in bits!
  */
 static int
-liberasurecode_rs_vand_element_size(void* desc)
+internal_rs_vand_element_size(void* desc)
 {
-    struct liberasurecode_rs_vand_descriptor *rs_vand_desc = NULL;
+    struct internal_rs_vand_descriptor *rs_vand_desc = NULL;
     
-    rs_vand_desc = (struct liberasurecode_rs_vand_descriptor*) desc;
+    rs_vand_desc = (struct internal_rs_vand_descriptor*) desc;
 
     return rs_vand_desc->w;
 }
 
-static int liberasurecode_rs_vand_exit(void *desc)
+static int internal_rs_vand_exit(void *desc)
 {
-    struct liberasurecode_rs_vand_descriptor *rs_vand_desc = NULL;
+    struct internal_rs_vand_descriptor *rs_vand_desc = NULL;
     
-    rs_vand_desc = (struct liberasurecode_rs_vand_descriptor*) desc;
+    rs_vand_desc = (struct internal_rs_vand_descriptor*) desc;
 
     rs_vand_desc->free_systematic_matrix(rs_vand_desc->matrix);
     rs_vand_desc->deinit_rs_vand();
@@ -284,29 +284,29 @@ static int liberasurecode_rs_vand_exit(void *desc)
  * For the time being, we only claim compatibility with versions that
  * match exactly
  */
-static bool liberasurecode_rs_vand_is_compatible_with(uint32_t version) {
-    return version == backend_liberasurecode_rs_vand.ec_backend_version;
+static bool internal_rs_vand_is_compatible_with(uint32_t version) {
+    return version == backend_internal_rs_vand.ec_backend_version;
 }
 
-struct ec_backend_op_stubs liberasurecode_rs_vand_op_stubs = {
-    .INIT                       = liberasurecode_rs_vand_init,
-    .EXIT                       = liberasurecode_rs_vand_exit,
-    .ENCODE                     = liberasurecode_rs_vand_encode,
-    .DECODE                     = liberasurecode_rs_vand_decode,
-    .FRAGSNEEDED                = liberasurecode_rs_vand_min_fragments,
-    .RECONSTRUCT                = liberasurecode_rs_vand_reconstruct,
-    .ELEMENTSIZE                = liberasurecode_rs_vand_element_size,
-    .ISCOMPATIBLEWITH           = liberasurecode_rs_vand_is_compatible_with,
+struct ec_backend_op_stubs internal_rs_vand_op_stubs = {
+    .INIT                       = internal_rs_vand_init,
+    .EXIT                       = internal_rs_vand_exit,
+    .ENCODE                     = internal_rs_vand_encode,
+    .DECODE                     = internal_rs_vand_decode,
+    .FRAGSNEEDED                = internal_rs_vand_min_fragments,
+    .RECONSTRUCT                = internal_rs_vand_reconstruct,
+    .ELEMENTSIZE                = internal_rs_vand_element_size,
+    .ISCOMPATIBLEWITH           = internal_rs_vand_is_compatible_with,
 };
 
-struct ec_backend_common backend_liberasurecode_rs_vand = {
-    .id                         = EC_BACKEND_LIBERASURECODE_RS_VAND,
-    .name                       = LIBERASURECODE_RS_VAND_LIB_NAME,
-    .soname                     = LIBERASURECODE_RS_VAND_SO_NAME,
-    .soversion                  = LIBERASURECODE_RS_VAND_LIB_VER_STR,
-    .ops                        = &liberasurecode_rs_vand_op_stubs,
+struct ec_backend_common backend_internal_rs_vand = {
+    .id                         = EC_BACKEND_INTERNAL_RS_VAND,
+    .name                       = INTERNAL_RS_VAND_LIB_NAME,
+    .soname                     = INTERNAL_RS_VAND_SO_NAME,
+    .soversion                  = INTERNAL_RS_VAND_LIB_VER_STR,
+    .ops                        = &internal_rs_vand_op_stubs,
     .backend_metadata_size      = 0,
-    .ec_backend_version         = _VERSION(LIBERASURECODE_RS_VAND_LIB_MAJOR,
-                                           LIBERASURECODE_RS_VAND_LIB_MINOR,
-                                           LIBERASURECODE_RS_VAND_LIB_REV),
+    .ec_backend_version         = _VERSION(INTERNAL_RS_VAND_LIB_MAJOR,
+                                           INTERNAL_RS_VAND_LIB_MINOR,
+                                           INTERNAL_RS_VAND_LIB_REV),
 };
diff --git a/src/builtin/rs_vand/rs_vand_internal.c b/src/builtin/rs_vand/rs_vand_internal.c
index 61b31de..2770908 100644
--- a/src/builtin/rs_vand/rs_vand_internal.c
+++ b/src/builtin/rs_vand/rs_vand_internal.c
@@ -398,7 +398,7 @@ void region_dot_product(char **from_bufs, char *to_buf, int *matrix_row, int num
   }
 }
 
-int liberasurecode_rs_vand_encode(int *generator_matrix, char **data, char **parity, int k, int m, int blocksize)
+int internal_rs_vand_encode(int *generator_matrix, char **data, char **parity, int k, int m, int blocksize)
 {
   int i;
   int n = k + m;
@@ -425,7 +425,7 @@ char **get_first_k_available(char **data, char **parity, int *missing, int k)
   return first_k_available;
 }
 
-int liberasurecode_rs_vand_decode(int *generator_matrix, char **data, char **parity, int k, int m, int *missing, int blocksize, int rebuild_parity)
+int internal_rs_vand_decode(int *generator_matrix, char **data, char **parity, int k, int m, int *missing, int blocksize, int rebuild_parity)
 {
   int *decoding_matrix = NULL;
   int *inverse_decoding_matrix = NULL;
@@ -480,7 +480,7 @@ int liberasurecode_rs_vand_decode(int *generator_matrix, char **data, char **par
   return 0;
 }
 
-int liberasurecode_rs_vand_reconstruct(int *generator_matrix, char **data, char **parity, int k, int m, int *missing, int destination_idx, int blocksize)
+int internal_rs_vand_reconstruct(int *generator_matrix, char **data, char **parity, int k, int m, int *missing, int destination_idx, int blocksize)
 {
   int *decoding_matrix = NULL;
   int *inverse_decoding_matrix = NULL;
diff --git a/src/erasurecode.c b/src/erasurecode.c
index 82874ea..3c9e123 100644
--- a/src/erasurecode.c
+++ b/src/erasurecode.c
@@ -44,7 +44,7 @@ extern struct ec_backend_common backend_jerasure_rs_vand;
 extern struct ec_backend_common backend_jerasure_rs_cauchy;
 extern struct ec_backend_common backend_isa_l_rs_vand;
 extern struct ec_backend_common backend_shss;
-extern struct ec_backend_common backend_liberasurecode_rs_vand;
+extern struct ec_backend_common backend_internal_rs_vand;
 
 ec_backend_t ec_backends_supported[] = {
     (ec_backend_t) &backend_null,
@@ -53,7 +53,7 @@ ec_backend_t ec_backends_supported[] = {
     (ec_backend_t) &backend_flat_xor_hd,
     (ec_backend_t) &backend_isa_l_rs_vand,
     (ec_backend_t) &backend_shss,
-    (ec_backend_t) &backend_liberasurecode_rs_vand,
+    (ec_backend_t) &backend_internal_rs_vand,
     NULL,
 };
 
diff --git a/test/builtin/rs_vand/rs_vand_internal_test.c b/test/builtin/rs_vand/rs_vand_internal_test.c
index 6b8ed45..139c91f 100644
--- a/test/builtin/rs_vand/rs_vand_internal_test.c
+++ b/test/builtin/rs_vand/rs_vand_internal_test.c
@@ -149,7 +149,7 @@ int test_encode_decode(int k, int m, int num_missing, int blocksize)
   }
   
   // Encode
-  liberasurecode_rs_vand_encode(matrix, data, parity, k, m, blocksize); 
+  internal_rs_vand_encode(matrix, data, parity, k, m, blocksize); 
 
   // Copy data and parity
   for (i = 0;i < num_missing; i++) {
@@ -172,7 +172,7 @@ int test_encode_decode(int k, int m, int num_missing, int blocksize)
   }
   
   // Decode and check
-  liberasurecode_rs_vand_decode(matrix, data, parity, k, m, missing, blocksize, 1);
+  internal_rs_vand_decode(matrix, data, parity, k, m, missing, blocksize, 1);
 
   for (i = 0; i < num_missing; i++) {
     int idx = missing[i];
@@ -232,7 +232,7 @@ int test_reconstruct(int k, int m, int num_missing, int blocksize)
   }
   
   // Encode
-  liberasurecode_rs_vand_encode(matrix, data, parity, k, m, blocksize); 
+  internal_rs_vand_encode(matrix, data, parity, k, m, blocksize); 
 
   // Copy data and parity
   for (i = 0; i < num_missing; i++) {
@@ -258,7 +258,7 @@ int test_reconstruct(int k, int m, int num_missing, int blocksize)
   }
   
   // Reconstruct and check destination buffer
-  liberasurecode_rs_vand_reconstruct(matrix, data, parity, k, m, missing, destination_idx, blocksize);
+  internal_rs_vand_reconstruct(matrix, data, parity, k, m, missing, destination_idx, blocksize);
 
   // The original copy of the destination buffer is in the 0th buffer (see above)
   if (destination_idx < k) { 
diff --git a/test/liberasurecode_test.c b/test/liberasurecode_test.c
index e1e79cf..18bff4b 100644
--- a/test/liberasurecode_test.c
+++ b/test/liberasurecode_test.c
@@ -278,7 +278,7 @@ char * get_name_from_backend_id(ec_backend_id_t be) {
             return ISA_L_RS_VAND_BACKEND;
         case EC_BACKEND_SHSS:
             return SHSS_BACKEND;
-        case EC_BACKEND_LIBERASURECODE_RS_VAND:
+        case EC_BACKEND_INTERNAL_RS_VAND:
             return RS_VAND_BACKEND;
         default:
             return "UNKNOWN";
@@ -302,7 +302,7 @@ struct ec_args *create_ec_args(ec_backend_id_t be, ec_checksum_type_t ct, int ba
         case EC_BACKEND_JERASURE_RS_CAUCHY:
             backend_args_array = jerasure_rs_cauchy_test_args;
             break;
-        case EC_BACKEND_LIBERASURECODE_RS_VAND:
+        case EC_BACKEND_INTERNAL_RS_VAND:
             backend_args_array = internal_rs_vand_test_args;
             break;
         case EC_BACKEND_FLAT_XOR_HD:
@@ -462,6 +462,7 @@ static void test_create_and_destroy_backend(
         fprintf (stderr, "Backend library not available!\n");
         return;
     }
+    fprintf(stderr, "HI: %d\n", desc);
     assert(desc > 0);
     assert(0 == liberasurecode_instance_destroy(desc));
 }
@@ -1831,63 +1832,63 @@ struct testcase testcases[] = {
     // Internal RS Vand backend tests
     {"create_and_destroy_backend",
         test_create_and_destroy_backend,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"simple_encode_internal_rs_vand",
         test_simple_encode_decode,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"decode_with_missing_data_internal_rs_vand",
         test_decode_with_missing_data,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"decode_with_missing_multi_data_internal_rs_vand",
         test_decode_with_missing_multi_data,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"decode_with_missing_multi_parity_internal_rs_vand",
         test_decode_with_missing_multi_parity,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"test_decode_with_missing_multi_data_parity_internal_rs_vand",
         test_decode_with_missing_multi_data_parity,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"simple_reconstruct_internal_rs_vand",
         test_simple_reconstruct,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"test_fragments_needed_internal_rs_vand",
         test_fragments_needed,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"test_get_fragment_metadata_internal_rs_vand",
         test_get_fragment_metadata,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_NONE,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_NONE,
         .skip = false},
     {"test_get_fragment_metadata_internal_rs_vand_crc32",
         test_get_fragment_metadata,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
         .skip = false},
     {"test_verify_stripe_metadata",
         test_verify_stripe_metadata,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
         .skip = false},
     {"test_verify_stripe_metadata_libec_mismatch",
          test_verify_stripe_metadata_libec_mismatch,
-         EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+         EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
          .skip = false},
     {"test_verify_stripe_metadata_magic_mismatch",
           test_verify_stripe_metadata_magic_mismatch,
-          EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+          EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
          .skip = false},
     {"test_verify_stripe_metadata_be_id_mismatch",
          test_verify_stripe_metadata_be_id_mismatch,
-         EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+         EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
          .skip = false},
     {"test_verify_stripe_metadata_be_ver_mismatch",
         test_verify_stripe_metadata_be_ver_mismatch,
-        EC_BACKEND_LIBERASURECODE_RS_VAND, CHKSUM_CRC32,
+        EC_BACKEND_INTERNAL_RS_VAND, CHKSUM_CRC32,
         .skip = false},
     { NULL, NULL, 0, 0, false },
 };