diff --git a/fedora.conf b/fedora.conf
index e6e7f82..360e1b9 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -277,18 +277,18 @@ global_version = 'Rawhide'
 global_target = 'f28'
 
 image_build = {
-    '^Docker$': [
+    '^Container$': [
         {
             'image-build': {
                     'format': [('docker', 'tar.xz')],
-                    'name': 'Fedora-Docker-Base',
+                    'name': 'Fedora-Container-Base',
                     'kickstart': 'fedora-docker-base.ks',
                     'distro': 'Fedora-22',
                     'disk_size': 5,
                     'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
                     'repo': 'Everything',
                     'install_tree_from': 'Everything',
-                    'subvariant': 'Docker_Base',
+                    'subvariant': 'Container_Base',
                     'failable': ['*'],
                     },
             'factory-parameters': {
diff --git a/variants-fedora.xml b/variants-fedora.xml
index f93c011..8265554 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -17,7 +17,7 @@
             <arch>x86_64</arch>
         </arches>
     </variant>
-    <variant id="Docker" name="Docker" type="variant" is_empty="true">
+    <variant id="Container" name="Container" type="variant" is_empty="true">
         <arches>
             <arch>aarch64</arch>
             <arch>armhfp</arch>