diff --git a/var/spack/repos/builtin/packages/charm/mpi.patch b/var/spack/repos/builtin/packages/charmpp/mpi.patch
similarity index 100%
rename from var/spack/repos/builtin/packages/charm/mpi.patch
rename to var/spack/repos/builtin/packages/charmpp/mpi.patch
diff --git a/var/spack/repos/builtin/packages/charm/package.py b/var/spack/repos/builtin/packages/charmpp/package.py
similarity index 99%
rename from var/spack/repos/builtin/packages/charm/package.py
rename to var/spack/repos/builtin/packages/charmpp/package.py
index b4fc48ae9fd..d713a61f5b2 100644
--- a/var/spack/repos/builtin/packages/charm/package.py
+++ b/var/spack/repos/builtin/packages/charmpp/package.py
@@ -30,7 +30,7 @@
 from spack import *
 
 
-class Charm(Package):
+class Charmpp(Package):
     """Charm++ is a parallel programming framework in C++ supported by
     an adaptive runtime system, which enhances user productivity and
     allows programs to run portably from small multicore computers
diff --git a/var/spack/repos/builtin/packages/charm/strictpass.patch b/var/spack/repos/builtin/packages/charmpp/strictpass.patch
similarity index 100%
rename from var/spack/repos/builtin/packages/charm/strictpass.patch
rename to var/spack/repos/builtin/packages/charmpp/strictpass.patch
diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py
index 6179cacd84f..96e3f3ad4bf 100644
--- a/var/spack/repos/builtin/packages/namd/package.py
+++ b/var/spack/repos/builtin/packages/namd/package.py
@@ -43,7 +43,7 @@ class Namd(MakefilePackage):
     variant('interface', default='none', values=('none', 'tcl', 'python'),
             description='Enables TCL and/or python interface')
 
-    depends_on('charm')
+    depends_on('charmpp')
 
     depends_on('fftw@:2.99', when="fftw=2")
     depends_on('fftw@3:', when="fftw=3")
diff --git a/var/spack/repos/builtin/packages/quinoa/package.py b/var/spack/repos/builtin/packages/quinoa/package.py
index e00814950d3..2f9f91a8666 100644
--- a/var/spack/repos/builtin/packages/quinoa/package.py
+++ b/var/spack/repos/builtin/packages/quinoa/package.py
@@ -39,7 +39,7 @@ class Quinoa(CMakePackage):
     version('develop', branch='master')
 
     depends_on('hdf5+mpi')
-    depends_on("charm backend=mpi")
+    depends_on("charmpp backend=mpi")
     depends_on("trilinos+exodus")
     depends_on("boost")
     depends_on("hypre~internal-superlu")