diff --git a/configure b/configure
index 0f118e5..7efa5f7 100755
--- a/configure
+++ b/configure
@@ -14190,7 +14190,7 @@ _ACEOF
 
 fi
 
-ac_config_files="$ac_config_files Makefile servlink/Makefile extensions/Makefile unsupported/Makefile src/Makefile modules/Makefile tools/Makefile doc/Makefile help/Makefile"
+ac_config_files="$ac_config_files Makefile ssld/Makefile extensions/Makefile unsupported/Makefile src/Makefile modules/Makefile tools/Makefile doc/Makefile help/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -14748,7 +14748,7 @@ do
   case $ac_config_target in
     "include/setup.h") CONFIG_HEADERS="$CONFIG_HEADERS include/setup.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "servlink/Makefile") CONFIG_FILES="$CONFIG_FILES servlink/Makefile" ;;
+    "ssld/Makefile") CONFIG_FILES="$CONFIG_FILES ssld/Makefile" ;;
     "extensions/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Makefile" ;;
     "unsupported/Makefile") CONFIG_FILES="$CONFIG_FILES unsupported/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
diff --git a/modules/m_resv.c b/modules/m_resv.c
index 084f3f8..7ad97e6 100644
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -224,9 +224,9 @@ parse_resv(struct Client *source_p, const char *name,
 		aconf = make_conf();
 		aconf->status = CONF_RESV_CHANNEL;
 		aconf->port = 0;
-		aconf->name = rb_strdup(name);
+		aconf->info.name = rb_strdup(name);
 		aconf->passwd = rb_strdup(reason);
-		add_to_resv_hash(aconf->name, aconf);
+		add_to_resv_hash(aconf->info.name, aconf);
 
 		if(temp_time > 0)
 		{
@@ -243,7 +243,7 @@ parse_resv(struct Client *source_p, const char *name,
 					temp_time / 60, name);
 		}
 		else
-			write_confitem(RESV_TYPE, source_p, NULL, aconf->name, 
+			write_confitem(RESV_TYPE, source_p, NULL, aconf->info.name, 
 					aconf->passwd, NULL, NULL, 0);
 	}
 	else if(clean_resv_nick(name))
@@ -282,7 +282,7 @@ parse_resv(struct Client *source_p, const char *name,
 		aconf = make_conf();
 		aconf->status = CONF_RESV_NICK;
 		aconf->port = 0;
-		aconf->name = rb_strdup(name);
+		aconf->info.name = rb_strdup(name);
 		aconf->passwd = rb_strdup(reason);
 		rb_dlinkAddAlloc(aconf, &resv_conf_list);
 
@@ -301,7 +301,7 @@ parse_resv(struct Client *source_p, const char *name,
 					temp_time / 60, name);
 		}
 		else
-			write_confitem(RESV_TYPE, source_p, NULL, aconf->name, 
+			write_confitem(RESV_TYPE, source_p, NULL, aconf->info.name, 
 					aconf->passwd, NULL, NULL, 0);
 	}
 	else
@@ -490,7 +490,7 @@ remove_resv(struct Client *source_p, const char *name)
 		{
 			aconf = ptr->data;
 
-			if(irccmp(aconf->name, name))
+			if(irccmp(aconf->info.name, name))
 				aconf = NULL;
 			else
 				break;