diff --git a/configure.in b/configure.in
index 78e3fb9aa8..f244fd16bb 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@
 AC_INIT(configure.in)
 
     AM_CONFIG_HEADER(config.h)
-    AM_INIT_AUTOMAKE(eidps, 0.1)
+    AM_INIT_AUTOMAKE(suricata, 0.1)
 
     AC_LANG_C
     AC_PROG_CC_C99
diff --git a/src/Makefile.am b/src/Makefile.am
index 7c274f9cf9..cac4e8bf9c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-bin_PROGRAMS = eidps
-eidps_SOURCES = eidps.c eidps.h \
+bin_PROGRAMS = suricata
+suricata_SOURCES = suricata.c suricata.h \
 runmodes.c runmodes.h \
 packet-queue.c packet-queue.h \
 threads.c threads.h \
@@ -86,6 +86,7 @@ detect-ttl.c detect-ttl.h \
 detect-itype.c detect-itype.h \
 detect-icode.c detect-icode.h \
 detect-http-cookie.c detect-http-cookie.h \
+detect-tls-version.c detect-tls-version.h \
 util-print.c util-print.h \
 util-mpm.c util-mpm.h \
 util-binsearch.c util-binsearch.h \
@@ -110,6 +111,7 @@ util-enum.c util-enum.h \
 util-radix-tree.c util-radix-tree.h \
 util-host-os-info.c util-host-os-info.h \
 util-rule-vars.c util-rule-vars.h \
+util-fix_checksum.c util-fix_checksum.h \
 tm-modules.c tm-modules.h \
 tm-queues.c tm-queues.h \
 tm-queuehandlers.c tm-queuehandlers.h \
@@ -120,35 +122,33 @@ tmqh-packetpool.c tmqh-packetpool.h \
 tmqh-flow.c tmqh-flow.h \
 alert-fastlog.c alert-fastlog.h \
 alert-debuglog.c alert-debuglog.h \
-log-httplog.c log-httplog.h \
 alert-unified-log.c alert-unified-log.h \
 alert-unified-alert.c alert-unified-alert.h \
 alert-unified2-alert.c alert-unified2-alert.h \
+log-httplog.c log-httplog.h \
 stream.c stream.h \
 stream-tcp.c stream-tcp.h stream-tcp-private.h \
 stream-tcp-reassemble.c stream-tcp-reassemble.h \
 respond-reject.c respond-reject.h \
 respond-reject-libnet11.h respond-reject-libnet11.c \
+conf.c conf.h \
+conf-yaml-loader.c conf-yaml-loader.h \
 counters.c counter.h \
 app-layer.c app-layer.h \
 app-layer-detect-proto.c app-layer-detect-proto.h \
 app-layer-parser.c app-layer-parser.h \
+app-layer-protos.h \
+app-layer-htp.c app-layer-htp.h \
 app-layer-tls.c app-layer-tls.h \
 app-layer-smb.c app-layer-smb.h \
 app-layer-dcerpc.c app-layer-dcerpc.h \
-detect-tls-version.c detect-tls-version.h \
-app-layer-protos.h \
-conf.c conf.h \
-conf-yaml-loader.c conf-yaml-loader.h \
-util-fix_checksum.c util-fix_checksum.h \
-defrag.c defrag.h \
-app-layer-htp.c app-layer-htp.h
+defrag.c defrag.h
 
 # set the include path found by configure
 INCLUDES= $(all_includes)
 
 # the library search path.
-eidps_LDFLAGS = $(all_libraries) 
-#eidps_LDADD = -lnetfilter_queue -lpthread -lpcre 
-#eidps_CFLAGS = -Wall -fno-strict-aliasing 
+suricata_LDFLAGS = $(all_libraries) 
+#suricata_LDADD = -lnetfilter_queue -lpthread -lpcre 
+#suricata_CFLAGS = -Wall -fno-strict-aliasing 
 
diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c
index ed9ae8f848..880b419ddd 100644
--- a/src/alert-debuglog.c
+++ b/src/alert-debuglog.c
@@ -8,7 +8,7 @@
  *   - maybe by accessing it just and hoping threading doesn't hurt
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"
diff --git a/src/alert-fastlog.c b/src/alert-fastlog.c
index fdb664d532..0159edd133 100644
--- a/src/alert-fastlog.c
+++ b/src/alert-fastlog.c
@@ -12,7 +12,7 @@
  * - Print [drop] as well if appropriate
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"
diff --git a/src/alert-unified-alert.c b/src/alert-unified-alert.c
index 0256f4c0af..9766ff771f 100644
--- a/src/alert-unified-alert.c
+++ b/src/alert-unified-alert.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"
diff --git a/src/alert-unified-log.c b/src/alert-unified-log.c
index 9e662241dd..d19d6fa24f 100644
--- a/src/alert-unified-log.c
+++ b/src/alert-unified-log.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"
diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c
index 9050991158..bdfe842c6f 100644
--- a/src/alert-unified2-alert.c
+++ b/src/alert-unified2-alert.c
@@ -4,7 +4,7 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"
diff --git a/src/app-layer-dcerpc.c b/src/app-layer-dcerpc.c
index ac839372af..402eff01d9 100644
--- a/src/app-layer-dcerpc.c
+++ b/src/app-layer-dcerpc.c
@@ -4,7 +4,7 @@
  *
  * \author Kirby Kuehl <kkuehl@gmail.com>
  */
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "debug.h"
 #include "decode.h"
diff --git a/src/app-layer-detect-proto.c b/src/app-layer-detect-proto.c
index e4423aa0d5..175692741a 100644
--- a/src/app-layer-detect-proto.c
+++ b/src/app-layer-detect-proto.c
@@ -11,7 +11,7 @@
  *  \todo Fall back to port based classification if other detection fails.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "threads.h"
diff --git a/src/app-layer-detect.c b/src/app-layer-detect.c
index 00de5c379c..f00b2ff740 100644
--- a/src/app-layer-detect.c
+++ b/src/app-layer-detect.c
@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "app-layer-detect.h"
 
 /** \brief alloc a app layer detection ctx
diff --git a/src/app-layer-detect.h b/src/app-layer-detect.h
index 415f755093..f22eb776d5 100644
--- a/src/app-layer-detect.h
+++ b/src/app-layer-detect.h
@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 #include "app-layer-protos.h"
diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c
index 3cb888c60e..131e6d5d6a 100644
--- a/src/app-layer-htp.c
+++ b/src/app-layer-htp.c
@@ -8,7 +8,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "threads.h"
diff --git a/src/app-layer-http.c b/src/app-layer-http.c
index c438ae3ac4..9a0a7a53cf 100644
--- a/src/app-layer-http.c
+++ b/src/app-layer-http.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2009 Victor Julien */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "threads.h"
diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c
index 2c26a6a272..488164f101 100644
--- a/src/app-layer-parser.c
+++ b/src/app-layer-parser.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2009 Victor Julien */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "util-unittest.h"
 #include "decode.h"
diff --git a/src/app-layer-smb.c b/src/app-layer-smb.c
index 5bbc99a4ed..9339eec26a 100644
--- a/src/app-layer-smb.c
+++ b/src/app-layer-smb.c
@@ -4,7 +4,7 @@
  *
  * \author Kirby Kuehl <kkuehl@gmail.com>
  */
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "debug.h"
 #include "decode.h"
diff --git a/src/app-layer-smb2.c b/src/app-layer-smb2.c
index 51fc63d838..1a06eb2ef7 100644
--- a/src/app-layer-smb2.c
+++ b/src/app-layer-smb2.c
@@ -4,7 +4,7 @@
  *
  * \author Kirby Kuehl <kkuehl@gmail.com>
  */
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "debug.h"
 #include "decode.h"
diff --git a/src/app-layer-tls.c b/src/app-layer-tls.c
index b7981ffb6a..1886bf901f 100644
--- a/src/app-layer-tls.c
+++ b/src/app-layer-tls.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2009 Victor Julien */
 /** \todo support for the newly find TLS handshake GAP vulnerbility */
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "threads.h"
diff --git a/src/app-layer.c b/src/app-layer.c
index a11dbc653d..428d4750d5 100644
--- a/src/app-layer.c
+++ b/src/app-layer.c
@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "app-layer.h"
 #include "stream-tcp-private.h"
 #include "util-debug.h"
diff --git a/src/conf-yaml-loader.c b/src/conf-yaml-loader.c
index 194b13a5ed..acf23614fa 100644
--- a/src/conf-yaml-loader.c
+++ b/src/conf-yaml-loader.c
@@ -9,7 +9,7 @@
  */
 
 #include <yaml.h>
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "conf.h"
 #include "util-debug.h"
 #include "util-unittest.h"
diff --git a/src/conf.c b/src/conf.c
index 139f288b1c..e76838a8d9 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -14,7 +14,7 @@
  * \todo Consider using HashListTable to allow easy dumping of all data.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "conf.h"
 #include "util-hash.h"
 #include "util-unittest.h"
diff --git a/src/conf.h b/src/conf.h
index dd8c3a7e99..77380f8ec4 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -26,7 +26,7 @@ typedef struct ConfNode_ {
 /**
  * The default log directory.
  */
-#define DEFAULT_LOG_DIR "/var/log/eidps"
+#define DEFAULT_LOG_DIR "/var/log/suricata"
 
 void ConfInit(void);
 int ConfGet(char *name, char **vptr);
diff --git a/src/counters.c b/src/counters.c
index 6025ca903e..307e351fdf 100644
--- a/src/counters.c
+++ b/src/counters.c
@@ -2,8 +2,8 @@
  *  \author Anoop Saldanha <poonaatsoc@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "counters.h"
 #include "threadvars.h"
 #include "tm-modules.h"
diff --git a/src/decode-ethernet.c b/src/decode-ethernet.c
index 9e767bafa9..48ecbdb87d 100644
--- a/src/decode-ethernet.c
+++ b/src/decode-ethernet.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2009 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-ethernet.h"
 #include "decode-events.h"
diff --git a/src/decode-gre.c b/src/decode-gre.c
index b4e81af8ad..f4180bea65 100644
--- a/src/decode-gre.c
+++ b/src/decode-gre.c
@@ -3,8 +3,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "decode-events.h"
 #include "decode-gre.h"
diff --git a/src/decode-icmpv4.c b/src/decode-icmpv4.c
index 4130a710c3..02537c0e56 100644
--- a/src/decode-icmpv4.c
+++ b/src/decode-icmpv4.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "decode-events.h"
diff --git a/src/decode-icmpv6.c b/src/decode-icmpv6.c
index 2726f4be8b..5bfeb81bd1 100644
--- a/src/decode-icmpv6.c
+++ b/src/decode-icmpv6.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode-icmpv6.h"
 #include "decode.h"
 #include "decode-tcp.h"
diff --git a/src/decode-icmpv6.h b/src/decode-icmpv6.h
index 3bd75033de..d93999f85a 100644
--- a/src/decode-icmpv6.h
+++ b/src/decode-icmpv6.h
@@ -1,10 +1,11 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
+#ifndef __DECODE_ICMPV6_H__
+#define __DECODE_ICMPV6_H__
+
 #include "decode-tcp.h"
 #include "decode-udp.h"
 #include "decode-ipv6.h"
-#ifndef __DECODE_ICMPV6_H__
-#define __DECODE_ICMPV6_H__
 
 #define ICMPV6_HEADER_LEN       8
 #define ICMPV6_HEADER_PKT_OFFSET 8
diff --git a/src/decode-ipv4.c b/src/decode-ipv4.c
index cd5b5f8058..2211bc4aa8 100644
--- a/src/decode-ipv4.c
+++ b/src/decode-ipv4.c
@@ -4,7 +4,7 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "packet-queue.h"
 #include "decode.h"
 #include "decode-ipv4.h"
diff --git a/src/decode-ipv6.c b/src/decode-ipv6.c
index 082258dae1..6e7e472fe9 100644
--- a/src/decode-ipv6.c
+++ b/src/decode-ipv6.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-ipv6.h"
 #include "decode-icmpv6.h"
diff --git a/src/decode-ppp.c b/src/decode-ppp.c
index b645eccbc2..927082535b 100644
--- a/src/decode-ppp.c
+++ b/src/decode-ppp.c
@@ -1,7 +1,7 @@
 /** Copyright (c) 2009 Open Information Security Foundation
  *  \author Breno Silva Pinto <breno.silva@gmail.com> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-ppp.h"
 #include "decode-events.h"
diff --git a/src/decode-pppoe.c b/src/decode-pppoe.c
index dd05f6ccb5..135963670b 100644
--- a/src/decode-pppoe.c
+++ b/src/decode-pppoe.c
@@ -5,7 +5,7 @@
  * \brief PPPOE Decoder
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "packet-queue.h"
 
diff --git a/src/decode-sll.c b/src/decode-sll.c
index 98d00b46bd..44e1b838d9 100644
--- a/src/decode-sll.c
+++ b/src/decode-sll.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2009 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-sll.h"
 #include "decode-events.h"
diff --git a/src/decode-tcp.c b/src/decode-tcp.c
index 5f6c3b0e33..46ec32eb99 100644
--- a/src/decode-tcp.c
+++ b/src/decode-tcp.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-tcp.h"
 #include "decode-events.h"
diff --git a/src/decode-udp.c b/src/decode-udp.c
index 8969fb8bf8..7753e9bbd9 100644
--- a/src/decode-udp.c
+++ b/src/decode-udp.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-udp.h"
 #include "decode-events.h"
diff --git a/src/decode.c b/src/decode.c
index 205958da37..fe4768e420 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -2,7 +2,7 @@
 
 /* Decode the raw packet */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "util-debug.h"
 
diff --git a/src/defrag.c b/src/defrag.c
index 7224a46453..11066087ed 100644
--- a/src/defrag.c
+++ b/src/defrag.c
@@ -20,7 +20,7 @@
 
 #include "queue.h"
 
-#include "eidps.h"
+#include "suricata.h"
 #include "threads.h"
 #include "conf.h"
 #include "decode-ipv6.h"
diff --git a/src/detect-ack.c b/src/detect-ack.c
index 80fec40e5c..55a1cae54d 100644
--- a/src/detect-ack.c
+++ b/src/detect-ack.c
@@ -7,7 +7,7 @@
  * Implements the "ack" keyword.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-bytejump.c b/src/detect-bytejump.c
index 5b28d341bd..25148b11c7 100644
--- a/src/detect-bytejump.c
+++ b/src/detect-bytejump.c
@@ -3,7 +3,7 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-bytetest.c b/src/detect-bytetest.c
index 98cb81c8c3..1d0317d9d2 100644
--- a/src/detect-bytetest.c
+++ b/src/detect-bytetest.c
@@ -3,7 +3,7 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-classtype.c b/src/detect-classtype.c
index 948fd18134..0507304a9d 100644
--- a/src/detect-classtype.c
+++ b/src/detect-classtype.c
@@ -1,6 +1,6 @@
 /* CLASSTYPE part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-content.c b/src/detect-content.c
index 0acccd692a..33df9f9243 100644
--- a/src/detect-content.c
+++ b/src/detect-content.c
@@ -34,7 +34,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "detect-content.h"
diff --git a/src/detect-csum.c b/src/detect-csum.c
index 6cb2a90ebf..0ac717d592 100644
--- a/src/detect-csum.c
+++ b/src/detect-csum.c
@@ -5,7 +5,7 @@
  * Checksum keyword for the the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-decode-event.c b/src/detect-decode-event.c
index 682519d1fd..d9372a42bd 100644
--- a/src/detect-decode-event.c
+++ b/src/detect-decode-event.c
@@ -3,8 +3,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-depth.c b/src/detect-depth.c
index 448dc94130..eb00735ca0 100644
--- a/src/detect-depth.c
+++ b/src/detect-depth.c
@@ -1,6 +1,6 @@
 /* DEPTH part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-distance.c b/src/detect-distance.c
index 2f29eb8c29..2ddf160426 100644
--- a/src/detect-distance.c
+++ b/src/detect-distance.c
@@ -1,6 +1,6 @@
 /* DISTANCE part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-dsize.c b/src/detect-dsize.c
index 05aa1f4236..077992a3e2 100644
--- a/src/detect-dsize.c
+++ b/src/detect-dsize.c
@@ -5,7 +5,7 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-engine-address-ipv4.c b/src/detect-engine-address-ipv4.c
index aae1045236..2a5ab05cc3 100644
--- a/src/detect-engine-address-ipv4.c
+++ b/src/detect-engine-address-ipv4.c
@@ -5,7 +5,7 @@
  * XXX we need to unit test the hell out of this code
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-engine-address-ipv6.c b/src/detect-engine-address-ipv6.c
index e45fdfa16d..60d9801072 100644
--- a/src/detect-engine-address-ipv6.c
+++ b/src/detect-engine-address-ipv6.c
@@ -5,7 +5,7 @@
  * XXX unit test the join code
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-engine-address.c b/src/detect-engine-address.c
index be9fd9759e..6055aaadab 100644
--- a/src/detect-engine-address.c
+++ b/src/detect-engine-address.c
@@ -8,7 +8,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-engine-iponly.c b/src/detect-engine-iponly.c
index a42ac40a28..0a00d5fc0a 100644
--- a/src/detect-engine-iponly.c
+++ b/src/detect-engine-iponly.c
@@ -9,7 +9,7 @@
  * we split it into /16's.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"
diff --git a/src/detect-engine-mpm.c b/src/detect-engine-mpm.c
index 163dcdc4e6..ecacbac6a8 100644
--- a/src/detect-engine-mpm.c
+++ b/src/detect-engine-mpm.c
@@ -1,6 +1,6 @@
 /* Multi pattern matcher */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-engine-port.c b/src/detect-engine-port.c
index 067f04b5b2..afb31c0d34 100644
--- a/src/detect-engine-port.c
+++ b/src/detect-engine-port.c
@@ -8,7 +8,7 @@
  * - more unittesting
  * */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-engine-proto.c b/src/detect-engine-proto.c
index 95d4542ba7..bc6fe4c8a4 100644
--- a/src/detect-engine-proto.c
+++ b/src/detect-engine-proto.c
@@ -4,7 +4,7 @@
  *
  * TODO move this out of the detection plugin structure */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-engine-siggroup.c b/src/detect-engine-siggroup.c
index 97c74bea8c..099e090570 100644
--- a/src/detect-engine-siggroup.c
+++ b/src/detect-engine-siggroup.c
@@ -2,7 +2,7 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-engine-sigorder.c b/src/detect-engine-sigorder.c
index 7c7c796de8..ec2d030d2b 100644
--- a/src/detect-engine-sigorder.c
+++ b/src/detect-engine-sigorder.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <pcre.h>
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 #include "detect-flowbits.h"
 #include "detect-engine-sigorder.h"
diff --git a/src/detect-engine.c b/src/detect-engine.c
index e353f73b58..2e9ea67081 100644
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 2008 by Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"
diff --git a/src/detect-fast-pattern.c b/src/detect-fast-pattern.c
index 13285a720a..ed51133e4b 100644
--- a/src/detect-fast-pattern.c
+++ b/src/detect-fast-pattern.c
@@ -2,7 +2,7 @@
  *  \author Anoop Saldanha <poonaatsoc@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 #include "flow.h"
 #include "detect-content.h"
diff --git a/src/detect-flags.c b/src/detect-flags.c
index 8338467788..088b82829b 100644
--- a/src/detect-flags.c
+++ b/src/detect-flags.c
@@ -4,8 +4,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-flow.c b/src/detect-flow.c
index 06c20c231d..6758937064 100644
--- a/src/detect-flow.c
+++ b/src/detect-flow.c
@@ -5,7 +5,7 @@
  * FLOW part of the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-flowbits.c b/src/detect-flowbits.c
index 6296be32b1..e1ddaf327f 100644
--- a/src/detect-flowbits.c
+++ b/src/detect-flowbits.c
@@ -5,7 +5,7 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "threads.h"
diff --git a/src/detect-flowint.c b/src/detect-flowint.c
index 98db87f6cd..1f1573ff13 100644
--- a/src/detect-flowint.c
+++ b/src/detect-flowint.c
@@ -5,7 +5,7 @@
  * Keyword: flowint
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "threads.h"
diff --git a/src/detect-flowvar.c b/src/detect-flowvar.c
index 9fe825c5cf..f43c64ced3 100644
--- a/src/detect-flowvar.c
+++ b/src/detect-flowvar.c
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2008 by Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "detect-content.h"
diff --git a/src/detect-fragbits.c b/src/detect-fragbits.c
index 571c609d67..729fb967c3 100644
--- a/src/detect-fragbits.c
+++ b/src/detect-fragbits.c
@@ -4,8 +4,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-gid.c b/src/detect-gid.c
index 88103dad18..2c15be2f75 100644
--- a/src/detect-gid.c
+++ b/src/detect-gid.c
@@ -4,8 +4,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-http-cookie.c b/src/detect-http-cookie.c
index 7d750e235b..ba496ade77 100644
--- a/src/detect-http-cookie.c
+++ b/src/detect-http-cookie.c
@@ -4,7 +4,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 #include "debug.h"
 #include "decode.h"
@@ -439,4 +439,4 @@ void DetectHttpCookieRegisterTests (void)
     UtRegisterTest("DetectHttpCookieSigTest01", DetectHttpCookieSigTest01, 1);
 #endif /* UNITTESTS */
 
-}
\ No newline at end of file
+}
diff --git a/src/detect-icode.c b/src/detect-icode.c
index 4b4385e087..49daa6cf3c 100644
--- a/src/detect-icode.c
+++ b/src/detect-icode.c
@@ -7,7 +7,7 @@
  * "icode" keyword support
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-id.c b/src/detect-id.c
index 7859475d8b..7bab66999b 100644
--- a/src/detect-id.c
+++ b/src/detect-id.c
@@ -7,7 +7,7 @@
  * "id" keyword, IPv4 Identifier keyword, part of the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-ipopts.c b/src/detect-ipopts.c
index c0d5cdfbb7..fea7dafe92 100644
--- a/src/detect-ipopts.c
+++ b/src/detect-ipopts.c
@@ -4,8 +4,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-ipproto.c b/src/detect-ipproto.c
index 31a3756465..f4afa1e7f7 100644
--- a/src/detect-ipproto.c
+++ b/src/detect-ipproto.c
@@ -7,7 +7,7 @@
 
 #include <netdb.h>
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-isdataat.c b/src/detect-isdataat.c
index d71377b31b..f9b9882705 100644
--- a/src/detect-isdataat.c
+++ b/src/detect-isdataat.c
@@ -5,7 +5,7 @@
  * ISDATAAT part of the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-itype.c b/src/detect-itype.c
index da133d0416..cabd812063 100644
--- a/src/detect-itype.c
+++ b/src/detect-itype.c
@@ -7,7 +7,7 @@
  * "itype" keyword support
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-metadata.c b/src/detect-metadata.c
index 0fd20f679d..0f1119db7d 100644
--- a/src/detect-metadata.c
+++ b/src/detect-metadata.c
@@ -1,6 +1,6 @@
 /* METADATA part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectMetadataSetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *str);
diff --git a/src/detect-msg.c b/src/detect-msg.c
index 813aee0767..afcea24e64 100644
--- a/src/detect-msg.c
+++ b/src/detect-msg.c
@@ -1,6 +1,6 @@
 /* MSG part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 #include "util-debug.h"
 #include "util-unittest.h"
diff --git a/src/detect-noalert.c b/src/detect-noalert.c
index 474293c640..02fe4aa1c3 100644
--- a/src/detect-noalert.c
+++ b/src/detect-noalert.c
@@ -1,6 +1,6 @@
 /* NOALERT part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectNoalertSetup (DetectEngineCtx *, Signature *, SigMatch *, char *);
diff --git a/src/detect-nocase.c b/src/detect-nocase.c
index 1698eea3d8..b054b95aa5 100644
--- a/src/detect-nocase.c
+++ b/src/detect-nocase.c
@@ -1,6 +1,6 @@
 /* NOCASE part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-offset.c b/src/detect-offset.c
index 1acc13db61..963e7b0628 100644
--- a/src/detect-offset.c
+++ b/src/detect-offset.c
@@ -1,6 +1,6 @@
 /* OFFSET part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-parse.c b/src/detect-parse.c
index de6ae48d98..540053c998 100644
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -1,6 +1,6 @@
 /* signature parser */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 
 #include "detect.h"
diff --git a/src/detect-pcre.c b/src/detect-pcre.c
index 240f9afbf1..f7bb153a78 100644
--- a/src/detect-pcre.c
+++ b/src/detect-pcre.c
@@ -1,6 +1,6 @@
 /* PCRE part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-pktvar.c b/src/detect-pktvar.c
index aa04c6087b..e8b928d5e1 100644
--- a/src/detect-pktvar.c
+++ b/src/detect-pktvar.c
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2008 by Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "threads.h"
diff --git a/src/detect-priority.c b/src/detect-priority.c
index c5c698fb06..a67764afab 100644
--- a/src/detect-priority.c
+++ b/src/detect-priority.c
@@ -1,6 +1,6 @@
 /* PRIORITY part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectPrioritySetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *sidstr);
diff --git a/src/detect-rawbytes.c b/src/detect-rawbytes.c
index bcd3c39c21..38ea421134 100644
--- a/src/detect-rawbytes.c
+++ b/src/detect-rawbytes.c
@@ -1,6 +1,6 @@
 /* RAWBYTES part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-recursive.c b/src/detect-recursive.c
index c25c6478e8..c3ba2e19cb 100644
--- a/src/detect-recursive.c
+++ b/src/detect-recursive.c
@@ -5,7 +5,7 @@
  *
  * Note: non Snort compatible. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect-reference.c b/src/detect-reference.c
index 6aa38bc924..d8454cb9bf 100644
--- a/src/detect-reference.c
+++ b/src/detect-reference.c
@@ -1,6 +1,6 @@
 /* REFERENCE part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectReferenceSetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *str);
diff --git a/src/detect-rev.c b/src/detect-rev.c
index 426a330292..abce2ccb05 100644
--- a/src/detect-rev.c
+++ b/src/detect-rev.c
@@ -1,6 +1,6 @@
 /* REV part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectRevSetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *str);
diff --git a/src/detect-rpc.c b/src/detect-rpc.c
index 4eed6bafcd..20be46315f 100644
--- a/src/detect-rpc.c
+++ b/src/detect-rpc.c
@@ -6,7 +6,7 @@
  * RPC keyword support
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 
diff --git a/src/detect-sameip.c b/src/detect-sameip.c
index 1183262f0f..95fb2701ce 100644
--- a/src/detect-sameip.c
+++ b/src/detect-sameip.c
@@ -7,7 +7,7 @@
  * Implements the "sameip" keyword.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-seq.c b/src/detect-seq.c
index 02f0b83ed9..64e70b9e8e 100644
--- a/src/detect-seq.c
+++ b/src/detect-seq.c
@@ -7,7 +7,7 @@
  * Implements the "seq" keyword.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-sid.c b/src/detect-sid.c
index 0dd39391f0..5b6c02b7bb 100644
--- a/src/detect-sid.c
+++ b/src/detect-sid.c
@@ -1,6 +1,6 @@
 /* SID part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectSidSetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *sidstr);
diff --git a/src/detect-stream_size.c b/src/detect-stream_size.c
index a03fb12515..203353b97b 100644
--- a/src/detect-stream_size.c
+++ b/src/detect-stream_size.c
@@ -5,7 +5,7 @@
  * Stream size for the engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "stream-tcp.h"
 #include "util-unittest.h"
 #include "detect.h"
diff --git a/src/detect-threshold.c b/src/detect-threshold.c
index fc1506947d..9a14bd0310 100644
--- a/src/detect-threshold.c
+++ b/src/detect-threshold.c
@@ -1,6 +1,6 @@
 /* THRESHOLD part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectThresholdSetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *str);
diff --git a/src/detect-tls-version.c b/src/detect-tls-version.c
index 7a59c260ed..51af1fd93e 100644
--- a/src/detect-tls-version.c
+++ b/src/detect-tls-version.c
@@ -5,7 +5,7 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 #include "debug.h"
 #include "decode.h"
diff --git a/src/detect-ttl.c b/src/detect-ttl.c
index ddcf033714..de1820f14e 100644
--- a/src/detect-ttl.c
+++ b/src/detect-ttl.c
@@ -5,7 +5,7 @@
  * ttl rule keyword support for the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "stream-tcp.h"
 #include "util-unittest.h"
 #include "detect.h"
diff --git a/src/detect-uricontent.c b/src/detect-uricontent.c
index 251e16a062..c411c31b7f 100644
--- a/src/detect-uricontent.c
+++ b/src/detect-uricontent.c
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2008 by Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "detect-uricontent.h"
diff --git a/src/detect-window.c b/src/detect-window.c
index d3a415badf..bbc021e12d 100644
--- a/src/detect-window.c
+++ b/src/detect-window.c
@@ -5,7 +5,7 @@
  * WINDOW tcp window option, part of the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/detect-within.c b/src/detect-within.c
index 4c611648c2..f3e2591ac8 100644
--- a/src/detect-within.c
+++ b/src/detect-within.c
@@ -4,7 +4,7 @@
  *  \author Victor Julien <victor@inliniac.net>
  *  \todo within logic is not Snort compat atm: it is applied to pcre and uricontent as well */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"
diff --git a/src/detect.c b/src/detect.c
index c458a78eb7..7950edbfe9 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -1,7 +1,7 @@
 /* Basic detection engine */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"
@@ -2892,7 +2892,7 @@ void SigTableRegisterTests(void) {
 #include "flow-util.h"
 
 static const char *dummy_conf_string =
-    "default-log-dir: /var/log/eidps\n"
+    "default-log-dir: /var/log/suricata\n"
     "\n"
     "logging:\n"
     "\n"
@@ -2910,7 +2910,7 @@ static const char *dummy_conf_string =
     "    log-level: info\n"
     "\n"
     "  - interface: file\n"
-    "    filename: /var/log/eidps.log\n"
+    "    filename: /var/log/suricata.log\n"
     "\n"
     "  - interface: syslog\n"
     "    facility: local5\n"
diff --git a/src/flow-bit.c b/src/flow-bit.c
index 35fc0881f9..f60fcf967c 100644
--- a/src/flow-bit.c
+++ b/src/flow-bit.c
@@ -11,7 +11,7 @@
  *   multiple times, we can operate on all of them.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 #include "flow-bit.h"
 #include "flow.h"
diff --git a/src/flow-hash.c b/src/flow-hash.c
index b830e6b551..cb0eb6aa33 100644
--- a/src/flow-hash.c
+++ b/src/flow-hash.c
@@ -1,16 +1,13 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 #include "decode.h"
 #include "debug.h"
 #include "flow.h"
-
-#include "eidps-common.h"
 #include "flow-hash.h"
 #include "flow-util.h"
 #include "flow-private.h"
-
 #include "util-debug.h"
 
 /* calculate the hash key for this packet
diff --git a/src/flow-hash.h b/src/flow-hash.h
index c7e277c29c..102db303fa 100644
--- a/src/flow-hash.h
+++ b/src/flow-hash.h
@@ -10,7 +10,7 @@
 typedef struct FlowBucket_ {
     Flow *f;
     SCMutex m;
-} FlowBucket; 
+} FlowBucket;
 
 /* prototypes */
 
diff --git a/src/flow-queue.c b/src/flow-queue.c
index 03a9455110..b5368902a7 100644
--- a/src/flow-queue.c
+++ b/src/flow-queue.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 #include "debug.h"
 #include "flow-queue.h"
diff --git a/src/flow-queue.h b/src/flow-queue.h
index 3c80049613..9e0258508a 100644
--- a/src/flow-queue.h
+++ b/src/flow-queue.h
@@ -3,8 +3,8 @@
 #ifndef __FLOW_QUEUE_H__
 #define __FLOW_QUEUE_H__
 
+#include "suricata-common.h"
 #include "flow.h"
-#include "eidps-common.h"
 
 /* Define a queue for storing flows */
 typedef struct FlowQueue_
diff --git a/src/flow-util.c b/src/flow-util.c
index cee1da7f72..a659d4dafe 100644
--- a/src/flow-util.c
+++ b/src/flow-util.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 
 #include "flow.h"
diff --git a/src/flow-var.c b/src/flow-var.c
index e0dba5261b..f7e37e43dc 100644
--- a/src/flow-var.c
+++ b/src/flow-var.c
@@ -3,12 +3,12 @@
 /* TODO
  * - move away from a linked list implementation
  * - use different datatypes, such as string, int, etc.
- * - have more than one instance of the same var, and be able to match on a 
+ * - have more than one instance of the same var, and be able to match on a
  *   specific one, or one all at a time. So if a certain capture matches
  *   multiple times, we can operate on all of them.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 #include "flow-var.h"
 #include "flow.h"
diff --git a/src/flow.c b/src/flow.c
index e8a9837c2c..cd0e7c0249 100644
--- a/src/flow.c
+++ b/src/flow.c
@@ -8,7 +8,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "threadvars.h"
 #include "tm-modules.h"
diff --git a/src/host.c b/src/host.c
index cec9fb481f..644345f22d 100644
--- a/src/host.c
+++ b/src/host.c
@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "host.h"
 
 Host *HostAlloc(void) {
diff --git a/src/log-httplog.c b/src/log-httplog.c
index cdd60e9285..6d1d544d11 100644
--- a/src/log-httplog.c
+++ b/src/log-httplog.c
@@ -4,7 +4,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "pkt-var.h"
diff --git a/src/packet-queue.c b/src/packet-queue.c
index d851f10a04..8ee0272d44 100644
--- a/src/packet-queue.c
+++ b/src/packet-queue.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "packet-queue.h"
 #include "threads.h"
diff --git a/src/packet-queue.h b/src/packet-queue.h
index 887ca00df2..241811c54e 100644
--- a/src/packet-queue.h
+++ b/src/packet-queue.h
@@ -6,19 +6,6 @@
 #include "threads.h"
 #include "decode.h"
 
-/* XXX: moved to decode.h */
-#if 0
-typedef struct PacketQueue_ {
-    Packet *top;
-    Packet *bot;
-    uint16_t len;
-    SCMutex mutex_q;
-    SCCondT cond_q;
-#ifdef DBG_PERF
-    uint16_t dbg_maxlen;
-#endif /* DBG_PERF */
-} PacketQueue;
-#endif
 void PacketEnqueue (PacketQueue *, Packet *);
 Packet *PacketDequeue (PacketQueue *);
 
diff --git a/src/pkt-var.c b/src/pkt-var.c
index ffcdea91d7..0a89cd09c1 100644
--- a/src/pkt-var.c
+++ b/src/pkt-var.c
@@ -8,7 +8,7 @@
  *   multiple times, we can operate on all of them.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "pkt-var.h"
 
diff --git a/src/respond-reject-libnet11.c b/src/respond-reject-libnet11.c
index ef65a9e8b0..a421ab9d81 100644
--- a/src/respond-reject-libnet11.c
+++ b/src/respond-reject-libnet11.c
@@ -15,7 +15,7 @@
  */
 
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include <libnet.h>
 
diff --git a/src/respond-reject.c b/src/respond-reject.c
index 0c0807732a..71257c4411 100644
--- a/src/respond-reject.c
+++ b/src/respond-reject.c
@@ -11,7 +11,7 @@
  *   just return 0 always, error handling is a TODO in the threading model (VJ)
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "packet-queue.h"
 #include "threads.h"
diff --git a/src/runmodes.c b/src/runmodes.c
index af9c0d68b3..f3714bdd5f 100644
--- a/src/runmodes.c
+++ b/src/runmodes.c
@@ -6,7 +6,7 @@
  *  Pre-cooked threading runmodes.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect-engine.h"
 #include "tm-threads.h"
 #include "util-time.h"
diff --git a/src/source-nfq.c b/src/source-nfq.c
index e8051eedc2..8aefaef0b8 100644
--- a/src/source-nfq.c
+++ b/src/source-nfq.c
@@ -7,8 +7,8 @@
  *
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "packet-queue.h"
 #include "threads.h"
diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c
index 7622282a44..069e19acb7 100644
--- a/src/source-pcap-file.c
+++ b/src/source-pcap-file.c
@@ -12,8 +12,8 @@
 #include <pcap.h>
 #endif
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "packet-queue.h"
 #include "threads.h"
diff --git a/src/source-pcap.c b/src/source-pcap.c
index 7ab06fb83a..e4ccf6d8c4 100644
--- a/src/source-pcap.c
+++ b/src/source-pcap.c
@@ -6,8 +6,8 @@
 #include <pcap.h>
 #endif
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "packet-queue.h"
 #include "threads.h"
diff --git a/src/source-pfring.c b/src/source-pfring.c
index 9bada5d2e9..e26aac7ec2 100644
--- a/src/source-pfring.c
+++ b/src/source-pfring.c
@@ -4,8 +4,8 @@
 #include <pfring.h>
 #endif /* HAVE_PFRING */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "conf.h"
 #include "decode.h"
 #include "packet-queue.h"
diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index f2a16c4162..8aee4a23f4 100644
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -11,8 +11,8 @@
  * \todo segment insert fasttrack: most pkts are in order
 */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"
diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 6299f32509..e05f9bf0e6 100644
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -9,7 +9,7 @@
  *  \todo - 4WHS: what if after the 2nd SYN we turn out to be normal 3WHS anyway?
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "debug.h"
 #include "detect.h"
diff --git a/src/stream.c b/src/stream.c
index 2e48c5d2ec..dd43b68679 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2009 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "threads.h"
 #include "stream.h"
diff --git a/src/eidps-common.h b/src/suricata-common.h
similarity index 91%
rename from src/eidps-common.h
rename to src/suricata-common.h
index 0f6acbb026..f19dd7cce6 100644
--- a/src/eidps-common.h
+++ b/src/suricata-common.h
@@ -4,8 +4,8 @@
  * Common includes, etc.
  */
 
-#ifndef __EIDPS_COMMON_H__
-#define __EIDPS_COMMON_H__
+#ifndef __SURICATA_COMMON_H__
+#define __SURICATA_COMMON_H__
 
 #define TRUE   1
 #define FALSE  0
@@ -51,5 +51,5 @@
 #define SigIntId uint16_t
 //#define SigIntId uint32_t
 
-#endif /* __EIDPS_COMMON_H__ */
+#endif /* __SURICATA_COMMON_H__ */
 
diff --git a/src/eidps.c b/src/suricata.c
similarity index 99%
rename from src/eidps.c
rename to src/suricata.c
index 88f718290d..9681f4e7ab 100644
--- a/src/eidps.c
+++ b/src/suricata.c
@@ -1,12 +1,12 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include <getopt.h>
 #include <signal.h>
 #include <pthread.h>
 
-#include "eidps.h"
+#include "suricata.h"
 #include "decode.h"
 #include "detect.h"
 #include "packet-queue.h"
diff --git a/src/eidps.h b/src/suricata.h
similarity index 90%
rename from src/eidps.h
rename to src/suricata.h
index 1639a91489..852c8c02cf 100644
--- a/src/eidps.h
+++ b/src/suricata.h
@@ -6,14 +6,14 @@
  *
  */
 
-#ifndef __EIDPS_H__
-#define __EIDPS_H__
+#ifndef __SURICATA_H__
+#define __SURICATA_H__
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "packet-queue.h"
 
 /* the name of our binary */
-#define PROG_NAME "eidps"
+#define PROG_NAME "suricata"
 
 /* max packets processed simultaniously */
 #define MAX_PENDING 50
@@ -53,5 +53,5 @@ uint8_t g_u8_lowercasetable[256];
 void EngineStop(void);
 void EngineKill(void);
 
-#endif /* __EIDPS_H__ */
+#endif /* __SURICATA_H__ */
 
diff --git a/src/threads.c b/src/threads.c
index 2e12c402f8..bcff1a085d 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -5,7 +5,7 @@
  * \author Pablo Rincon Crespo <pablo.rincon.crespo@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "util-unittest.h"
 #include "debug.h"
 #include "util-debug.h"
diff --git a/src/tm-modules.c b/src/tm-modules.c
index b2c70e5f10..3f618a21ae 100644
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "packet-queue.h"
 #include "tm-modules.h"
 #include "util-debug.h"
diff --git a/src/tm-queuehandlers.c b/src/tm-queuehandlers.c
index 227106a257..2cfbc5c072 100644
--- a/src/tm-queuehandlers.c
+++ b/src/tm-queuehandlers.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "packet-queue.h"
 #include "decode.h"
 #include "threads.h"
diff --git a/src/tm-queues.c b/src/tm-queues.c
index 9a8f59a93c..6d04cb9d80 100644
--- a/src/tm-queues.c
+++ b/src/tm-queues.c
@@ -1,4 +1,4 @@
-#include "eidps.h"
+#include "suricata.h"
 #include "threads.h"
 #include "tm-queues.h"
 #include "util-debug.h"
diff --git a/src/tm-threads.c b/src/tm-threads.c
index 3c0ae4bc76..c5422a6ee8 100644
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -3,8 +3,8 @@
  *  \author Anoop Saldanha <poonaatsoc@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "stream.h"
 #include "threadvars.h"
 #include "tm-queues.h"
diff --git a/src/tmqh-flow.c b/src/tmqh-flow.c
index e8bf6fcda2..11e5642161 100644
--- a/src/tmqh-flow.c
+++ b/src/tmqh-flow.c
@@ -11,7 +11,7 @@
  *       account.
  */
 
-#include "eidps.h"
+#include "suricata.h"
 #include "packet-queue.h"
 #include "decode.h"
 #include "threads.h"
diff --git a/src/tmqh-nfq.c b/src/tmqh-nfq.c
index eed8beea1a..7f0cf77f2b 100644
--- a/src/tmqh-nfq.c
+++ b/src/tmqh-nfq.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "packet-queue.h"
 #include "decode.h"
 #include "threads.h"
diff --git a/src/tmqh-packetpool.c b/src/tmqh-packetpool.c
index bf8668d014..9e5f02a74e 100644
--- a/src/tmqh-packetpool.c
+++ b/src/tmqh-packetpool.c
@@ -1,6 +1,6 @@
 /* Packetpool queue handlers */
 
-#include "eidps.h"
+#include "suricata.h"
 #include "packet-queue.h"
 #include "decode.h"
 #include "detect.h"
diff --git a/src/tmqh-simple.c b/src/tmqh-simple.c
index 8d70441aff..4e0bf541ad 100644
--- a/src/tmqh-simple.c
+++ b/src/tmqh-simple.c
@@ -1,5 +1,5 @@
 
-#include "eidps.h"
+#include "suricata.h"
 #include "packet-queue.h"
 #include "decode.h"
 #include "threads.h"
diff --git a/src/util-binsearch.c b/src/util-binsearch.c
index cd3a7c6532..fad20b842f 100644
--- a/src/util-binsearch.c
+++ b/src/util-binsearch.c
@@ -1,5 +1,5 @@
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 
 /** \todo replace this by a better algo */
 
diff --git a/src/util-bloomfilter-counting.c b/src/util-bloomfilter-counting.c
index 9488524c9e..6d3fc483f9 100644
--- a/src/util-bloomfilter-counting.c
+++ b/src/util-bloomfilter-counting.c
@@ -4,7 +4,7 @@
  * counters.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "util-bloomfilter-counting.h"
 #include "util-unittest.h"
 
diff --git a/src/util-bloomfilter.c b/src/util-bloomfilter.c
index 7e83a9066a..0743c9568f 100644
--- a/src/util-bloomfilter.c
+++ b/src/util-bloomfilter.c
@@ -2,7 +2,7 @@
 
 /* Bitwise bloom filter implementation. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "util-bloomfilter.h"
 #include "util-unittest.h"
 
diff --git a/src/util-byte.c b/src/util-byte.c
index 7c4016f1e8..ce0433aa2c 100644
--- a/src/util-byte.c
+++ b/src/util-byte.c
@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "util-byte.h"
 #include "util-unittest.h"
 #include "util-debug.h"
diff --git a/src/util-cidr.c b/src/util-cidr.c
index b688253678..08c7c5e9c8 100644
--- a/src/util-cidr.c
+++ b/src/util-cidr.c
@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 static uint32_t cidrs[33];
 
diff --git a/src/util-debug-filters.c b/src/util-debug-filters.c
index 1eebe8c3a4..ef3ff91a5d 100644
--- a/src/util-debug-filters.c
+++ b/src/util-debug-filters.c
@@ -1,7 +1,7 @@
 /** Copyright (c) 2009 Open Information Security Foundation.
  *  \author Anoop Saldanha <poonaatsoc@gmail.com>
  */
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/util-debug.c b/src/util-debug.c
index 3558facbb8..f18df8d2ca 100644
--- a/src/util-debug.c
+++ b/src/util-debug.c
@@ -17,7 +17,7 @@
 #include "util-enum.h"
 #include "util-debug-filters.h"
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "packet-queue.h"
diff --git a/src/util-hash.c b/src/util-hash.c
index de88551cf2..b4ff6474bc 100644
--- a/src/util-hash.c
+++ b/src/util-hash.c
@@ -5,7 +5,7 @@
  * The 'Free' pointer can be used to have the API free your
  * hashed data. If it's NULL it's the callers responsebility */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "util-hash.h"
 #include "util-unittest.h"
 
diff --git a/src/util-hashlist.c b/src/util-hashlist.c
index 74bd80994d..4203ad1c3d 100644
--- a/src/util-hashlist.c
+++ b/src/util-hashlist.c
@@ -5,7 +5,7 @@
  * The 'Free' pointer can be used to have the API free your
  * hashed data. If it's NULL it's the callers responsebility */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "util-hashlist.h"
 #include "util-unittest.h"
 #include "util-debug.h"
diff --git a/src/util-host-os-info.c b/src/util-host-os-info.c
index aeb606ed15..c67758f76d 100644
--- a/src/util-host-os-info.c
+++ b/src/util-host-os-info.c
@@ -2,7 +2,7 @@
  *  \author Anoop Saldanha <poonaatsoc@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "util-host-os-info.h"
 #include "util-error.h"
 #include "util-debug.h"
diff --git a/src/util-mpm-b2g.c b/src/util-mpm-b2g.c
index f8188ab2ae..9f01a4da6a 100644
--- a/src/util-mpm-b2g.c
+++ b/src/util-mpm-b2g.c
@@ -14,8 +14,8 @@
 
 //#define PRINTMATCH
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "detect.h"
 #include "util-bloomfilter.h"
 #include "util-mpm-b2g.h"
diff --git a/src/util-mpm-b3g.c b/src/util-mpm-b3g.c
index 7b40f25d5e..86d40da461 100644
--- a/src/util-mpm-b3g.c
+++ b/src/util-mpm-b3g.c
@@ -12,8 +12,8 @@
  *
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "util-bloomfilter.h"
 #include "util-mpm-b3g.h"
 #include "util-unittest.h"
diff --git a/src/util-mpm-wumanber.c b/src/util-mpm-wumanber.c
index 646fe06e01..7e67646547 100644
--- a/src/util-mpm-wumanber.c
+++ b/src/util-mpm-wumanber.c
@@ -15,8 +15,8 @@
  *  - make sure runtime counters can be disabled (at compile time)
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "util-mpm.h"
 #include "util-mpm-wumanber.h"
 
diff --git a/src/util-mpm.c b/src/util-mpm.c
index 612945313e..144633b5af 100644
--- a/src/util-mpm.c
+++ b/src/util-mpm.c
@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "util-mpm.h"
 #include "util-debug.h"
 
diff --git a/src/util-pool.c b/src/util-pool.c
index e3a1e8ea20..756a7b6f22 100644
--- a/src/util-pool.c
+++ b/src/util-pool.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 by Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "util-pool.h"
 #include "util-unittest.h"
 #include "util-debug.h"
diff --git a/src/util-print.c b/src/util-print.c
index a2482f511a..d553960c35 100644
--- a/src/util-print.c
+++ b/src/util-print.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 by Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 void PrintRawUriFp(FILE *fp, uint8_t *buf, uint32_t buflen) {
     int i;
diff --git a/src/util-rule-vars.c b/src/util-rule-vars.c
index 96c0afadd9..a41573ed3f 100644
--- a/src/util-rule-vars.c
+++ b/src/util-rule-vars.c
@@ -2,7 +2,7 @@
  *  \author Anoop Saldanha <poonaatsoc@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "conf.h"
 #include "conf-yaml-loader.h"
 
@@ -88,7 +88,7 @@ char *SCRuleVarsGetConfVar(const char *conf_var_name,
 /**********************************Unittests***********************************/
 
 static const char *dummy_conf_string =
-    "default-log-dir: /var/log/eidps\n"
+    "default-log-dir: /var/log/suricata\n"
     "\n"
     "logging:\n"
     "\n"
@@ -106,7 +106,7 @@ static const char *dummy_conf_string =
     "    log-level: info\n"
     "\n"
     "  - interface: file\n"
-    "    filename: /var/log/eidps.log\n"
+    "    filename: /var/log/suricata.log\n"
     "\n"
     "  - interface: syslog\n"
     "    facility: local5\n"
diff --git a/src/util-time.c b/src/util-time.c
index 44ccee5b5d..f789cc895a 100644
--- a/src/util-time.c
+++ b/src/util-time.c
@@ -1,6 +1,6 @@
 /* Time keeping for offline (non-live) packet handling (pcap files) */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 #include "threads.h"
 #include "util-debug.h"
diff --git a/src/util-unittest.c b/src/util-unittest.c
index c4d073e460..9a08c90d02 100644
--- a/src/util-unittest.c
+++ b/src/util-unittest.c
@@ -5,7 +5,7 @@
  */
 
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "util-unittest.h"
 #include "util-debug.h"
 #include "util-time.h"
diff --git a/src/util-var-name.c b/src/util-var-name.c
index 65e7333a3f..b218022d59 100644
--- a/src/util-var-name.c
+++ b/src/util-var-name.c
@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 #include "util-hashlist.h"
 
diff --git a/src/util-var.c b/src/util-var.c
index db6744a335..03475e3bcf 100644
--- a/src/util-var.c
+++ b/src/util-var.c
@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 #include "util-var.h"
diff --git a/oisf.yaml b/suricata.yaml
similarity index 96%
rename from oisf.yaml
rename to suricata.yaml
index 9fa0e41dc9..d03847a7b7 100644
--- a/oisf.yaml
+++ b/suricata.yaml
@@ -1,7 +1,7 @@
 # The default logging directory.  Any log or output file will be
 # placed here if its not specified with a full path name.  This can be
 # overridden with the -l command line parameter.
-default-log-dir: /var/log/eidps
+default-log-dir: /var/log/suricata
 
 defrag:
   max-frags: 65535
@@ -41,7 +41,7 @@ logging:
   # Log to a file as well.  No log level specified so level will be
   # set to the default-log-level.
   - interface: file
-    filename: /var/log/eidps.log
+    filename: /var/log/suricata.log
 
   # Log to syslog with facility local5.  Again, no level specified so
   # will level will be set to default-log-level.  We also override the
@@ -65,7 +65,7 @@ pfring:
 
   #Set the default rule path here to search for the files.
   #if not set, it will look at the current working dir
-default-rule-path: /etc/eidps/
+default-rule-path: /etc/suricata/
 rule-files:
   - netbios.rules
   - x11.rules