diff --git a/include/net.h b/include/net.h
index 8a31872..9d00ad3 100644
--- a/include/net.h
+++ b/include/net.h
@@ -54,8 +54,6 @@
 struct device_d;
 
 struct eth_device {
-	char name[NAMESIZE];
-//	unsigned char enetaddr[6];
 	int iobase;
 	int state;
 
diff --git a/net/net.c b/net/net.c
index ad93787..fd2effe 100644
--- a/net/net.c
+++ b/net/net.c
@@ -81,6 +81,7 @@
 #include <environment.h>
 #include <param.h>
 #include <net.h>
+#include <driver.h>
 #include "bootp.h"
 #include "tftp.h"
 #include "rarp.h"
@@ -1352,6 +1353,8 @@
 
 static int net_check_prereq (proto_t protocol)
 {
+	char *ethid = eth_get_current()->dev->id;
+
 	switch (protocol) {
 		/* Fall through */
 #ifdef CONFIG_NET_PING
@@ -1376,13 +1379,13 @@
 	case NETCONS:
 	case TFTP:
 		if (NetServerIP == 0) {
-			puts ("*** ERROR: `serverip' not set\n");
+			printf("*** ERROR: `%s.serverip' not set\n", ethid);
 			return (1);
 		}
     common:
 
 		if (NetOurIP == 0) {
-			puts ("*** ERROR: `ipaddr' not set\n");
+			printf("*** ERROR: `%s.ipaddr' not set\n", ethid);
 			return (1);
 		}
 		/* Fall through */
@@ -1392,7 +1395,7 @@
 	case BOOTP:
 	case CDP:
 		if (memcmp (NetOurEther, "\0\0\0\0\0\0", 6) == 0) {
-			puts ("*** ERROR: `ethaddr' not set\n");
+			printf("*** ERROR: `%s.ethaddr' not set\n", ethid);
 			return (1);
 		}
 		/* Fall through */