diff --git a/harness/app.go b/harness/app.go
index a4ec244..73d33f7 100644
--- a/harness/app.go
+++ b/harness/app.go
@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/revel/revel"
 	"io"
 	"os"
 	"os/exec"
 	"time"
+
+	"github.com/revel/revel"
 )
 
 // App contains the configuration for running a Revel app.  (Not for the app itself)
diff --git a/harness/reflect.go b/harness/reflect.go
index 4c7df99..d027f5f 100644
--- a/harness/reflect.go
+++ b/harness/reflect.go
@@ -419,7 +419,7 @@ func appendAction(fset *token.FileSet, mm methodMap, decl ast.Decl, pkgImportPat
 	if selExpr.Sel.Name != "Result" {
 		return
 	}
-	if pkgIdent, ok := selExpr.X.(*ast.Ident); !ok || imports[pkgIdent.Name] != revel.REVEL_IMPORT_PATH {
+	if pkgIdent, ok := selExpr.X.(*ast.Ident); !ok || imports[pkgIdent.Name] != revel.RevelImportPath {
 		return
 	}
 
@@ -597,7 +597,7 @@ func getValidationParameter(funcDecl *ast.FuncDecl, imports map[string]string) *
 			continue
 		}
 
-		if selExpr.Sel.Name == "Validation" && imports[xIdent.Name] == revel.REVEL_IMPORT_PATH {
+		if selExpr.Sel.Name == "Validation" && imports[xIdent.Name] == revel.RevelImportPath {
 			return field.Names[0].Obj
 		}
 	}
@@ -675,14 +675,14 @@ func (s *SourceInfo) TypesThatEmbed(targetType string) (filtered []*TypeInfo) {
 
 func (s *SourceInfo) ControllerSpecs() []*TypeInfo {
 	if s.controllerSpecs == nil {
-		s.controllerSpecs = s.TypesThatEmbed(revel.REVEL_IMPORT_PATH + ".Controller")
+		s.controllerSpecs = s.TypesThatEmbed(revel.RevelImportPath + ".Controller")
 	}
 	return s.controllerSpecs
 }
 
 func (s *SourceInfo) TestSuites() []*TypeInfo {
 	if s.testSuites == nil {
-		s.testSuites = s.TypesThatEmbed(revel.REVEL_IMPORT_PATH + "/testing.TestSuite")
+		s.testSuites = s.TypesThatEmbed(revel.RevelImportPath + "/testing.TestSuite")
 	}
 	return s.testSuites
 }
diff --git a/harness/reflect_test.go b/harness/reflect_test.go
index f45364e..d348cf7 100644
--- a/harness/reflect_test.go
+++ b/harness/reflect_test.go
@@ -1,7 +1,6 @@
 package harness
 
 import (
-	"github.com/revel/revel"
 	"go/ast"
 	"go/parser"
 	"go/token"
@@ -10,6 +9,8 @@ import (
 	"reflect"
 	"strings"
 	"testing"
+
+	"github.com/revel/revel"
 )
 
 const validationKeysSource = `
@@ -77,7 +78,7 @@ func TestGetValidationKeys(t *testing.T) {
 	}
 
 	for i, decl := range file.Decls {
-		lineKeys := getValidationKeys(fset, decl.(*ast.FuncDecl), map[string]string{"revel": revel.REVEL_IMPORT_PATH})
+		lineKeys := getValidationKeys(fset, decl.(*ast.FuncDecl), map[string]string{"revel": revel.RevelImportPath})
 		for k, v := range expectedValidationKeys[i] {
 			if lineKeys[k] != v {
 				t.Errorf("Not found - %d: %v - Actual Map: %v", k, v, lineKeys)
diff --git a/revel/build.go b/revel/build.go
index a7a636d..25d2524 100644
--- a/revel/build.go
+++ b/revel/build.go
@@ -70,7 +70,7 @@ func buildApp(args []string) {
 	// Revel and the app are in a directory structure mirroring import path
 	srcPath := filepath.Join(destPath, "src")
 	destBinaryPath := filepath.Join(destPath, filepath.Base(app.BinaryPath))
-	tmpRevelPath := filepath.Join(srcPath, filepath.FromSlash(revel.REVEL_IMPORT_PATH))
+	tmpRevelPath := filepath.Join(srcPath, filepath.FromSlash(revel.RevelImportPath))
 	mustCopyFile(destBinaryPath, app.BinaryPath)
 	mustChmod(destBinaryPath, 0755)
 	mustCopyDir(filepath.Join(tmpRevelPath, "conf"), filepath.Join(revel.RevelPath, "conf"), nil)
diff --git a/revel/new.go b/revel/new.go
index c874898..1ada576 100644
--- a/revel/new.go
+++ b/revel/new.go
@@ -148,7 +148,7 @@ func setApplicationPath(args []string) {
 		errorf("Abort: Import path %s already exists.\n", importPath)
 	}
 
-	revelPkg, err = build.Import(revel.REVEL_IMPORT_PATH, "", build.FindOnly)
+	revelPkg, err = build.Import(revel.RevelImportPath, "", build.FindOnly)
 	if err != nil {
 		errorf("Abort: Could not find Revel source code: %s\n", err)
 	}
diff --git a/revel/run.go b/revel/run.go
index 7b477df..0c4841c 100644
--- a/revel/run.go
+++ b/revel/run.go
@@ -1,9 +1,10 @@
 package main
 
 import (
+	"strconv"
+
 	"github.com/revel/cmd/harness"
 	"github.com/revel/revel"
-	"strconv"
 )
 
 var cmdRun = &Command{