-# define strdup(s) srvx_strdup(__FILE__, __LINE__, (s))
-extern void *srvx_malloc(const char *, unsigned int, size_t);
-extern void *srvx_realloc(const char *, unsigned int, void *, size_t);
-extern char *srvx_strdup(const char *, unsigned int, const char *);
-extern void srvx_free(const char *, unsigned int, void *);
+# define strdup(s) x3_strdup(__FILE__, __LINE__, (s))
+extern void *x3_malloc(const char *, unsigned int, size_t);
+extern void *x3_realloc(const char *, unsigned int, void *, size_t);
+extern char *x3_strdup(const char *, unsigned int, const char *);
+extern void x3_free(const char *, unsigned int, void *);