11 files changed, 20 insertions, 20 deletions

diff --git a/sys/conf/files b/sys/conf/files
index c149fddf479d..6b811f3bbbc8 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1521,12 +1521,12 @@ ipw_monitor.fw			optional ipwmonitorfw | ipwfw		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"ipw_monitor.fw"
-dev/iscsi/initiator/iscsi.c	optional iscsi_initiator scbus
-dev/iscsi/initiator/iscsi_subr.c	optional iscsi_initiator scbus
-dev/iscsi/initiator/isc_cam.c	optional iscsi_initiator scbus
-dev/iscsi/initiator/isc_soc.c	optional iscsi_initiator scbus
-dev/iscsi/initiator/isc_sm.c	optional iscsi_initiator scbus
-dev/iscsi/initiator/isc_subr.c	optional iscsi_initiator scbus
+dev/iscsi_initiator/iscsi.c	optional iscsi_initiator scbus
+dev/iscsi_initiator/iscsi_subr.c	optional iscsi_initiator scbus
+dev/iscsi_initiator/isc_cam.c	optional iscsi_initiator scbus
+dev/iscsi_initiator/isc_soc.c	optional iscsi_initiator scbus
+dev/iscsi_initiator/isc_sm.c	optional iscsi_initiator scbus
+dev/iscsi_initiator/isc_subr.c	optional iscsi_initiator scbus
 dev/isf/isf.c			optional isf
 dev/isf/isf_fdt.c		optional isf fdt
 dev/isf/isf_nexus.c		optional isf
diff --git a/sys/dev/iscsi/initiator/isc_cam.c b/sys/dev/iscsi_initiator/isc_cam.c
index ee0171c09bc9..c3ddd26802a5 100644
--- a/sys/dev/iscsi/initiator/isc_cam.c
+++ b/sys/dev/iscsi_initiator/isc_cam.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <cam/cam_xpt_sim.h>
 #include <cam/cam_periph.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 
 static void
 _inq(struct cam_sim *sim, union ccb *ccb)
diff --git a/sys/dev/iscsi/initiator/isc_sm.c b/sys/dev/iscsi_initiator/isc_sm.c
index 7f47e9fdaa05..84f809ad22de 100644
--- a/sys/dev/iscsi/initiator/isc_sm.c
+++ b/sys/dev/iscsi_initiator/isc_sm.c
@@ -62,8 +62,8 @@ __FBSDID("$FreeBSD$");
 #include <cam/cam_xpt_sim.h>
 #include <cam/cam_periph.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 
 static void
 _async(isc_session_t *sp, pduq_t *pq)
diff --git a/sys/dev/iscsi/initiator/isc_soc.c b/sys/dev/iscsi_initiator/isc_soc.c
index 947aadce0750..94650fd79eb1 100644
--- a/sys/dev/iscsi/initiator/isc_soc.c
+++ b/sys/dev/iscsi_initiator/isc_soc.c
@@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$");
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 
 #ifndef NO_USE_MBUF
 #define USE_MBUF
diff --git a/sys/dev/iscsi/initiator/isc_subr.c b/sys/dev/iscsi_initiator/isc_subr.c
index d7f0d2754dcd..677c5f1674c8 100644
--- a/sys/dev/iscsi/initiator/isc_subr.c
+++ b/sys/dev/iscsi_initiator/isc_subr.c
@@ -55,8 +55,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/libkern.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 
 static MALLOC_DEFINE(M_ISC, "iSC", "iSCSI driver options");
 
diff --git a/sys/dev/iscsi/initiator/iscsi.c b/sys/dev/iscsi_initiator/iscsi.c
index 3737b7fdabbc..4dbf16349903 100644
--- a/sys/dev/iscsi/initiator/iscsi.c
+++ b/sys/dev/iscsi_initiator/iscsi.c
@@ -58,8 +58,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 #include <sys/sx.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 static char *iscsi_driver_version = "2.3.1";
 
 static struct isc_softc *isc;
diff --git a/sys/dev/iscsi/initiator/iscsi.h b/sys/dev/iscsi_initiator/iscsi.h
index 31421138ea15..31421138ea15 100644
--- a/sys/dev/iscsi/initiator/iscsi.h
+++ b/sys/dev/iscsi_initiator/iscsi.h
diff --git a/sys/dev/iscsi/initiator/iscsi_subr.c b/sys/dev/iscsi_initiator/iscsi_subr.c
index 013b16e12479..b22ed831207b 100644
--- a/sys/dev/iscsi/initiator/iscsi_subr.c
+++ b/sys/dev/iscsi_initiator/iscsi_subr.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <cam/scsi/scsi_message.h>
 #include <sys/eventhandler.h>
 
-#include <dev/iscsi/initiator/iscsi.h>
-#include <dev/iscsi/initiator/iscsivar.h>
+#include <dev/iscsi_initiator/iscsi.h>
+#include <dev/iscsi_initiator/iscsivar.h>
 
 /*
  | Interface to the SCSI layer
diff --git a/sys/dev/iscsi/initiator/iscsivar.h b/sys/dev/iscsi_initiator/iscsivar.h
index 681ad7053e0b..681ad7053e0b 100644
--- a/sys/dev/iscsi/initiator/iscsivar.h
+++ b/sys/dev/iscsi_initiator/iscsivar.h
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index bd263e9a9174..b95c77b0e1b1 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -159,7 +159,7 @@ SUBDIR=	\
 	${_ipw} \
 	${_ipwfw} \
 	${_isci} \
-	iscsi \
+	iscsi_initiator \
 	isp \
 	${_ispfw} \
 	${_iwi} \
diff --git a/sys/modules/iscsi/initiator/Makefile b/sys/modules/iscsi_initiator/Makefile
index 3295c7b6f517..0ae7aa4b9738 100644
--- a/sys/modules/iscsi/initiator/Makefile
+++ b/sys/modules/iscsi_initiator/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../dev/iscsi/initiator
+.PATH: ${.CURDIR}/../../dev/iscsi_initiator
 KMOD=iscsi_initiator
 
 SRCS=  iscsi.h iscsivar.h