diff --git a/.gitignore b/.gitignore
index 4969575..f0af9d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,8 @@ tests/lv2ftpc
 tests/*.cfg
 debian/libsntl.substvars
 lib/libsxmp.pc
+compile
+test-driver
+*.pem
+debian/libsxmp-dev/
+debian/libsxmp/
diff --git a/lib/link.c b/lib/link.c
index 3af06f4..a03ae90 100644
--- a/lib/link.c
+++ b/lib/link.c
@@ -207,7 +207,7 @@ static long __cmp_cstr(const void *a, const void *b)
   return (long)strcmp((const char *)a, (const char *)b);
 }
 
-int links_init(sxhub_t *ssys)
+int sxhub_init(sxhub_t *ssys)
 {
   int r = 0;
 
@@ -250,7 +250,7 @@ int links_init(sxhub_t *ssys)
   return r;
 }
 
-int links_free(sxhub_t *ssys)
+int sxhub_free(sxhub_t *ssys)
 {
   __destroy_rpc_list_tree(ssys->system_rpc->rpc_tree);
   free(ssys->system_rpc->rpc_tree);
@@ -262,15 +262,15 @@ int links_free(sxhub_t *ssys)
   return 0;
 }
 
-int links_destroy(sxhub_t *ssys)
+int sxhub_destroy(sxhub_t *ssys)
 {
-  int r = links_free(ssys);
+  int r = sxhub_free(ssys);
   free(ssys);
 
   return r;
 }
 
-sxhub_t *links_create(void)
+sxhub_t *sxhub_create(void)
 {
   int r = 0;
   sxhub_t *nsys = malloc(sizeof(sxhub_t));
@@ -280,7 +280,7 @@ sxhub_t *links_create(void)
     return NULL;
   }
 
-  r = links_init(nsys);
+  r = sxhub_init(nsys);
   if(r) {
     errno = r;
     free(nsys);
@@ -290,7 +290,7 @@ sxhub_t *links_create(void)
   return nsys;
 }
 
-int links_setsslserts(sxhub_t *ssys, const char *rootca,
+int sxhub_setsslserts(sxhub_t *ssys, const char *rootca,
                             const char *certpem, const char *certkey)
 {
   int r = ENOMEM;
diff --git a/lib/rpc.c b/lib/rpc.c
index 0b4b97e..9025b79 100644
--- a/lib/rpc.c
+++ b/lib/rpc.c
@@ -29,13 +29,13 @@ static long __cmp_cstr(const void *a, const void *b)
   return strcmp((char *)a, (char *)b);
 }
 
-int sntl_rpclist_init(usrtc_t *tree)
+int sxmp_rpclist_init(usrtc_t *tree)
 {
   usrtc_init(tree, USRTC_REDBLACK, MAX_RPC_LIST, __cmp_int);
   return 0;
 }
 
-int sntl_rpclist_add(usrtc_t *tree, int type, const char *description,
+int sxmp_rpclist_add(usrtc_t *tree, int type, const char *description,
                      const char *version)
 {
   rpc_typed_list_t *nlist = NULL;
@@ -81,7 +81,7 @@ int sntl_rpclist_add(usrtc_t *tree, int type, const char *description,
   return r;
 }
 
-int sntl_rpclist_add_function(usrtc_t *tree, int type, const char *fu_name,
+int sxmp_rpclist_add_function(usrtc_t *tree, int type, const char *fu_name,
                               int (*rpcf)(void *, sexp_t *))
 {
   usrtc_node_t *node;
@@ -112,7 +112,7 @@ int sntl_rpclist_add_function(usrtc_t *tree, int type, const char *fu_name,
   return 0;
 }
 
-int sntl_rpclist_filter(usrtc_t *source, usrtc_t **dest, int flag, int *filter)
+int sxmp_rpclist_filter(usrtc_t *source, usrtc_t **dest, int flag, int *filter)
 {
   int r = 0, *f = filter, i;
   usrtc_t *destination = NULL;