diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py
index b37d36a62c..d48b6ffcfa 100644
--- a/lib/spack/spack/platforms/cray_xc.py
+++ b/lib/spack/spack/platforms/cray_xc.py
@@ -17,7 +17,7 @@ def __init__(self):
             if we use CRAY_CPU_TARGET as the default. This will ensure
             that if we're on a XC-40 or XC-30 then we can detect the target
         '''
-        super(CrayXc, self).__init__('cray_xc')
+        super(CrayXc, self).__init__('crayxc')
 
         # Handle the default here so we can check for a key error
         if 'CRAY_CPU_TARGET' in os.environ:
@@ -28,23 +28,21 @@ def __init__(self):
             self.front_end = self.default
             self.back_end = self.default
 
-
         # Could switch to use modules and fe targets for front end
         # Currently using compilers by path for front end.
         self.add_target('sandybridge', Target('sandybridge', 'PATH'))
-        self.add_target('ivybridge', Target('ivybridge', 'MODULES', 'craype-ivybridge'))
-        self.add_target('haswell', Target('haswell', 'MODULES', 'craype-haswell'))
-        
-        self.add_operating_system('SuSE11', OperatingSystem('SuSE11', '11'))
-        self.add_operating_system('GNU/Linux', OperatingSystem('GNU/Linux', '10'))
 
-#        self.add_target(self.front_end, Target(self.front_end, 'PATH'))
-        # Back End compiler needs the proper target module loaded.
-#        self.add_target(self.back_end, Target(self.front_end, 'MODULES', 'craype-'+ self.back_end))
-#        self.add_target(self.default, Target(self.default, 'MODULES', 'craype-' + self.default))
-        # This is kludgy and the order matters when the targets are all haswell
-        # This is because the last one overwrites the others when they have the
-        # same name.
+        self.add_target('ivybridge', 
+                        Target('ivybridge', 'MODULES', 'craype-ivybridge'))
+
+        self.add_target('haswell', 
+                        Target('haswell', 'MODULES', 'craype-haswell')) 
+
+        self.add_operating_system('SuSE11', 
+                                  OperatingSystem('SuSE11', '11'))
+
+        self.add_operating_system('GNU/Linux', 
+                                  OperatingSystem('GNU/Linux', '10'))
 
     @classmethod
     def detect(self):