diff --git a/fedora-modular-container-base-minimal.ks b/fedora-modular-container-base-minimal.ks
index 3a44c86..2cfb971 100644
--- a/fedora-modular-container-base-minimal.ks
+++ b/fedora-modular-container-base-minimal.ks
@@ -1,4 +1,4 @@
-# See docker-base-common.ks for details on how to hack on docker image kickstarts
+# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
 # This base is a stripped back Fedora image without python3/dnf.
 # If you need that use the standard base image.
 
@@ -47,7 +47,7 @@ rm -rfv /var/cache/* /var/log/* /tmp/*
 set -eux
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
-# Fix /run/lock breakage since it's not tmpfs in docker
+# Fix /run/lock breakage since it's not tmpfs in container
 # This unmounts /run (tmpfs) and then recreates the files
 # in the /run directory on the root filesystem of the container
 # NOTE: run this in nochroot because "umount" does not exist in chroot
diff --git a/fedora-modular-container-base.ks b/fedora-modular-container-base.ks
index ef8d1c7..f809c59 100644
--- a/fedora-modular-container-base.ks
+++ b/fedora-modular-container-base.ks
@@ -1,4 +1,4 @@
-# See docker-base-common.ks for details on how to hack on docker image kickstarts
+# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
 # This base is a standard Fedora image with python3 and dnf
 
 %include fedora-modular-container-common.ks
@@ -22,7 +22,7 @@ rm -rf /tmp/*
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
-# Fix /run/lock breakage since it's not tmpfs in docker
+# Fix /run/lock breakage since it's not tmpfs in container
 # This unmounts /run (tmpfs) and then recreates the files
 # in the /run directory on the root filesystem of the container
 #
diff --git a/fedora-modular-container-common.ks b/fedora-modular-container-common.ks
index 69a5a40..f902272 100644
--- a/fedora-modular-container-common.ks
+++ b/fedora-modular-container-common.ks
@@ -1,4 +1,4 @@
-# This is the common bits between Fedora Docker base image.
+# This is the common bits between Fedora Container base image.
 #
 # To keep this image minimal it only installs English language. You need to change
 # dnf configuration in order to enable other languages.
@@ -12,8 +12,8 @@
 #
 # Then, once you have imagefactory and imagefactory-plugins installed, run:
 #
-#   ksflatten -c fedora-docker-base[-minimal].ks -o fedora-docker-base-test.ks
-#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base-test.ks docker
+#   ksflatten -c fedora-container-base[-minimal].ks -o fedora-container-base-test.ks
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-container-base-test.ks container
 #
 
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
@@ -24,7 +24,7 @@ keyboard us
 network --bootproto=dhcp --device=link --activate --onboot=on
 reboot
 
-# boot partitions are irrelevant as the final docker image is a tarball
+# boot partitions are irrelevant as the final container image is a tarball
 zerombr
 clearpart --all
 autopart --noboot --nohome --noswap --nolvm
@@ -54,8 +54,7 @@ set -eux
 LANG="en_US"
 echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
-echo "Import RPM GPG key"
+# https://bugzilla.redhat.com/show_bug.cgi?id=1400682echo "Import RPM GPG key"
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary