diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py
index 918e17323b3f8143c8f56522034abcaae19e3728..67c64276ee579d0bbb7a9f524b1fbf53d6c5aa6e 100644
--- a/lib/spack/spack/__init__.py
+++ b/lib/spack/spack/__init__.py
@@ -189,14 +189,14 @@
 __all__ = ['Package',
            'CMakePackage',
            'AutotoolsPackage',
-           'EditableMakefile',
+           'MakefilePackage',
            'Version',
            'when',
            'ver',
            'alldeps',
            'nolink']
 from spack.package import Package, ExtensionConflictError
-from spack.build_systems.editable_makefile import EditableMakefile
+from spack.build_systems.makefile import MakefilePackage
 from spack.build_systems.autotools import AutotoolsPackage
 from spack.build_systems.cmake import CMakePackage
 from spack.version import Version, ver
diff --git a/lib/spack/spack/build_systems/editable_makefile.py b/lib/spack/spack/build_systems/makefile.py
similarity index 97%
rename from lib/spack/spack/build_systems/editable_makefile.py
rename to lib/spack/spack/build_systems/makefile.py
index e3adea83636e0b59d4e69abe26999c2b8691871d..dcddadeedc06eaa7746e1cc1b0aaa21383b7e79f 100644
--- a/lib/spack/spack/build_systems/editable_makefile.py
+++ b/lib/spack/spack/build_systems/makefile.py
@@ -29,7 +29,7 @@
 from spack.package import PackageBase
 
 
-class EditableMakefile(PackageBase):
+class MakefilePackage(PackageBase):
     """Specialized class for packages that are built using editable Makefiles
 
     This class provides three phases that can be overridden:
@@ -43,7 +43,7 @@ class EditableMakefile(PackageBase):
     phases = ['edit', 'build', 'install']
     # To be used in UI queries that require to know which
     # build-system class we are using
-    build_system_class = 'EditableMakefile'
+    build_system_class = 'MakefilePackage'
 
     def build_directory(self):
         """Directory where the main Makefile is located"""
diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py
index fdd9c2111ebb011c5cbf5e9a18d400b3dcac46b0..31e1efb5915a51670e471e047ddb2f567246b968 100644
--- a/var/spack/repos/builtin/packages/astyle/package.py
+++ b/var/spack/repos/builtin/packages/astyle/package.py
@@ -25,7 +25,7 @@
 from spack import *
 
 
-class Astyle(EditableMakefile):
+class Astyle(MakefilePackage):
     """A Free, Fast, and Small Automatic Formatter for C, C++, C++/CLI,
     Objective-C, C#, and Java Source Code.
     """