diff --git a/units/user-configdrive.service b/units/user-configdrive.service
index 2750a009..e24b6d30 100644
--- a/units/user-configdrive.service
+++ b/units/user-configdrive.service
@@ -6,14 +6,14 @@ Before=user-config.target
 
 # HACK: work around ordering between config drive and ec2 metadata It is
 # possible for OpenStack style systems to provide both the metadata service
-# and config drive, to prevent the two from stomping on eachother force
+# and config drive, to prevent the two from stomping on each other, force
 # this to run after OEM and after metadata (if it exsts). I'm doing this
-# here instead of in the ec2 service because the ec2 unit is not written
+# here instead of in the oem service because the oem unit is not written
 # to disk until the OEM cloud config is evaluated and I want to make sure
 # systemd knows about the ordering as early as possible.
 # coreos-cloudinit could implement a simple lock but that cannot be used
 # until after the systemd dbus calls are made non-blocking.
-After=ec2-cloudinit.service
+After=oem-cloudinit.service
 
 [Service]
 Type=oneshot