diff --git a/client/driver/docker.go b/client/driver/docker.go
index 5aab357aa..33d6184a3 100644
--- a/client/driver/docker.go
+++ b/client/driver/docker.go
@@ -19,8 +19,8 @@ import (
 
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/config"
+	"github.com/hashicorp/nomad/client/driver/logcollector"
 	cstructs "github.com/hashicorp/nomad/client/driver/structs"
-	"github.com/hashicorp/nomad/client/driver/syslog"
 	"github.com/hashicorp/nomad/client/fingerprint"
 	"github.com/hashicorp/nomad/helper/discover"
 	"github.com/hashicorp/nomad/nomad/structs"
@@ -82,7 +82,7 @@ type dockerPID struct {
 
 type DockerHandle struct {
 	pluginClient     *plugin.Client
-	logCollector     syslog.LogCollector
+	logCollector     logcollector.LogCollector
 	client           *docker.Client
 	logger           *log.Logger
 	cleanupContainer bool
@@ -503,7 +503,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle
 	if err != nil {
 		return nil, err
 	}
-	logCollectorCtx := &syslog.LogCollectorContext{
+	logCollectorCtx := &logcollector.LogCollectorContext{
 		TaskName:       task.Name,
 		AllocDir:       ctx.AllocDir,
 		LogConfig:      task.LogConfig,
diff --git a/client/driver/syslog/collector.go b/client/driver/logcollector/collector.go
similarity index 98%
rename from client/driver/syslog/collector.go
rename to client/driver/logcollector/collector.go
index c4e173e8f..e833465f5 100644
--- a/client/driver/syslog/collector.go
+++ b/client/driver/logcollector/collector.go
@@ -1,4 +1,4 @@
-package syslog
+package logcollector
 
 import (
 	"fmt"
@@ -119,8 +119,8 @@ func (s *SyslogCollector) LaunchCollector(ctx *LogCollectorContext) (*SyslogColl
 		for logParts := range channel {
 			// If the severity of the log line is err then we write to stderr
 			// otherwise all messages go to stdout
-			s := logParts["severity"].(s1.Priority)
-			if s == s1.LOG_ERR {
+			s := logParts["severity"].(Priority)
+			if s.Severity == s1.LOG_ERR {
 				we.Write(logParts["content"].([]byte))
 			} else {
 				wo.Write(logParts["content"].([]byte))
diff --git a/client/driver/syslog/parser.go b/client/driver/logcollector/parser.go
similarity index 99%
rename from client/driver/syslog/parser.go
rename to client/driver/logcollector/parser.go
index 807701c04..eeb910a6f 100644
--- a/client/driver/syslog/parser.go
+++ b/client/driver/logcollector/parser.go
@@ -1,4 +1,4 @@
-package syslog
+package logcollector
 
 import (
 	"bufio"
diff --git a/client/driver/syslog/parser_test.go b/client/driver/logcollector/parser_test.go
similarity index 90%
rename from client/driver/syslog/parser_test.go
rename to client/driver/logcollector/parser_test.go
index 89f5b866b..2c62049c5 100644
--- a/client/driver/syslog/parser_test.go
+++ b/client/driver/logcollector/parser_test.go
@@ -1,4 +1,4 @@
-package syslog
+package logcollector
 
 import (
 	"log/syslog"
@@ -12,8 +12,8 @@ func TestLogParser_Priority(t *testing.T) {
 	if err != nil {
 		t.Fatalf("got an err: %v", err)
 	}
-	if p.S != syslog.LOG_INFO {
-		t.Fatalf("expected serverity: %v, got: %v", syslog.LOG_INFO, p.S)
+	if p.Severity != syslog.LOG_INFO {
+		t.Fatalf("expected serverity: %v, got: %v", syslog.LOG_INFO, p.Severity)
 	}
 
 	idx := d.logContentIndex(line)
diff --git a/client/driver/syslog_plugin.go b/client/driver/syslog_plugin.go
index 2a0f104b7..b4cee69fb 100644
--- a/client/driver/syslog_plugin.go
+++ b/client/driver/syslog_plugin.go
@@ -5,7 +5,7 @@ import (
 	"net/rpc"
 
 	"github.com/hashicorp/go-plugin"
-	"github.com/hashicorp/nomad/client/driver/syslog"
+	"github.com/hashicorp/nomad/client/driver/logcollector"
 	"github.com/hashicorp/nomad/nomad/structs"
 )
 
@@ -14,11 +14,11 @@ type SyslogCollectorRPC struct {
 }
 
 type LaunchCollectorArgs struct {
-	Ctx *syslog.LogCollectorContext
+	Ctx *logcollector.LogCollectorContext
 }
 
-func (e *SyslogCollectorRPC) LaunchCollector(ctx *syslog.LogCollectorContext) (*syslog.SyslogCollectorState, error) {
-	var ss *syslog.SyslogCollectorState
+func (e *SyslogCollectorRPC) LaunchCollector(ctx *logcollector.LogCollectorContext) (*logcollector.SyslogCollectorState, error) {
+	var ss *logcollector.SyslogCollectorState
 	err := e.client.Call("Plugin.LaunchCollector", LaunchCollectorArgs{Ctx: ctx}, &ss)
 	return ss, err
 }
@@ -32,11 +32,11 @@ func (e *SyslogCollectorRPC) UpdateLogConfig(logConfig *structs.LogConfig) error
 }
 
 type SyslogCollectorRPCServer struct {
-	Impl syslog.LogCollector
+	Impl logcollector.LogCollector
 }
 
 func (s *SyslogCollectorRPCServer) LaunchCollector(args LaunchCollectorArgs,
-	resp *syslog.SyslogCollectorState) error {
+	resp *logcollector.SyslogCollectorState) error {
 	ss, err := s.Impl.LaunchCollector(args.Ctx)
 	if ss != nil {
 		*resp = *ss
@@ -59,7 +59,7 @@ type SyslogCollectorPlugin struct {
 
 func (p *SyslogCollectorPlugin) Server(*plugin.MuxBroker) (interface{}, error) {
 	if p.Impl == nil {
-		p.Impl = &SyslogCollectorRPCServer{Impl: syslog.NewSyslogCollector(p.logger)}
+		p.Impl = &SyslogCollectorRPCServer{Impl: logcollector.NewSyslogCollector(p.logger)}
 	}
 	return p.Impl, nil
 }
diff --git a/client/driver/utils.go b/client/driver/utils.go
index 21b83d033..bfb923e1b 100644
--- a/client/driver/utils.go
+++ b/client/driver/utils.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/nomad/client/config"
 	"github.com/hashicorp/nomad/client/driver/executor"
-	"github.com/hashicorp/nomad/client/driver/syslog"
+	"github.com/hashicorp/nomad/client/driver/logcollector"
 )
 
 // createExecutor launches an executor plugin and returns an instance of the
@@ -42,7 +42,7 @@ func createExecutor(config *plugin.ClientConfig, w io.Writer,
 }
 
 func createLogCollector(config *plugin.ClientConfig, w io.Writer,
-	clientConfig *config.Config) (syslog.LogCollector, *plugin.Client, error) {
+	clientConfig *config.Config) (logcollector.LogCollector, *plugin.Client, error) {
 	config.HandshakeConfig = HandshakeConfig
 	config.Plugins = GetPluginMap(w)
 	config.MaxPort = clientConfig.ClientMaxPort
@@ -61,7 +61,7 @@ func createLogCollector(config *plugin.ClientConfig, w io.Writer,
 	if err != nil {
 		return nil, nil, fmt.Errorf("unable to dispense the syslog plugin: %v", err)
 	}
-	logCollector := raw.(syslog.LogCollector)
+	logCollector := raw.(logcollector.LogCollector)
 	return logCollector, syslogClient, nil
 }