diff --git a/lib/spack/spack/platforms/bgq.py b/lib/spack/spack/platforms/bgq.py
index 6e872d2e729..b550f1d5cb8 100644
--- a/lib/spack/spack/platforms/bgq.py
+++ b/lib/spack/spack/platforms/bgq.py
@@ -1,5 +1,4 @@
 import os
-
 from spack.architecture import Platform, Target
 
 class Bgq(Platform):
diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py
index da90726fefc..ea3ae0e477d 100644
--- a/lib/spack/spack/platforms/cray_xc.py
+++ b/lib/spack/spack/platforms/cray_xc.py
@@ -1,7 +1,7 @@
 import os
 from spack.architecture import Platform, Target
-from spack.operating_system.linux_distro import LinuxDistro
-from spack.operating_system.cnl import Cnl
+from spack.operating_systems.linux_distro import LinuxDistro
+from spack.operating_systems.cnl import Cnl
 
 class CrayXc(Platform):
     priority    = 20
diff --git a/lib/spack/spack/platforms/darwin.py b/lib/spack/spack/platforms/darwin.py
index 45128573714..c48f7d17d2b 100644
--- a/lib/spack/spack/platforms/darwin.py
+++ b/lib/spack/spack/platforms/darwin.py
@@ -1,6 +1,6 @@
 import subprocess
 from spack.architecture import Platform, Target
-from spack.operating_system.mac_osx import MacOsx
+from spack.operating_systems.mac_osx import MacOsx
 
 class Darwin(Platform):
     priority    = 89
diff --git a/lib/spack/spack/platforms/linux.py b/lib/spack/spack/platforms/linux.py
index 220f1bbaf40..1b22b69048f 100644
--- a/lib/spack/spack/platforms/linux.py
+++ b/lib/spack/spack/platforms/linux.py
@@ -1,6 +1,6 @@
 import subprocess
 from spack.architecture import Platform, Target
-from spack.operating_system.linux_distro import LinuxDistro
+from spack.operating_systems.linux_distro import LinuxDistro
 
 class Linux(Platform):
     priority    = 90