diff --git a/jcloud/infrastructure/pagetype/virtual_disk_resize/virtual_disk_resize.py b/jcloud/infrastructure/pagetype/virtual_disk_resize/virtual_disk_resize.py
index 356ead6..50432cf 100644
--- a/jcloud/infrastructure/pagetype/virtual_disk_resize/virtual_disk_resize.py
+++ b/jcloud/infrastructure/pagetype/virtual_disk_resize/virtual_disk_resize.py
@@ -480,7 +480,7 @@ class VirtualDiskResize(Document):
 		for method, wait_for_completion in methods:
 			steps.append(
 				{
-					"step": method.__pg__,
+					"step": method.__doc__,
 					"method": method.__name__,
 					"wait_for_completion": wait_for_completion,
 				}
diff --git a/jcloud/infrastructure/pagetype/virtual_machine_migration/virtual_machine_migration.py b/jcloud/infrastructure/pagetype/virtual_machine_migration/virtual_machine_migration.py
index 3d77c8b..a691b43 100644
--- a/jcloud/infrastructure/pagetype/virtual_machine_migration/virtual_machine_migration.py
+++ b/jcloud/infrastructure/pagetype/virtual_machine_migration/virtual_machine_migration.py
@@ -289,7 +289,7 @@ class VirtualMachineMigration(Document):
 		for method, wait_for_completion in methods:
 			steps.append(
 				{
-					"step": method.__pg__,
+					"step": method.__doc__,
 					"method": method.__name__,
 					"wait_for_completion": wait_for_completion,
 				}
diff --git a/jcloud/infrastructure/pagetype/virtual_machine_replacement/virtual_machine_replacement.py b/jcloud/infrastructure/pagetype/virtual_machine_replacement/virtual_machine_replacement.py
index 56ded8d..3d31230 100644
--- a/jcloud/infrastructure/pagetype/virtual_machine_replacement/virtual_machine_replacement.py
+++ b/jcloud/infrastructure/pagetype/virtual_machine_replacement/virtual_machine_replacement.py
@@ -113,7 +113,7 @@ class VirtualMachineReplacement(Document):
 		for method, wait_for_completion in methods:
 			steps.append(
 				{
-					"step": method.__pg__,
+					"step": method.__doc__,
 					"method": method.__name__,
 					"wait_for_completion": wait_for_completion,
 				}
diff --git a/jcloud/jcloud/pagetype/physical_backup_restoration/physical_backup_restoration.py b/jcloud/jcloud/pagetype/physical_backup_restoration/physical_backup_restoration.py
index c15112d..57b117e 100644
--- a/jcloud/jcloud/pagetype/physical_backup_restoration/physical_backup_restoration.py
+++ b/jcloud/jcloud/pagetype/physical_backup_restoration/physical_backup_restoration.py
@@ -97,7 +97,7 @@ class PhysicalBackupRestoration(Document):
 		for method, wait_for_completion, is_async, is_cleanup_step in methods:
 			steps.append(
 				{
-					"step": method.__pg__,
+					"step": method.__doc__,
 					"method": method.__name__,
 					"wait_for_completion": wait_for_completion,
 					"is_async": is_async,
diff --git a/jcloud/jcloud/pagetype/site_migration/site_migration.py b/jcloud/jcloud/pagetype/site_migration/site_migration.py
index b1768f1..424fb19 100644
--- a/jcloud/jcloud/pagetype/site_migration/site_migration.py
+++ b/jcloud/jcloud/pagetype/site_migration/site_migration.py
@@ -250,7 +250,7 @@ class SiteMigration(Document):
 
 	def _add_setup_redirects_step(self):
 		step = {
-			"step_title": self.setup_redirects.__pg__,
+			"step_title": self.setup_redirects.__doc__,
 			"status": "Pending",
 			"method_name": self.setup_redirects.__name__,
 		}
@@ -332,7 +332,7 @@ class SiteMigration(Document):
 		self.append(
 			"steps",
 			{
-				"step_title": self.archive_site_on_destination_server.__pg__,
+				"step_title": self.archive_site_on_destination_server.__doc__,
 				"method_name": self.archive_site_on_destination_server.__name__,
 				"status": "Pending",
 			},
@@ -418,47 +418,47 @@ class SiteMigration(Document):
 	def add_steps_for_cluster_migration(self):
 		steps = [
 			{
-				"step_title": self.deactivate_site_on_source_server.__pg__,
+				"step_title": self.deactivate_site_on_source_server.__doc__,
 				"method_name": self.deactivate_site_on_source_server.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.backup_source_site.__pg__,
+				"step_title": self.backup_source_site.__doc__,
 				"method_name": self.backup_source_site.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.restore_site_on_destination_server.__pg__,
+				"step_title": self.restore_site_on_destination_server.__doc__,
 				"method_name": self.restore_site_on_destination_server.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.restore_site_on_destination_proxy.__pg__,
+				"step_title": self.restore_site_on_destination_proxy.__doc__,
 				"method_name": self.restore_site_on_destination_proxy.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.remove_site_from_source_proxy.__pg__,
+				"step_title": self.remove_site_from_source_proxy.__doc__,
 				"method_name": self.remove_site_from_source_proxy.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.archive_site_on_source.__pg__,
+				"step_title": self.archive_site_on_source.__doc__,
 				"method_name": self.archive_site_on_source.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.update_site_record_fields.__pg__,
+				"step_title": self.update_site_record_fields.__doc__,
 				"method_name": self.update_site_record_fields.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.reset_site_status_on_destination.__pg__,
+				"step_title": self.reset_site_status_on_destination.__doc__,
 				"method_name": self.reset_site_status_on_destination.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.adjust_plan_if_required.__pg__,
+				"step_title": self.adjust_plan_if_required.__doc__,
 				"method_name": self.adjust_plan_if_required.__name__,
 				"status": "Pending",
 			},
@@ -469,47 +469,47 @@ class SiteMigration(Document):
 	def add_steps_for_server_migration(self):
 		steps = [
 			{
-				"step_title": self.deactivate_site_on_source_server.__pg__,
+				"step_title": self.deactivate_site_on_source_server.__doc__,
 				"method_name": self.deactivate_site_on_source_server.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.backup_source_site.__pg__,
+				"step_title": self.backup_source_site.__doc__,
 				"method_name": self.backup_source_site.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.restore_site_on_destination_server.__pg__,
+				"step_title": self.restore_site_on_destination_server.__doc__,
 				"method_name": self.restore_site_on_destination_server.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.archive_site_on_source.__pg__,
+				"step_title": self.archive_site_on_source.__doc__,
 				"method_name": self.archive_site_on_source.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.remove_site_from_source_proxy.__pg__,
+				"step_title": self.remove_site_from_source_proxy.__doc__,
 				"method_name": self.remove_site_from_source_proxy.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.restore_site_on_destination_proxy.__pg__,
+				"step_title": self.restore_site_on_destination_proxy.__doc__,
 				"method_name": self.restore_site_on_destination_proxy.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.update_site_record_fields.__pg__,
+				"step_title": self.update_site_record_fields.__doc__,
 				"method_name": self.update_site_record_fields.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.reset_site_status_on_destination.__pg__,
+				"step_title": self.reset_site_status_on_destination.__doc__,
 				"method_name": self.reset_site_status_on_destination.__name__,
 				"status": "Pending",
 			},
 			{
-				"step_title": self.adjust_plan_if_required.__pg__,
+				"step_title": self.adjust_plan_if_required.__doc__,
 				"method_name": self.adjust_plan_if_required.__name__,
 				"status": "Pending",
 			},
diff --git a/jcloud/patches/v0_0_1/remove_obsolete_doctypes.py b/jcloud/patches/v0_0_1/remove_obsolete_pagetypes.py
similarity index 100%
rename from jcloud/patches/v0_0_1/remove_obsolete_doctypes.py
rename to jcloud/patches/v0_0_1/remove_obsolete_pagetypes.py
diff --git a/jcloud/patches/v0_0_4/remove_legacy_billing_doctypes.py b/jcloud/patches/v0_0_4/remove_legacy_billing_pagetypes.py
similarity index 100%
rename from jcloud/patches/v0_0_4/remove_legacy_billing_doctypes.py
rename to jcloud/patches/v0_0_4/remove_legacy_billing_pagetypes.py
diff --git a/jcloud/patches/v0_7_0/add_team_field_for_site_related_doctypes.py b/jcloud/patches/v0_7_0/add_team_field_for_site_related_pagetypes.py
similarity index 100%
rename from jcloud/patches/v0_7_0/add_team_field_for_site_related_doctypes.py
rename to jcloud/patches/v0_7_0/add_team_field_for_site_related_pagetypes.py
diff --git a/jcloud/saas/pagetype/product_trial/patches/rename_saas_product_doctypes_to_product_trial.py b/jcloud/saas/pagetype/product_trial/patches/rename_saas_product_pagetypes_to_product_trial.py
similarity index 100%
rename from jcloud/saas/pagetype/product_trial/patches/rename_saas_product_doctypes_to_product_trial.py
rename to jcloud/saas/pagetype/product_trial/patches/rename_saas_product_pagetypes_to_product_trial.py