diff --git a/lib/spack/spack/modules.py b/lib/spack/spack/modules.py
index 7d35839570c..8701a31c496 100644
--- a/lib/spack/spack/modules.py
+++ b/lib/spack/spack/modules.py
@@ -287,7 +287,7 @@ def tokens(self):
     def upper_tokens(self):
         """Tokens that can be substituted in environment variable names"""
         upper_tokens = {
-            'name': self.spec.name.upper()
+            'name': self.spec.name.replace('-', '_').upper()
         }
         return upper_tokens