diff --git a/bootstrapvz/common/task_sets.py b/bootstrapvz/common/task_groups.py
similarity index 100%
rename from bootstrapvz/common/task_sets.py
rename to bootstrapvz/common/task_groups.py
diff --git a/bootstrapvz/providers/azure/__init__.py b/bootstrapvz/providers/azure/__init__.py
index f87e900..79d868d 100644
--- a/bootstrapvz/providers/azure/__init__.py
+++ b/bootstrapvz/providers/azure/__init__.py
@@ -26,25 +26,25 @@ def validate_manifest(data, validator, error):
 			error('Only extlinux can boot from unpartitioned disks', ['system', 'bootloader'])
 
 
-def resolve_tasks(tasklist, manifest):
-	from bootstrapvz.common import task_sets
-	tasklist.update(task_sets.base_set)
-	tasklist.update(task_sets.volume_set)
-	tasklist.update(task_sets.mounting_set)
-	tasklist.update(task_sets.get_apt_set(manifest))
-	tasklist.update(task_sets.locale_set)
+def resolve_tasks(taskset, manifest):
+	from bootstrapvz.common import task_groups
+	taskset.update(task_groups.base_set)
+	taskset.update(task_groups.volume_set)
+	taskset.update(task_groups.mounting_set)
+	taskset.update(task_groups.get_apt_set(manifest))
+	taskset.update(task_groups.locale_set)
 
-	tasklist.update(task_sets.bootloader_set.get(manifest.system['bootloader']))
+	taskset.update(task_groups.bootloader_set.get(manifest.system['bootloader']))
 
 	if manifest.volume['partitions']['type'] != 'none':
-		tasklist.update(task_sets.partitioning_set)
+		taskset.update(task_groups.partitioning_set)
 
 	if manifest.system.get('hostname', False):
-		tasklist.add(network.SetHostname)
+		taskset.add(network.SetHostname)
 	else:
-		tasklist.add(network.RemoveHostname)
+		taskset.add(network.RemoveHostname)
 
-	tasklist.update([tasks.packages.DefaultPackages,
+	taskset.update([tasks.packages.DefaultPackages,
 	                 loopback.Create,
 	                 security.EnableShadowConfig,
 	                 network.RemoveDNSInfo,
@@ -59,15 +59,15 @@ def resolve_tasks(tasklist, manifest):
 	                 ])
 
 	if manifest.bootstrapper.get('tarball', False):
-		tasklist.add(bootstrap.MakeTarball)
+		taskset.add(bootstrap.MakeTarball)
 
-	tasklist.update(task_sets.get_fs_specific_set(manifest.volume['partitions']))
+	taskset.update(task_groups.get_fs_specific_set(manifest.volume['partitions']))
 
 	if 'boot' in manifest.volume['partitions']:
-		tasklist.update(task_sets.boot_partition_set)
+		taskset.update(task_groups.boot_partition_set)
 
 
-def resolve_rollback_tasks(tasklist, manifest, counter_task):
+def resolve_rollback_tasks(taskset, manifest, counter_task):
 	counter_task(loopback.Create, volume.Delete)
 	counter_task(filesystem.CreateMountDir, filesystem.DeleteMountDir)
 	counter_task(partitioning.MapPartitions, partitioning.UnmapPartitions)
diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py
index 968e905..30badcb 100644
--- a/bootstrapvz/providers/ec2/__init__.py
+++ b/bootstrapvz/providers/ec2/__init__.py
@@ -51,15 +51,15 @@ def validate_manifest(data, validator, error):
 
 
 def resolve_tasks(taskset, manifest):
-	from bootstrapvz.common import task_sets
-	taskset.update(task_sets.base_set)
-	taskset.update(task_sets.mounting_set)
-	taskset.update(task_sets.get_apt_set(manifest))
-	taskset.update(task_sets.locale_set)
-	taskset.update(task_sets.ssh_set)
+	from bootstrapvz.common import task_groups
+	taskset.update(task_groups.base_set)
+	taskset.update(task_groups.mounting_set)
+	taskset.update(task_groups.get_apt_set(manifest))
+	taskset.update(task_groups.locale_set)
+	taskset.update(task_groups.ssh_set)
 
 	if manifest.volume['partitions']['type'] != 'none':
-		taskset.update(task_sets.partitioning_set)
+		taskset.update(task_groups.partitioning_set)
 
 	if manifest.system.get('hostname', False):
 		taskset.add(network.SetHostname)
@@ -95,7 +95,7 @@ def resolve_tasks(taskset, manifest):
 		taskset.add(boot.AddGrubPackage)
 		taskset.add(tasks.boot.ConfigurePVGrub)
 	else:
-		taskset.update(task_sets.bootloader_set.get(manifest.system['bootloader']))
+		taskset.update(task_groups.bootloader_set.get(manifest.system['bootloader']))
 
 	backing_specific_tasks = {'ebs': [tasks.ebs.Create,
 	                                  tasks.ebs.Attach,
@@ -117,10 +117,10 @@ def resolve_tasks(taskset, manifest):
 	if manifest.bootstrapper.get('tarball', False):
 		taskset.add(bootstrap.MakeTarball)
 
-	taskset.update(task_sets.get_fs_specific_set(manifest.volume['partitions']))
+	taskset.update(task_groups.get_fs_specific_set(manifest.volume['partitions']))
 
 	if 'boot' in manifest.volume['partitions']:
-		taskset.update(task_sets.boot_partition_set)
+		taskset.update(task_groups.boot_partition_set)
 
 
 def resolve_rollback_tasks(taskset, manifest, counter_task):
diff --git a/bootstrapvz/providers/kvm/__init__.py b/bootstrapvz/providers/kvm/__init__.py
index 142a8cf..b004907 100644
--- a/bootstrapvz/providers/kvm/__init__.py
+++ b/bootstrapvz/providers/kvm/__init__.py
@@ -24,25 +24,25 @@ def validate_manifest(data, validator, error):
 			error('Only extlinux can boot from unpartitioned disks', ['system', 'bootloader'])
 
 
-def resolve_tasks(tasklist, manifest):
-	from bootstrapvz.common import task_sets
-	tasklist.update(task_sets.base_set)
-	tasklist.update(task_sets.volume_set)
-	tasklist.update(task_sets.mounting_set)
-	tasklist.update(task_sets.get_apt_set(manifest))
-	tasklist.update(task_sets.locale_set)
+def resolve_tasks(taskset, manifest):
+	from bootstrapvz.common import task_groups
+	taskset.update(task_groups.base_set)
+	taskset.update(task_groups.volume_set)
+	taskset.update(task_groups.mounting_set)
+	taskset.update(task_groups.get_apt_set(manifest))
+	taskset.update(task_groups.locale_set)
 
-	tasklist.update(task_sets.bootloader_set.get(manifest.system['bootloader']))
+	taskset.update(task_groups.bootloader_set.get(manifest.system['bootloader']))
 
 	if manifest.volume['partitions']['type'] != 'none':
-		tasklist.update(task_sets.partitioning_set)
+		taskset.update(task_groups.partitioning_set)
 
 	if manifest.system.get('hostname', False):
-		tasklist.add(network.SetHostname)
+		taskset.add(network.SetHostname)
 	else:
-		tasklist.add(network.RemoveHostname)
+		taskset.add(network.RemoveHostname)
 
-	tasklist.update([tasks.packages.DefaultPackages,
+	taskset.update([tasks.packages.DefaultPackages,
 
 	                 loopback.Create,
 
@@ -58,19 +58,19 @@ def resolve_tasks(tasklist, manifest):
 	                 ])
 
 	if manifest.bootstrapper.get('tarball', False):
-		tasklist.add(bootstrap.MakeTarball)
+		taskset.add(bootstrap.MakeTarball)
 
 	if manifest.bootstrapper.get('virtio', []):
 		from tasks import virtio
-		tasklist.update([virtio.VirtIO])
+		taskset.update([virtio.VirtIO])
 
-	tasklist.update(task_sets.get_fs_specific_set(manifest.volume['partitions']))
+	taskset.update(task_groups.get_fs_specific_set(manifest.volume['partitions']))
 
 	if 'boot' in manifest.volume['partitions']:
-		tasklist.update(task_sets.boot_partition_set)
+		taskset.update(task_groups.boot_partition_set)
 
 
-def resolve_rollback_tasks(tasklist, manifest, counter_task):
+def resolve_rollback_tasks(taskset, manifest, counter_task):
 	counter_task(loopback.Create, volume.Delete)
 	counter_task(filesystem.CreateMountDir, filesystem.DeleteMountDir)
 	counter_task(partitioning.MapPartitions, partitioning.UnmapPartitions)
diff --git a/bootstrapvz/providers/virtualbox/__init__.py b/bootstrapvz/providers/virtualbox/__init__.py
index a133690..1a63993 100644
--- a/bootstrapvz/providers/virtualbox/__init__.py
+++ b/bootstrapvz/providers/virtualbox/__init__.py
@@ -25,17 +25,17 @@ def validate_manifest(data, validator, error):
 
 
 def resolve_tasks(taskset, manifest):
-	from bootstrapvz.common import task_sets
-	taskset.update(task_sets.base_set)
-	taskset.update(task_sets.volume_set)
-	taskset.update(task_sets.mounting_set)
-	taskset.update(task_sets.get_apt_set(manifest))
-	taskset.update(task_sets.locale_set)
+	from bootstrapvz.common import task_groups
+	taskset.update(task_groups.base_set)
+	taskset.update(task_groups.volume_set)
+	taskset.update(task_groups.mounting_set)
+	taskset.update(task_groups.get_apt_set(manifest))
+	taskset.update(task_groups.locale_set)
 
-	taskset.update(task_sets.bootloader_set.get(manifest.system['bootloader']))
+	taskset.update(task_groups.bootloader_set.get(manifest.system['bootloader']))
 
 	if manifest.volume['partitions']['type'] != 'none':
-		taskset.update(task_sets.partitioning_set)
+		taskset.update(task_groups.partitioning_set)
 
 	if manifest.system.get('hostname', False):
 		taskset.add(network.SetHostname)
@@ -67,10 +67,10 @@ def resolve_tasks(taskset, manifest):
 	if manifest.bootstrapper.get('tarball', False):
 		taskset.add(bootstrap.MakeTarball)
 
-	taskset.update(task_sets.get_fs_specific_set(manifest.volume['partitions']))
+	taskset.update(task_groups.get_fs_specific_set(manifest.volume['partitions']))
 
 	if 'boot' in manifest.volume['partitions']:
-		taskset.update(task_sets.boot_partition_set)
+		taskset.update(task_groups.boot_partition_set)
 
 
 def resolve_rollback_tasks(taskset, manifest, counter_task):