diff --git a/sys/arch/pmax/conf/NEWCONF b/sys/arch/pmax/conf/NEWCONF
index 01bc5a337134..712df1a17455 100644
--- a/sys/arch/pmax/conf/NEWCONF
+++ b/sys/arch/pmax/conf/NEWCONF
@@ -2,7 +2,7 @@
 # DECstation (3100 or 5000/xxx)
 #
 #	Generic config.new configuration for NetBSD/pmax
-# 	$NetBSD: NEWCONF,v 1.2 1995/08/04 01:24:39 jonathan Exp $
+# 	$NetBSD: NEWCONF,v 1.3 1995/08/18 10:09:20 jonathan Exp $
 #
 include		"std.pmax"
 
@@ -84,32 +84,32 @@ tc*		at	mainbus0	# All but PMAXes have a turbochannel
 # Common configuration for machines with IO ASIC chips                 #
 # (3MIN, MAXINE, 3MAXPLUS)                                             #
 ########################################################################
-asic0		at	tc?
-clock0	at asic? 			# RTC
-asc0	at asic?			# system SCSI subslot
-scc0	at asic?
-le0	at asic?			# tc onboard lance
-scc1	at asic?			# Not present on Maxine
+ioasic0		at	tc?
+clock0	at ioasic? 			# RTC
+asc0	at ioasic?			# system SCSI subslot
+scc0	at ioasic?
+le0	at ioasic?			# tc onboard lance
+scc1	at ioasic?			# Not present on Maxine
 
 ########################################################################
 # MAXINE-only baseboard devices and on-baseboard "options"             #
 ########################################################################
 xcfb0	at tc?				# TC framebuffer "option"
-dtop0	at asic0
-#isdn	at asic0
-#fdc    at asic0			# floppy disk
+dtop0	at ioasic0
+#isdn	at ioasic0
+#fdc    at ioasic0			# floppy disk
 
 
 ########################################################################
-# Configuration for 3MAX (5000/200) which has turbochannel but no ASIC #
+# Configuration for 3MAX (5000/200) which has turbochannel but no ASIC.#
 # 3MAX (5000/200) baseboard devices and on-baseboard "options"         #
 ########################################################################
 clock0	at mainbus0  			# RTC
 dc0	at mainbus0
 le0	at tc? #slot ?  offset ?	# TC ether "option" on baseboard
 asc0	at tc?				# TC scsi  "option" on baseboard
-# For now, pretend this machine has an ASIC.
-dc0	at asic?			# dc7083 four-port DZ device
+# For now, pretend this machine has an IOASIC.
+dc0	at ioasic?			# dc7083 four-port DZ device
 
 ########################################################################
 #  Supported turbochannel option cards			               #
@@ -118,8 +118,8 @@ cfb0	at tc?
 mfb0	at tc?
 #sfb0	at tc?
 #sfb1	at tc?
-le1	at tc? #slot ?  offset ?		# TC ether option
-tt0	at tc? #slot? offset ?
+le*	at tc? #slot ?  offset ?		# TC ether option
+#tt0	at tc? #slot? offset ?
 
 
 ########################################################################
diff --git a/sys/arch/pmax/conf/files.pmax b/sys/arch/pmax/conf/files.pmax
index 46c8504fdf28..fd6ff5c11b3c 100644
--- a/sys/arch/pmax/conf/files.pmax
+++ b/sys/arch/pmax/conf/files.pmax
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pmax,v 1.19 1995/08/10 05:22:26 jonathan Exp $
+#	$NetBSD: files.pmax,v 1.20 1995/08/18 10:09:22 jonathan Exp $
 # DECstation-specific configuration info
 
 # maxpartitions must be first item in files.${ARCH}.
@@ -26,12 +26,12 @@ file	arch/pmax/tc/tc.c		tc		needs-flag
 # The TurboChannel IOCTL ASIC. Present on IOASIC machines,
 # which is all turbochannel machines ever built except the 3MAX (5000/200).
 #
-device asic at tc { } 	#{ }	# not really optional
-file	arch/pmax/tc/asic.c		asic
+device ioasic at tc { } 	#{ }	# not really optional
+file	arch/pmax/tc/asic.c		ioasic
 
 
 # Real-time clock (not optional)
-device	clock at asic,tc,mainbus 
+device	clock at ioasic,tc,mainbus 
 file	arch/pmax/pmax/clock.c		clock
 
 # Config for Ted Lemon's changes to console driver:
@@ -58,7 +58,7 @@ define	oldscsi {}
 device oldscsibus at oldscsi	{target = -1, drive = -1}
 
 # asc:  system-slot or turbochannel-option SCSI interface
-device asc at asic,tc: oldscsi,scsi
+device asc at ioasic,tc: oldscsi,scsi
 file	arch/pmax/dev/asc.c		asc needs-count
 
 # sii:  kn01 SCSI interface 
@@ -78,17 +78,17 @@ file	arch/pmax/dev/rz.c		rz needs-count
 
 # DC7085 (DZ-like four-port serial device) on mainbus on non-IOASIC machines.
 # For the 3MAX (aka kn02 aka 5k/200) pretend that it's on an  ASIC.
-device dc at mainbus,asic
+device dc at mainbus,ioasic
 file	arch/pmax/dev/dc.c			dc needs-count
 
 # The "desktop bus" on the MAXINE (5k/25). What is it, anyway? ADB?
-device dtop at asic
+device dtop at ioasic
 file	arch/pmax/dev/dtop.c			dtop needs-count
 
 # LANCE ethernet driver.
 #  XXX Should use new machine-independent one instead.
-device le at asic,tc,mainbus: ifnet, ether
-file	arch/pmax/dev/if_le.c		le	needs-count
+device le at ioasic,tc,mainbus: ifnet, ether
+file	arch/pmax/tc/if_le.c		le needs-flag
 
 # 3100 (pmax) onboard framebuffer
 device pm at mainbus
@@ -107,9 +107,9 @@ file	arch/pmax/dev/sfb.c		sfb needs-count
 device mfb at tc
 file	arch/pmax/dev/mfb.c		mfb needs-count
 
-#  Zilog 8350/intel 82350(?) SCC.
-device scc at asic
-file	arch/pmax/dev/scc.c		scc	needs-count
+#  Zilog 8350/Intel 82350(?) SCC UART.
+device scc at ioasic
+file	arch/pmax/tc/scc.c		scc	needs-count
 
 # MAXINE onboard framebuffer
 device	xcfb at tc