-+ if (strncmp(rxa->name, unique_prefix, upre_len) == 0) {
-+ rxa->name_len -= upre_len;
-+ memmove(rxa->name, rxa->name + upre_len, rxa->name_len);
++ if (strncmp(rxa->name, UNIQUE_PREFIX, UPRE_LEN) == 0) {
++ rxa->name_len -= UPRE_LEN;
++ memmove(rxa->name, rxa->name + UPRE_LEN, rxa->name_len);