diff --git a/bacnet-stack/demo/readfile/Makefile b/bacnet-stack/demo/readfile/Makefile
index c01ae950..8c289418 100644
--- a/bacnet-stack/demo/readfile/Makefile
+++ b/bacnet-stack/demo/readfile/Makefile
@@ -20,7 +20,7 @@ CFLAGS  = -Wall -g $(INCLUDES) $(DEFINES)
 
 TARGET = bacarf
 
-SRCS = readfile.c \
+SRCS = main.c \
        $(BACNET_PORT)/bip-init.c \
        $(BACNET_ROOT)/bip.c \
        $(BACNET_HANDLER)/txbuf.c \
diff --git a/bacnet-stack/demo/readfile/readfile.c b/bacnet-stack/demo/readfile/main.c
similarity index 96%
rename from bacnet-stack/demo/readfile/readfile.c
rename to bacnet-stack/demo/readfile/main.c
index e7f65d4d..0b219ed2 100644
--- a/bacnet-stack/demo/readfile/readfile.c
+++ b/bacnet-stack/demo/readfile/main.c
@@ -230,11 +230,21 @@ int main(int argc, char *argv[])
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     address_init();
     Init_Service_Handlers();
-    /* configure standard BACnet/IP port */
-    bip_set_interface("eth0");  /* for linux */
-    bip_set_port(0xBAC0);
+#ifdef BACDL_ETHERNET
+    /* init the physical layer */
+    if (!ethernet_init("eth0"))
+        return 1;
+#endif
+#ifdef BACDL_BIP
+    bip_set_interface("eth0");
     if (!bip_init())
         return 1;
+    printf("bip: using port %hu\r\n", bip_get_port());
+#endif
+#ifdef BACDL_ARCNET
+    if (!arcnet_init("arc0"))
+        return 1;
+#endif
     /* configure the timeout values */
     last_seconds = time(NULL);
     timeout_seconds = (Device_APDU_Timeout() / 1000) *
@@ -248,7 +258,7 @@ int main(int argc, char *argv[])
         current_seconds = time(NULL);
 
         /* returns 0 bytes on timeout */
-        pdu_len = bip_receive(&src, &Rx_Buf[0], MAX_MPDU, timeout);
+        pdu_len = datalink_receive(&src, &Rx_Buf[0], MAX_MPDU, timeout);
 
         /* process */
         if (pdu_len) {
diff --git a/bacnet-stack/demo/readfile/readfile.ide b/bacnet-stack/demo/readfile/main.ide
similarity index 100%
rename from bacnet-stack/demo/readfile/readfile.ide
rename to bacnet-stack/demo/readfile/main.ide
diff --git a/bacnet-stack/demo/readfile/makefile.b32 b/bacnet-stack/demo/readfile/makefile.b32
index 449b7ddb..064e2c5a 100644
--- a/bacnet-stack/demo/readfile/makefile.b32
+++ b/bacnet-stack/demo/readfile/makefile.b32
@@ -17,7 +17,7 @@ PRODUCT_EXE = $(PRODUCT).exe
 # Choose the Data Link Layer to Enable
 DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1
 
-SRCS = readfile.c \
+SRCS = main.c \
        ..\..\ports\win32\bip-init.c \
        ..\..\bip.c  \
        ..\..\demo\handler\txbuf.c  \
diff --git a/bacnet-stack/demo/server/Makefile b/bacnet-stack/demo/server/Makefile
index a35b61b2..815a5641 100644
--- a/bacnet-stack/demo/server/Makefile
+++ b/bacnet-stack/demo/server/Makefile
@@ -20,7 +20,7 @@ CFLAGS  = -Wall -g $(INCLUDES) $(DEFINES)
 
 TARGET = bacserv
 
-SRCS = server.c \
+SRCS = main.c \
        $(BACNET_PORT)/bip-init.c \
        $(BACNET_PORT)/ethernet.c \
        $(BACNET_PORT)/arcnet.c \
diff --git a/bacnet-stack/demo/server/server.c b/bacnet-stack/demo/server/main.c
similarity index 100%
rename from bacnet-stack/demo/server/server.c
rename to bacnet-stack/demo/server/main.c
diff --git a/bacnet-stack/demo/server/makefile.b32 b/bacnet-stack/demo/server/makefile.b32
index 4185de39..4a4a0c95 100644
--- a/bacnet-stack/demo/server/makefile.b32
+++ b/bacnet-stack/demo/server/makefile.b32
@@ -19,7 +19,7 @@ PRODUCT_EXE = $(PRODUCT).exe
 # datalink layer that Win32 supports
 DEFINES = -DBACDL_BIP=1;USE_INADDR=1;PRINT_ENABLED=1;BIG_ENDIAN=0
 
-SRCS = server.c \
+SRCS = main.c \
        ..\..\ports\win32\bip-init.c \
        ..\..\bip.c  \
        ..\..\demo\handler\txbuf.c  \