diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 01bd34f4..5b60b73a 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -7,5 +7,5 @@ b7d4540c32075cbf569d9c8e256a8ce9898c7115
 # Fix Agent Job Type fixtures
 0c88a71473a906c87c58c94cc11743f79711d240
 
-# Generate DocType types
+# Generate PageType types
 a965b98b90fadf438c5f0a22c5778896743a94e7
\ No newline at end of file
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index a957c5cb..31dc92df 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -168,7 +168,7 @@ jobs:
       - name: Setup Test Users
         working-directory: /home/runner/jingrow-bench/apps/jcloude/dashboard
         run: |
-          bench --site test_site execute jcloude.jcloude.doctype.team.test_team.create_test_jcloude_admin_team \
+          bench --site test_site execute jcloude.jcloude.pagetype.team.test_team.create_test_jcloude_admin_team \
             --kwargs "{\"email\": \"${JCLOUDE _ADMIN_USER_EMAIL}\", \"free_account\": True, \"skip_onboarding\": True}"
           bench --site test_site set-password "$JCLOUDE _ADMIN_USER_EMAIL" "$JCLOUDE _ADMIN_USER_PASSWORD"
 
diff --git a/dashboard/src/components/AccessRequestButton.vue b/dashboard/src/components/AccessRequestButton.vue
index f287c4b8..d1a1aff2 100644
--- a/dashboard/src/components/AccessRequestButton.vue
+++ b/dashboard/src/components/AccessRequestButton.vue
@@ -7,12 +7,12 @@
 			() => {
 				renderDialog(
 					h(DialogComponent, {
-						doctype,
+						pagetype,
 						docname,
 						onOpenRequestDialog: () => {
 							renderDialog(
 								h(AccessRequestDialog, {
-									doctype,
+									pagetype,
 									docname,
 								}),
 							);
@@ -32,7 +32,7 @@ import AccessRequestDialog from './AccessRequestDialog.vue';
 import AccessRequestStatusDialog from './AccessRequestStatusDialog.vue';
 
 const props = defineProps<{
-	doctype: string;
+	pagetype: string;
 	docname: string;
 	pg?: any;
 	error?: Error;
diff --git a/dashboard/src/components/AccessRequestDialog.vue b/dashboard/src/components/AccessRequestDialog.vue
index a7ba7c1d..93381325 100644
--- a/dashboard/src/components/AccessRequestDialog.vue
+++ b/dashboard/src/components/AccessRequestDialog.vue
@@ -21,7 +21,7 @@
 			<div class="space-y-4 text-base">
 				<p>Are you sure you want to request access to this resource?</p>
 				<div class="space-y-2">
-					<p><span class="font-medium">Type:</span> {{ props.doctype }}</p>
+					<p><span class="font-medium">Type:</span> {{ props.pagetype }}</p>
 					<p><span class="font-medium">Resource:</span> {{ props.docname }}</p>
 				</div>
 				<Textarea
@@ -65,7 +65,7 @@ import { toast } from 'vue-sonner';
 import { Checkbox, Textarea } from 'jingrow-ui';
 
 const props = defineProps<{
-	doctype: string;
+	pagetype: string;
 	docname: string;
 }>();
 
@@ -82,20 +82,20 @@ const permissionsState = reactive({
 const permissionsMeta = computed(() => ({
 	login_as_administrator: {
 		label: 'Login as Administrator',
-		enabled: props.doctype === 'Site',
+		enabled: props.pagetype === 'Site',
 	},
 	site_domains: {
 		label: 'Domains',
-		enabled: props.doctype === 'Site',
+		enabled: props.pagetype === 'Site',
 	},
 	site_release_group: {
 		label: 'Release Group',
-		enabled: props.doctype === 'Site',
+		enabled: props.pagetype === 'Site',
 	},
 	bench_ssh: {
 		label: 'SSH Access',
 		enabled:
-			props.doctype === 'Release Group' || permissionsState.site_release_group,
+			props.pagetype === 'Release Group' || permissionsState.site_release_group,
 	},
 }));
 
@@ -113,11 +113,11 @@ const request = createResource({
 
 		return {
 			pg: {
-				doctype: 'Support Access',
+				pagetype: 'Support Access',
 				reason: reason.value,
 				resources: [
 					{
-						document_type: props.doctype,
+						document_type: props.pagetype,
 						document_name: props.docname,
 					},
 				],
diff --git a/dashboard/src/components/AccessRequestStatusDialog.vue b/dashboard/src/components/AccessRequestStatusDialog.vue
index 53c1f781..8a95f2d6 100644
--- a/dashboard/src/components/AccessRequestStatusDialog.vue
+++ b/dashboard/src/components/AccessRequestStatusDialog.vue
@@ -24,7 +24,7 @@
 					<p>You have access to this resource via access request.</p>
 				</div>
 				<div class="space-y-2">
-					<p><span class="font-medium">Type:</span> {{ props.doctype }}</p>
+					<p><span class="font-medium">Type:</span> {{ props.pagetype }}</p>
 					<p><span class="font-medium">Resource:</span> {{ props.docname }}</p>
 					<p>
 						<span class="font-medium">Expiry:</span>
@@ -63,7 +63,7 @@ import { ref } from 'vue';
 import dayjs from '../utils/dayjs';
 
 const props = defineProps<{
-	doctype: string;
+	pagetype: string;
 	docname: string;
 }>();
 
@@ -77,7 +77,7 @@ const status = createResource({
 	url: 'jcloude.api.access.status',
 	auto: true,
 	params: {
-		doctype: props.doctype,
+		pagetype: props.pagetype,
 		docname: props.docname,
 	},
 });
diff --git a/dashboard/src/components/AddTagDialog.vue b/dashboard/src/components/AddTagDialog.vue
index 184b3ae6..765c3325 100644
--- a/dashboard/src/components/AddTagDialog.vue
+++ b/dashboard/src/components/AddTagDialog.vue
@@ -43,7 +43,7 @@ import {
 
 export default {
 	name: 'AddTagDialog',
-	props: ['doctype', 'docname'],
+	props: ['pagetype', 'docname'],
 	emits: ['added', 'removed'],
 	components: { Dialog, Autocomplete, FormControl },
 	data() {
@@ -57,8 +57,8 @@ export default {
 		existingTags() {
 			return {
 				type: 'list',
-				doctype: 'Jcloude Tag',
-				filters: { doctype_name: this.doctype },
+				pagetype: 'Jcloude Tag',
+				filters: { pagetype_name: this.pagetype },
 				fields: ['tag'],
 				pageLength: 1000,
 				auto: true,
@@ -68,7 +68,7 @@ export default {
 	methods: {
 		addNewTag(value) {
 			if (!value) return;
-			let $pg = getCachedDocumentResource(this.doctype, this.docname);
+			let $pg = getCachedDocumentResource(this.pagetype, this.docname);
 			if (!$pg) return;
 			return $pg.addTag.submit({ tag: value }).then(() => {
 				this.$emit('added', value);
diff --git a/dashboard/src/components/AddressableErrorDialog.vue b/dashboard/src/components/AddressableErrorDialog.vue
index 7334a3ef..0917ed76 100644
--- a/dashboard/src/components/AddressableErrorDialog.vue
+++ b/dashboard/src/components/AddressableErrorDialog.vue
@@ -77,7 +77,7 @@ export default {
 		notification() {
 			return {
 				type: 'document',
-				doctype: 'Jcloude Notification',
+				pagetype: 'Jcloude Notification',
 				name: this.name,
 				whitelistedMethods: {
 					markAsAddressed: 'mark_as_addressed',
diff --git a/dashboard/src/components/DetailPageError.vue b/dashboard/src/components/DetailPageError.vue
index 6e982804..a33d1d23 100644
--- a/dashboard/src/components/DetailPageError.vue
+++ b/dashboard/src/components/DetailPageError.vue
@@ -10,7 +10,7 @@
 import { computed } from 'vue';
 
 const props = defineProps<{
-	doctype: string;
+	pagetype: string;
 	docname: string;
 	error?: Error;
 }>();
diff --git a/dashboard/src/components/InvoiceTable.vue b/dashboard/src/components/InvoiceTable.vue
index e490b6e8..9941698f 100644
--- a/dashboard/src/components/InvoiceTable.vue
+++ b/dashboard/src/components/InvoiceTable.vue
@@ -154,7 +154,7 @@ export default {
 		invoice() {
 			return {
 				type: 'document',
-				doctype: 'Invoice',
+				pagetype: 'Invoice',
 				name: this.invoiceId,
 			};
 		},
diff --git a/dashboard/src/components/LinkControl.vue b/dashboard/src/components/LinkControl.vue
index f793f80c..fd6cfe43 100644
--- a/dashboard/src/components/LinkControl.vue
+++ b/dashboard/src/components/LinkControl.vue
@@ -40,7 +40,7 @@ export default {
 			return {
 				url: 'jcloude.api.client.search_link',
 				params: {
-					doctype: this.options.doctype,
+					pagetype: this.options.pagetype,
 					order_by: this.options.orderBy,
 					page_length: this.options.pageLength || 10,
 					filters: this.options.filters,
diff --git a/dashboard/src/components/MarketplaceAppListing.vue b/dashboard/src/components/MarketplaceAppListing.vue
index c422952d..66e40dce 100644
--- a/dashboard/src/components/MarketplaceAppListing.vue
+++ b/dashboard/src/components/MarketplaceAppListing.vue
@@ -31,7 +31,7 @@
 							@failure="imageAddFailure"
 							fileTypes="image/*"
 							:upload-args="{
-								doctype: 'Marketplace App',
+								pagetype: 'Marketplace App',
 								docname: app.pg.name,
 								method: 'jcloude.api.marketplace.update_app_image',
 							}"
@@ -116,7 +116,7 @@
 							@failure="imageAddFailure"
 							fileTypes="image/*"
 							:upload-args="{
-								doctype: 'Marketplace App',
+								pagetype: 'Marketplace App',
 								docname: app.name,
 								method: 'jcloude.api.marketplace.add_app_screenshot',
 							}"
diff --git a/dashboard/src/components/NavigationItems.vue b/dashboard/src/components/NavigationItems.vue
index 249f9256..24f878e1 100644
--- a/dashboard/src/components/NavigationItems.vue
+++ b/dashboard/src/components/NavigationItems.vue
@@ -229,7 +229,7 @@ export default {
 		},
 	},
 	mounted() {
-		this.$socket.emit('doctype_subscribe', 'Jcloude Notification');
+		this.$socket.emit('pagetype_subscribe', 'Jcloude Notification');
 		this.$socket.on('jcloude_notification', (data) => {
 			if (data.team === this.$team.pg.name) {
 				unreadNotificationsCount.setData((data) => data + 1);
diff --git a/dashboard/src/components/ObjectList.vue b/dashboard/src/components/ObjectList.vue
index 879360bf..a8b96e95 100644
--- a/dashboard/src/components/ObjectList.vue
+++ b/dashboard/src/components/ObjectList.vue
@@ -230,11 +230,11 @@ export default {
 				type: 'list',
 				cache: [
 					'ObjectList',
-					this.options.doctype || this.options.url,
+					this.options.pagetype || this.options.url,
 					this.options.filters,
 				],
 				url: this.options.url || null,
-				doctype: this.options.doctype,
+				pagetype: this.options.pagetype,
 				pageLength: this.options.pageLength || 20,
 				fields: [
 					'name',
@@ -270,26 +270,26 @@ export default {
 				resource.fetch();
 			}
 		}
-		if (this.options.doctype) {
-			const doctype = this.options.doctype;
-			if (subscribed[doctype]) return;
-			this.$socket.emit('doctype_subscribe', doctype);
-			subscribed[doctype] = true;
+		if (this.options.pagetype) {
+			const pagetype = this.options.pagetype;
+			if (subscribed[pagetype]) return;
+			this.$socket.emit('pagetype_subscribe', pagetype);
+			subscribed[pagetype] = true;
 
 			const throttledReload = throttle(this.$list.reload, 5000);
 			this.$socket.on('list_update', (data) => {
 				const names = (this.$list.data || []).map((d) => d.name);
-				if (data.doctype === doctype && names.includes(data.name)) {
+				if (data.pagetype === pagetype && names.includes(data.name)) {
 					throttledReload();
 				}
 			});
 		}
 	},
 	beforeUnmount() {
-		if (this.options.doctype) {
-			const doctype = this.options.doctype;
-			this.$socket.emit('doctype_unsubscribe', doctype);
-			subscribed[doctype] = false;
+		if (this.options.pagetype) {
+			const pagetype = this.options.pagetype;
+			this.$socket.emit('pagetype_unsubscribe', pagetype);
+			subscribed[pagetype] = false;
 		}
 	},
 	computed: {
diff --git a/dashboard/src/components/PayoutTable.vue b/dashboard/src/components/PayoutTable.vue
index c48aaf21..72df4c69 100644
--- a/dashboard/src/components/PayoutTable.vue
+++ b/dashboard/src/components/PayoutTable.vue
@@ -72,7 +72,7 @@ export default {
 		invoice() {
 			return {
 				type: 'document',
-				doctype: 'Payout Order',
+				pagetype: 'Payout Order',
 				name: this.payoutId,
 			};
 		},
diff --git a/dashboard/src/components/SiteDatabaseAccessDialog.vue b/dashboard/src/components/SiteDatabaseAccessDialog.vue
index 7ba9b97e..5747cef6 100644
--- a/dashboard/src/components/SiteDatabaseAccessDialog.vue
+++ b/dashboard/src/components/SiteDatabaseAccessDialog.vue
@@ -129,7 +129,7 @@ export default {
 	computed: {
 		listOptions() {
 			return {
-				doctype: 'Site Database User',
+				pagetype: 'Site Database User',
 				filters: {
 					site: this.site,
 					status: ['!=', 'Archived'],
diff --git a/dashboard/src/components/SiteOverview.vue b/dashboard/src/components/SiteOverview.vue
index c6adbd74..98cb8450 100644
--- a/dashboard/src/components/SiteOverview.vue
+++ b/dashboard/src/components/SiteOverview.vue
@@ -398,7 +398,7 @@ export default {
 			const TagsDialog = defineAsyncComponent(
 				() => import('../dialogs/TagsDialog.vue'),
 			);
-			renderDialog(h(TagsDialog, { doctype: 'Site', docname: this.site }));
+			renderDialog(h(TagsDialog, { pagetype: 'Site', docname: this.site }));
 		},
 		trialDays,
 	},
diff --git a/dashboard/src/components/SiteUpdateDialog.vue b/dashboard/src/components/SiteUpdateDialog.vue
index 197c9f3c..6cec4b33 100644
--- a/dashboard/src/components/SiteUpdateDialog.vue
+++ b/dashboard/src/components/SiteUpdateDialog.vue
@@ -107,7 +107,7 @@ export default {
 				// TODO: investigate why
 				url: 'jcloude.api.client.get',
 				params: {
-					doctype: 'Site Update',
+					pagetype: 'Site Update',
 					name: this.existingUpdate,
 				},
 				auto: !!this.existingUpdate,
diff --git a/dashboard/src/components/SupportAccessDialog.vue b/dashboard/src/components/SupportAccessDialog.vue
index 571a1d54..c53de8ef 100644
--- a/dashboard/src/components/SupportAccessDialog.vue
+++ b/dashboard/src/components/SupportAccessDialog.vue
@@ -87,7 +87,7 @@ const open = ref(true);
 const team = getTeam();
 
 const request = createDocumentResource({
-	doctype: 'Support Access',
+	pagetype: 'Support Access',
 	name: props.name,
 	auto: true,
 });
@@ -128,7 +128,7 @@ const permissions = computed(() =>
 const update = createResource({
 	url: 'jcloude.api.client.set_value',
 	makeParams: (args: any) => ({
-		doctype: 'Support Access',
+		pagetype: 'Support Access',
 		name: props.name,
 		fieldname: {
 			status: args.status,
diff --git a/dashboard/src/components/SwitchTeamDialog.vue b/dashboard/src/components/SwitchTeamDialog.vue
index 81148bf5..e91a9e34 100644
--- a/dashboard/src/components/SwitchTeamDialog.vue
+++ b/dashboard/src/components/SwitchTeamDialog.vue
@@ -58,7 +58,7 @@
 				<LinkControl
 					class="w-full"
 					label="Select Team"
-					:options="{ doctype: 'Team', filters: { enabled: 1 } }"
+					:options="{ pagetype: 'Team', filters: { enabled: 1 } }"
 					v-model="selectedTeam"
 					description="This feature is only available to system users"
 				/>
diff --git a/dashboard/src/components/devtools/database/DatabaseSQLPlaygroundLog.vue b/dashboard/src/components/devtools/database/DatabaseSQLPlaygroundLog.vue
index 9cba204b..d4c3fa96 100644
--- a/dashboard/src/components/devtools/database/DatabaseSQLPlaygroundLog.vue
+++ b/dashboard/src/components/devtools/database/DatabaseSQLPlaygroundLog.vue
@@ -55,7 +55,7 @@ export default {
 		listOptions() {
 			return {
 				url: 'jcloude.api.client.get_list',
-				doctype: 'SQL Playground Log',
+				pagetype: 'SQL Playground Log',
 				filters: {
 					site: this.site,
 				},
diff --git a/dashboard/src/components/group/DependencyEditorDialog.vue b/dashboard/src/components/group/DependencyEditorDialog.vue
index 4cd6e95f..a5e28ed5 100644
--- a/dashboard/src/components/group/DependencyEditorDialog.vue
+++ b/dashboard/src/components/group/DependencyEditorDialog.vue
@@ -121,7 +121,7 @@ export default {
 		dependencyVersions() {
 			return {
 				type: 'list',
-				doctype: 'Bench Dependency Version',
+				pagetype: 'Bench Dependency Version',
 				fields: ['version'],
 				filters: {
 					parenttype: 'Bench Dependency',
diff --git a/dashboard/src/components/group/PatchAppDialog.vue b/dashboard/src/components/group/PatchAppDialog.vue
index ff318bad..602c6c79 100644
--- a/dashboard/src/components/group/PatchAppDialog.vue
+++ b/dashboard/src/components/group/PatchAppDialog.vue
@@ -262,7 +262,7 @@ export default {
 		apps() {
 			return {
 				type: 'list',
-				doctype: 'Release Group App',
+				pagetype: 'Release Group App',
 				parent: 'Release Group',
 				auto: true,
 				filters: {
@@ -285,7 +285,7 @@ export default {
 		benches() {
 			return {
 				type: 'list',
-				doctype: 'Bench',
+				pagetype: 'Bench',
 				fields: ['name'],
 				filters: {
 					group: this.group,
diff --git a/dashboard/src/components/group/SSHCertificateDialog.vue b/dashboard/src/components/group/SSHCertificateDialog.vue
index dc3105a4..a50d32d6 100644
--- a/dashboard/src/components/group/SSHCertificateDialog.vue
+++ b/dashboard/src/components/group/SSHCertificateDialog.vue
@@ -138,7 +138,7 @@ export default {
 		bench() {
 			return {
 				type: 'document',
-				doctype: 'Bench',
+				pagetype: 'Bench',
 				name: this.bench,
 				onSuccess(pg) {
 					if (pg.is_ssh_proxy_setup && pg.user_ssh_key) {
diff --git a/dashboard/src/components/marketplace/CodeReview.vue b/dashboard/src/components/marketplace/CodeReview.vue
index fa16b5ce..ca31da50 100644
--- a/dashboard/src/components/marketplace/CodeReview.vue
+++ b/dashboard/src/components/marketplace/CodeReview.vue
@@ -278,7 +278,7 @@ export default {
 		codeScreening() {
 			return {
 				type: 'document',
-				doctype: 'App Release Approval Request',
+				pagetype: 'App Release Approval Request',
 				name: this.row.approval_request_name,
 				fields: [
 					'name',
diff --git a/dashboard/src/components/marketplace/NewMarketplaceAppDialog.vue b/dashboard/src/components/marketplace/NewMarketplaceAppDialog.vue
index 50d6bfc4..f7628f18 100644
--- a/dashboard/src/components/marketplace/NewMarketplaceAppDialog.vue
+++ b/dashboard/src/components/marketplace/NewMarketplaceAppDialog.vue
@@ -30,7 +30,7 @@
 				class="mt-4"
 				type="autocomplete"
 				label="Choose Version"
-				:options="{ doctype: 'Jingrow Version', filters: { public: 1 } }"
+				:options="{ pagetype: 'Jingrow Version', filters: { public: 1 } }"
 				v-model="selectedVersion"
 			/>
 			<div class="mt-4 space-y-2">
@@ -129,7 +129,7 @@ export default {
 					return {
 						pg: {
 							...this.app,
-							doctype: 'Marketplace App',
+							pagetype: 'Marketplace App',
 							version: this.selectedVersion,
 						},
 					};
diff --git a/dashboard/src/components/marketplace/ReplyMarketplaceApp.vue b/dashboard/src/components/marketplace/ReplyMarketplaceApp.vue
index 35f22845..4591b90f 100644
--- a/dashboard/src/components/marketplace/ReplyMarketplaceApp.vue
+++ b/dashboard/src/components/marketplace/ReplyMarketplaceApp.vue
@@ -48,7 +48,7 @@ export default {
 	computed: {
 		$app() {
 			let appDoc = getDocResource({
-				doctype: 'Marketplace App',
+				pagetype: 'Marketplace App',
 				name: this.marketplaceApp,
 			});
 
diff --git a/dashboard/src/components/partners/LeadActivities.vue b/dashboard/src/components/partners/LeadActivities.vue
index 54879754..ceee1b53 100644
--- a/dashboard/src/components/partners/LeadActivities.vue
+++ b/dashboard/src/components/partners/LeadActivities.vue
@@ -274,7 +274,7 @@ async function saveComment() {
 		return;
 	}
 	let comment = await call('jingrow.desk.form.utils.add_comment', {
-		reference_doctype: 'Partner Lead',
+		reference_pagetype: 'Partner Lead',
 		reference_name: route.params.leadId,
 		content: newComment.value,
 		comment_email: session.user,
diff --git a/dashboard/src/components/partners/LeadFollowup.vue b/dashboard/src/components/partners/LeadFollowup.vue
index be8d5da9..1e4bbf1f 100644
--- a/dashboard/src/components/partners/LeadFollowup.vue
+++ b/dashboard/src/components/partners/LeadFollowup.vue
@@ -18,7 +18,7 @@ const route = useRoute();
 const showUpdateFollowupDialog = defineModel(false);
 const leadfollowups = computed(() => {
 	return {
-		doctype: 'Lead Followup',
+		pagetype: 'Lead Followup',
 		filters: {
 			parent: route.params.leadId,
 			parenttype: 'Partner Lead',
diff --git a/dashboard/src/components/partners/NewPartnerLead.vue b/dashboard/src/components/partners/NewPartnerLead.vue
index 6caf2a17..3edfa215 100644
--- a/dashboard/src/components/partners/NewPartnerLead.vue
+++ b/dashboard/src/components/partners/NewPartnerLead.vue
@@ -76,7 +76,7 @@ const domainList = computed(() => {
 });
 
 const _leadTypeList = createListResource({
-	doctype: 'Partner Lead Type',
+	pagetype: 'Partner Lead Type',
 	fields: ['name'],
 	cache: 'leadTypeList',
 	auto: true,
diff --git a/dashboard/src/components/partners/PartnerApprovalRequests.vue b/dashboard/src/components/partners/PartnerApprovalRequests.vue
index 83e84879..e91b5b79 100644
--- a/dashboard/src/components/partners/PartnerApprovalRequests.vue
+++ b/dashboard/src/components/partners/PartnerApprovalRequests.vue
@@ -17,7 +17,7 @@ export default {
 	computed: {
 		options() {
 			return {
-				doctype: 'Partner Approval Request',
+				pagetype: 'Partner Approval Request',
 				fields: ['approved_by_partner', 'status'],
 				columns: [
 					{
diff --git a/dashboard/src/components/partners/PartnerCertificates.vue b/dashboard/src/components/partners/PartnerCertificates.vue
index 6ad9bcae..2fc813e7 100644
--- a/dashboard/src/components/partners/PartnerCertificates.vue
+++ b/dashboard/src/components/partners/PartnerCertificates.vue
@@ -26,7 +26,7 @@ export default {
 	computed: {
 		partnerCertificatesList() {
 			return {
-				doctype: 'Partner Certificate',
+				pagetype: 'Partner Certificate',
 				fields: ['free', 'certificate_link'],
 				filters: {
 					team: this.$team.pg.name,
diff --git a/dashboard/src/components/partners/PartnerCreditsForm.vue b/dashboard/src/components/partners/PartnerCreditsForm.vue
index f40a4705..689c96e9 100644
--- a/dashboard/src/components/partners/PartnerCreditsForm.vue
+++ b/dashboard/src/components/partners/PartnerCreditsForm.vue
@@ -94,7 +94,7 @@ const emit = defineEmits(['success']);
 const team = inject('team');
 
 const pressSettings = createDocumentResource({
-	doctype: 'Jcloude Settings',
+	pagetype: 'Jcloude Settings',
 	name: 'Jcloude Settings',
 	auto: true,
 	initialData: {},
diff --git a/dashboard/src/components/partners/PartnerCustomerInvoices.vue b/dashboard/src/components/partners/PartnerCustomerInvoices.vue
index 1637f171..38bbfb34 100644
--- a/dashboard/src/components/partners/PartnerCustomerInvoices.vue
+++ b/dashboard/src/components/partners/PartnerCustomerInvoices.vue
@@ -23,7 +23,7 @@ export default {
 	computed: {
 		options() {
 			return {
-				doctype: 'Invoice',
+				pagetype: 'Invoice',
 				fields: ['type'],
 				columns: [
 					{ label: 'Invoice', fieldname: 'name' },
diff --git a/dashboard/src/components/partners/PartnerLeadOverview.vue b/dashboard/src/components/partners/PartnerLeadOverview.vue
index ad0fef00..e1200693 100644
--- a/dashboard/src/components/partners/PartnerLeadOverview.vue
+++ b/dashboard/src/components/partners/PartnerLeadOverview.vue
@@ -219,7 +219,7 @@ export default {
 		lead() {
 			return {
 				type: 'document',
-				doctype: 'Partner Lead',
+				pagetype: 'Partner Lead',
 				name: this.$route.params.leadId,
 			};
 		},
diff --git a/dashboard/src/components/partners/PartnerOverview.vue b/dashboard/src/components/partners/PartnerOverview.vue
index f28ac844..0868af0e 100644
--- a/dashboard/src/components/partners/PartnerOverview.vue
+++ b/dashboard/src/components/partners/PartnerOverview.vue
@@ -226,7 +226,7 @@ const partnerDetails = createResource({
 });
 
 const partnerConsent = createListResource({
-	doctype: 'Partner Consent',
+	pagetype: 'Partner Consent',
 	onSuccess() {
 		showPartnerCreditsDialog.value = true;
 		toast.success('Partner consent recorded successfully');
diff --git a/dashboard/src/components/partners/PartnerPayout.vue b/dashboard/src/components/partners/PartnerPayout.vue
index 878bfb41..802c8de2 100644
--- a/dashboard/src/components/partners/PartnerPayout.vue
+++ b/dashboard/src/components/partners/PartnerPayout.vue
@@ -22,7 +22,7 @@ export default {
 	computed: {
 		options() {
 			return {
-				doctype: 'Partner Payment Payout',
+				pagetype: 'Partner Payment Payout',
 				fields: ['type'],
 				columns: [
 					{ label: 'Payout ID', fieldname: 'name' },
diff --git a/dashboard/src/components/server/AutoScaleScheduled.vue b/dashboard/src/components/server/AutoScaleScheduled.vue
index 24fa5288..62cdb7c7 100644
--- a/dashboard/src/components/server/AutoScaleScheduled.vue
+++ b/dashboard/src/components/server/AutoScaleScheduled.vue
@@ -20,7 +20,7 @@ export default {
 	computed: {
 		autoScaleRecords() {
 			return {
-				doctype: 'Auto Scale Record',
+				pagetype: 'Auto Scale Record',
 				filters: {
 					primary_server: this.name,
 					status: ['in', 'Scheduled'],
diff --git a/dashboard/src/components/server/AutoScaleSteps.vue b/dashboard/src/components/server/AutoScaleSteps.vue
index 2df4d543..d0fa01f7 100644
--- a/dashboard/src/components/server/AutoScaleSteps.vue
+++ b/dashboard/src/components/server/AutoScaleSteps.vue
@@ -86,7 +86,7 @@ export default {
 			if (!this.id) return;
 			return {
 				type: 'document',
-				doctype: 'Auto Scale Record',
+				pagetype: 'Auto Scale Record',
 				name: this.id,
 				auto: true,
 				transform: (record) => {
diff --git a/dashboard/src/components/server/AutoScaleTriggered.vue b/dashboard/src/components/server/AutoScaleTriggered.vue
index c0843463..bc039a30 100644
--- a/dashboard/src/components/server/AutoScaleTriggered.vue
+++ b/dashboard/src/components/server/AutoScaleTriggered.vue
@@ -22,7 +22,7 @@ export default {
 	computed: {
 		autoScaleRecords() {
 			return {
-				doctype: 'Auto Scale Record',
+				pagetype: 'Auto Scale Record',
 				filters: {
 					primary_server: this.name,
 					status: ['not in', 'Scheduled'],
diff --git a/dashboard/src/components/server/ReleaseGroupCharts.vue b/dashboard/src/components/server/ReleaseGroupCharts.vue
index 6a521588..6682fec5 100644
--- a/dashboard/src/components/server/ReleaseGroupCharts.vue
+++ b/dashboard/src/components/server/ReleaseGroupCharts.vue
@@ -224,7 +224,7 @@ export default {
 			return {
 				url: 'jcloude.api.client.get_list',
 				params: {
-					doctype: 'Release Group',
+					pagetype: 'Release Group',
 					fields: ['title', 'name'],
 					filters: { server: this.serverName, enabled: 1 },
 				},
diff --git a/dashboard/src/components/server/ServerActionCell.vue b/dashboard/src/components/server/ServerActionCell.vue
index ffe83f5b..dbbeab59 100644
--- a/dashboard/src/components/server/ServerActionCell.vue
+++ b/dashboard/src/components/server/ServerActionCell.vue
@@ -323,7 +323,7 @@ function onDisableAutoDiskExpansion() {
 
 function onDropServer() {
 	const databaseServer = createDocumentResource({
-		doctype: 'Database Server',
+		pagetype: 'Database Server',
 		name: server.pg.database_server,
 	});
 
diff --git a/dashboard/src/components/server/ServerActions.vue b/dashboard/src/components/server/ServerActions.vue
index 078b6dd0..94d25e50 100644
--- a/dashboard/src/components/server/ServerActions.vue
+++ b/dashboard/src/components/server/ServerActions.vue
@@ -17,7 +17,7 @@
 				<ServerActionCell
 					:group="group.group"
 					:serverName="row.server_name"
-					:serverType="row.server_doctype"
+					:serverType="row.server_pagetype"
 					:actionLabel="row.action"
 					:method="row.pg_method"
 					:description="row.description"
@@ -45,7 +45,7 @@ export default {
 			];
 
 			const groupedActions = totalActions.reduce((acc, action) => {
-				const group = action.group || `${action.server_doctype} Actions`;
+				const group = action.group || `${action.server_pagetype} Actions`;
 				if (!acc[group]) {
 					acc[group] = [];
 				}
@@ -77,7 +77,7 @@ export default {
 		$dbServer() {
 			// Should mirror the whitelistedMethods in ServerOverview.vue
 			return getDocResource({
-				doctype: 'Database Server',
+				pagetype: 'Database Server',
 				name: this.$appServer.pg.database_server,
 				whitelistedMethods: {
 					changePlan: 'change_plan',
@@ -98,7 +98,7 @@ export default {
 		},
 		$dbReplicaServer() {
 			return getDocResource({
-				doctype: 'Database Server',
+				pagetype: 'Database Server',
 				name: this.$appServer.pg.replication_server,
 				whitelistedMethods: {
 					changePlan: 'change_plan',
diff --git a/dashboard/src/components/server/ServerOverview.vue b/dashboard/src/components/server/ServerOverview.vue
index 091e33e3..e4c95a90 100644
--- a/dashboard/src/components/server/ServerOverview.vue
+++ b/dashboard/src/components/server/ServerOverview.vue
@@ -695,14 +695,14 @@ export default {
 		},
 		$appSecondaryServer() {
 			return getDocResource({
-				doctype: 'Server',
+				pagetype: 'Server',
 				name: this.$appServer.pg.secondary_server,
 			});
 		},
 		$dbServer() {
 			// Should mirror the whitelistedMethods in ServerActions.vue
 			return getDocResource({
-				doctype: 'Database Server',
+				pagetype: 'Database Server',
 				name: this.$appServer.pg.database_server,
 				whitelistedMethods: {
 					changePlan: 'change_plan',
@@ -723,7 +723,7 @@ export default {
 		},
 		$dbReplicaServer() {
 			return getDocResource({
-				doctype: 'Database Server',
+				pagetype: 'Database Server',
 				name: this.$appServer.pg.replication_server,
 				whitelistedMethods: {
 					changePlan: 'change_plan',
diff --git a/dashboard/src/components/server/ServerSnapshotDetailsDialog.vue b/dashboard/src/components/server/ServerSnapshotDetailsDialog.vue
index 80147d57..ac9e4260 100644
--- a/dashboard/src/components/server/ServerSnapshotDetailsDialog.vue
+++ b/dashboard/src/components/server/ServerSnapshotDetailsDialog.vue
@@ -172,7 +172,7 @@ export default {
 		snapshot() {
 			return {
 				type: 'document',
-				doctype: 'Server Snapshot',
+				pagetype: 'Server Snapshot',
 				name: this.name,
 				auto: true,
 			};
diff --git a/dashboard/src/components/server/ServerSnapshotRecoverSitesDialog.vue b/dashboard/src/components/server/ServerSnapshotRecoverSitesDialog.vue
index 5fbad58d..91645cb6 100644
--- a/dashboard/src/components/server/ServerSnapshotRecoverSitesDialog.vue
+++ b/dashboard/src/components/server/ServerSnapshotRecoverSitesDialog.vue
@@ -101,7 +101,7 @@ export default {
 		snapshot() {
 			return {
 				type: 'document',
-				doctype: 'Server Snapshot',
+				pagetype: 'Server Snapshot',
 				name: this.name,
 				whitelistedMethods: {
 					lock: 'lock',
@@ -122,7 +122,7 @@ export default {
 		},
 		snapshotRecoveryOptions() {
 			return {
-				doctype: 'Server Snapshot Recovery',
+				pagetype: 'Server Snapshot Recovery',
 				filters: {
 					snapshot: this.name,
 				},
diff --git a/dashboard/src/components/server/ServerSnapshotRecoveryDetails.vue b/dashboard/src/components/server/ServerSnapshotRecoveryDetails.vue
index 7dcedbee..14df386a 100644
--- a/dashboard/src/components/server/ServerSnapshotRecoveryDetails.vue
+++ b/dashboard/src/components/server/ServerSnapshotRecoveryDetails.vue
@@ -32,7 +32,7 @@ export default {
 		snapshotRecovery() {
 			return {
 				type: 'document',
-				doctype: 'Server Snapshot Recovery',
+				pagetype: 'Server Snapshot Recovery',
 				name: this.name,
 				auto: true,
 				whitelistedMethods: {
diff --git a/dashboard/src/components/settings/DeveloperSettings.vue b/dashboard/src/components/settings/DeveloperSettings.vue
index c847ce0a..f34a2c9f 100644
--- a/dashboard/src/components/settings/DeveloperSettings.vue
+++ b/dashboard/src/components/settings/DeveloperSettings.vue
@@ -243,7 +243,7 @@ const sshKeyListOptions = computed(() => ({
 				label: 'Delete',
 				onClick() {
 					deleteSSHKey.submit({
-						doctype: 'User SSH Key',
+						pagetype: 'User SSH Key',
 						name: row.name,
 					});
 				},
@@ -274,7 +274,7 @@ function renderAddNewKeyDialog(listResource) {
 				addSSHKey
 					.submit({
 						pg: {
-							doctype: 'User SSH Key',
+							pagetype: 'User SSH Key',
 							ssh_public_key: values.sshKey,
 							user: $team.pg.user_info.name,
 						},
@@ -294,7 +294,7 @@ function renderAddNewKeyDialog(listResource) {
 const webhookListResource = createResource({
 	url: 'jcloude.api.client.get_list',
 	params: {
-		doctype: 'Jcloude Webhook',
+		pagetype: 'Jcloude Webhook',
 		fields: ['name', 'enabled', 'endpoint'],
 	},
 	initialData: [],
@@ -406,7 +406,7 @@ const webhookListOptions = computed(() => ({
 							onClick({ hide }) {
 								deleteWebhook
 									.submit({
-										doctype: 'Jcloude Webhook',
+										pagetype: 'Jcloude Webhook',
 										name: row.name,
 									})
 									.then(hide);
diff --git a/dashboard/src/components/settings/EditWebhookDialog.vue b/dashboard/src/components/settings/EditWebhookDialog.vue
index 6622cc6e..ed3dd73b 100644
--- a/dashboard/src/components/settings/EditWebhookDialog.vue
+++ b/dashboard/src/components/settings/EditWebhookDialog.vue
@@ -111,7 +111,7 @@ export default {
 			return {
 				url: 'jcloude.api.client.get',
 				params: {
-					doctype: 'Jcloude Webhook',
+					pagetype: 'Jcloude Webhook',
 					name: this.webhook.name,
 				},
 				auto: true,
diff --git a/dashboard/src/components/settings/InviteTeamMemberDialog.vue b/dashboard/src/components/settings/InviteTeamMemberDialog.vue
index f3bfe739..687ddda8 100644
--- a/dashboard/src/components/settings/InviteTeamMemberDialog.vue
+++ b/dashboard/src/components/settings/InviteTeamMemberDialog.vue
@@ -76,7 +76,7 @@ export default {
 		roles() {
 			return {
 				type: 'list',
-				doctype: 'Jcloude Role',
+				pagetype: 'Jcloude Role',
 				fields: ['name', 'title'],
 				initialData: [],
 				auto: true,
diff --git a/dashboard/src/components/settings/Role.vue b/dashboard/src/components/settings/Role.vue
index a7b27b31..e5a2569a 100644
--- a/dashboard/src/components/settings/Role.vue
+++ b/dashboard/src/components/settings/Role.vue
@@ -137,7 +137,7 @@ const user = getSessionUser();
 const tab = ref<'members' | 'resources' | 'permissions'>('members');
 
 const role = createDocumentResource({
-	doctype: 'Jcloude Role',
+	pagetype: 'Jcloude Role',
 	name: props.id,
 	auto: true,
 	whitelistedMethods: {
diff --git a/dashboard/src/components/settings/RoleConfigureDialog.vue b/dashboard/src/components/settings/RoleConfigureDialog.vue
index 403691c3..09c3ed62 100644
--- a/dashboard/src/components/settings/RoleConfigureDialog.vue
+++ b/dashboard/src/components/settings/RoleConfigureDialog.vue
@@ -181,7 +181,7 @@ export default {
 		role() {
 			return {
 				type: 'document',
-				doctype: 'Jcloude Role',
+				pagetype: 'Jcloude Role',
 				name: this.roleId,
 				whitelistedMethods: {
 					addUser: 'add_user',
diff --git a/dashboard/src/components/settings/RoleList.vue b/dashboard/src/components/settings/RoleList.vue
index 6cf76080..318fa84d 100644
--- a/dashboard/src/components/settings/RoleList.vue
+++ b/dashboard/src/components/settings/RoleList.vue
@@ -79,7 +79,7 @@
 				(title, users, resources) => {
 					insert.submit({
 						pg: {
-							doctype: 'Jcloude Role',
+							pagetype: 'Jcloude Role',
 							title,
 							users: users.map((u) => ({
 								user: u,
@@ -104,7 +104,7 @@ import RoleCreateDialog from './RoleCreateDialog.vue';
 const showCreateDialog = ref(false);
 
 const roles = createListResource({
-	doctype: 'Jcloude Role',
+	pagetype: 'Jcloude Role',
 	fields: [
 		'name',
 		'title',
diff --git a/dashboard/src/components/settings/data.ts b/dashboard/src/components/settings/data.ts
index 3ace0f36..786d1ecc 100644
--- a/dashboard/src/components/settings/data.ts
+++ b/dashboard/src/components/settings/data.ts
@@ -5,7 +5,7 @@ import { computed } from 'vue';
 const team = getTeam();
 
 const sites = createListResource({
-	doctype: 'Site',
+	pagetype: 'Site',
 	auto: true,
 	pageLength: 99999,
 	filters: {
@@ -14,7 +14,7 @@ const sites = createListResource({
 });
 
 const servers = createListResource({
-	doctype: 'Server',
+	pagetype: 'Server',
 	auto: true,
 	pageLength: 99999,
 	filters: {
@@ -23,7 +23,7 @@ const servers = createListResource({
 });
 
 const releaseGroups = createListResource({
-	doctype: 'Release Group',
+	pagetype: 'Release Group',
 	auto: true,
 	pageLength: 99999,
 	filters: {
diff --git a/dashboard/src/components/settings/profile/AccountProfile.vue b/dashboard/src/components/settings/profile/AccountProfile.vue
index 00e27b05..dd67ca02 100644
--- a/dashboard/src/components/settings/profile/AccountProfile.vue
+++ b/dashboard/src/components/settings/profile/AccountProfile.vue
@@ -7,7 +7,7 @@
 					@success="onProfilePhotoChange"
 					fileTypes="image/*"
 					:upload-args="{
-						doctype: 'User',
+						pagetype: 'User',
 						docname: user.name,
 						method: 'jcloude.api.account.update_profile_picture',
 					}"
@@ -209,7 +209,7 @@
 			v-if="showCommunicationInfoDialog"
 			v-model="showCommunicationInfoDialog"
 			@close="showCommunicationInfoDialog = false"
-			reference-doctype="Team"
+			reference-pagetype="Team"
 			:reference-name="$team.pg.name"
 		/>
 	</Card>
diff --git a/dashboard/src/components/site/SelectSiteForRestore.vue b/dashboard/src/components/site/SelectSiteForRestore.vue
index ecdd8d1d..6c36f945 100644
--- a/dashboard/src/components/site/SelectSiteForRestore.vue
+++ b/dashboard/src/components/site/SelectSiteForRestore.vue
@@ -105,7 +105,7 @@ export default {
 		sites() {
 			return {
 				type: 'list',
-				doctype: 'Site',
+				pagetype: 'Site',
 				fields: ['host_name', 'name'],
 				filters: { name: ['!=', this.site] },
 				pageLength: 500,
diff --git a/dashboard/src/components/site/SiteChangeGroupDialog.vue b/dashboard/src/components/site/SiteChangeGroupDialog.vue
index cffe1f2c..e43cb142 100644
--- a/dashboard/src/components/site/SiteChangeGroupDialog.vue
+++ b/dashboard/src/components/site/SiteChangeGroupDialog.vue
@@ -186,7 +186,7 @@ export default {
 		serverOptions() {
 			return {
 				type: 'list',
-				doctype: 'Server',
+				pagetype: 'Server',
 				fields: ['name', 'title'],
 				auto: true,
 				transform(data) {
diff --git a/dashboard/src/components/site/SiteChangeRegionDialog.vue b/dashboard/src/components/site/SiteChangeRegionDialog.vue
index 32e831dd..6ef974e1 100644
--- a/dashboard/src/components/site/SiteChangeRegionDialog.vue
+++ b/dashboard/src/components/site/SiteChangeRegionDialog.vue
@@ -119,7 +119,7 @@ export default {
 		ARecords() {
 			return {
 				type: 'list',
-				doctype: 'Site Domain',
+				pagetype: 'Site Domain',
 				filters: {
 					site: this.site,
 					dns_type: 'A',
diff --git a/dashboard/src/components/site/SiteEnableMonitoringDialog.vue b/dashboard/src/components/site/SiteEnableMonitoringDialog.vue
index b806f290..046897bc 100644
--- a/dashboard/src/components/site/SiteEnableMonitoringDialog.vue
+++ b/dashboard/src/components/site/SiteEnableMonitoringDialog.vue
@@ -93,7 +93,7 @@ export default {
 		siteResource() {
 			return {
 				type: 'document',
-				doctype: 'Site',
+				pagetype: 'Site',
 				name: this.site,
 				auto: true,
 			};
diff --git a/dashboard/src/components/site/SiteJobs.vue b/dashboard/src/components/site/SiteJobs.vue
index 37edec86..bdde02ae 100644
--- a/dashboard/src/components/site/SiteJobs.vue
+++ b/dashboard/src/components/site/SiteJobs.vue
@@ -15,9 +15,9 @@ export default {
 	},
 	computed: {
 		logsOptions() {
-			const doctype = 'Site';
+			const pagetype = 'Site';
 			return {
-				doctype: 'Agent Job',
+				pagetype: 'Agent Job',
 				filters: {
 					site: this.name,
 				},
@@ -44,7 +44,7 @@ export default {
 							label: 'Type',
 							fieldname: 'job_type',
 							options: {
-								doctype: 'Agent Job Type',
+								pagetype: 'Agent Job Type',
 								orderBy: 'name asc',
 								pageLength: 100,
 							},
@@ -67,7 +67,7 @@ export default {
 						label: 'Site',
 						fieldname: 'site',
 						width: 1.2,
-						condition: () => doctype !== 'Site',
+						condition: () => pagetype !== 'Site',
 					},
 					{
 						label: 'Duration',
diff --git a/dashboard/src/components/site_database_user/SiteDatabaseAddEditUserDialog.vue b/dashboard/src/components/site_database_user/SiteDatabaseAddEditUserDialog.vue
index dee4afdd..82967e1b 100644
--- a/dashboard/src/components/site_database_user/SiteDatabaseAddEditUserDialog.vue
+++ b/dashboard/src/components/site_database_user/SiteDatabaseAddEditUserDialog.vue
@@ -179,7 +179,7 @@ export default {
 		databaseUser() {
 			return {
 				type: 'document',
-				doctype: 'Site Database User',
+				pagetype: 'Site Database User',
 				name: this.db_user_name,
 				auto: false,
 				onSuccess: (data) => {
@@ -213,7 +213,7 @@ export default {
 					});
 					return {
 						pg: {
-							doctype: 'Site Database User',
+							pagetype: 'Site Database User',
 							label: this.label,
 							team: this.$team.pg.name,
 							site: this.site,
diff --git a/dashboard/src/controllers/fileUploader.js b/dashboard/src/controllers/fileUploader.js
index f478b305..5a52199a 100644
--- a/dashboard/src/controllers/fileUploader.js
+++ b/dashboard/src/controllers/fileUploader.js
@@ -81,8 +81,8 @@ export default class FileUploader {
 				form_data.append('file_url', options.file_url);
 			}
 
-			if (options.doctype && options.docname) {
-				form_data.append('doctype', options.doctype);
+			if (options.pagetype && options.docname) {
+				form_data.append('pagetype', options.pagetype);
 				form_data.append('docname', options.docname);
 			}
 
diff --git a/dashboard/src/data/team.js b/dashboard/src/data/team.js
index 9723c0f3..b96a2057 100644
--- a/dashboard/src/data/team.js
+++ b/dashboard/src/data/team.js
@@ -6,7 +6,7 @@ let team;
 export function getTeam() {
 	if (!team) {
 		team = createDocumentResource({
-			doctype: 'Team',
+			pagetype: 'Team',
 			name: getCurrentTeam(),
 			whitelistedMethods: {
 				getTeamMembers: 'get_team_members',
diff --git a/dashboard/src/dialogs/TagsDialog.vue b/dashboard/src/dialogs/TagsDialog.vue
index 605befab..9f4678cb 100644
--- a/dashboard/src/dialogs/TagsDialog.vue
+++ b/dashboard/src/dialogs/TagsDialog.vue
@@ -30,7 +30,7 @@ import Autocomplete from '../components/Autocomplete.vue';
 
 export default {
 	name: 'TagsDialog',
-	props: ['docname', 'doctype'],
+	props: ['docname', 'pagetype'],
 	components: { ErrorMessage, PressAutocomplete: Autocomplete },
 	data() {
 		return {
@@ -43,8 +43,8 @@ export default {
 		availableTags() {
 			return {
 				type: 'list',
-				doctype: 'Jcloude Tag',
-				filters: { doctype_name: this.doctype },
+				pagetype: 'Jcloude Tag',
+				filters: { pagetype_name: this.pagetype },
 				fields: ['tag'],
 				pageLength: 1000,
 				auto: true,
@@ -53,7 +53,7 @@ export default {
 	},
 	computed: {
 		$pg() {
-			return getCachedDocumentResource(this.doctype, this.docname);
+			return getCachedDocumentResource(this.pagetype, this.docname);
 		},
 		tagOptions() {
 			const docTags = this.$pg.pg.tags.map((t) => t.tag_name);
diff --git a/dashboard/src/objects/accessRequests.js b/dashboard/src/objects/accessRequests.js
index 39a4f171..22e361fe 100644
--- a/dashboard/src/objects/accessRequests.js
+++ b/dashboard/src/objects/accessRequests.js
@@ -4,7 +4,7 @@ import SupportAccessDialog from '../components/SupportAccessDialog.vue';
 import { getTeam } from '../data/team';
 
 export default {
-	doctype: 'Support Access',
+	pagetype: 'Support Access',
 	whitelistedMethods: {},
 	list: {
 		route: '/access-requests',
diff --git a/dashboard/src/objects/bench.ts b/dashboard/src/objects/bench.ts
index 8e47ab2c..bcb7dae0 100644
--- a/dashboard/src/objects/bench.ts
+++ b/dashboard/src/objects/bench.ts
@@ -28,7 +28,7 @@ import { getLogsTab } from './tabs/site/logs';
 import { getPatchesTab } from './common/patches';
 
 export default {
-	doctype: 'Bench',
+	pagetype: 'Bench',
 	whitelistedMethods: {},
 	detail: getDetail(),
 	list: getList(),
@@ -225,7 +225,7 @@ function filterControls() {
 			label: 'Bench Group',
 			fieldname: 'group',
 			options: {
-				doctype: 'Release Group'
+				pagetype: 'Release Group'
 			}
 		},
 		{
@@ -244,7 +244,7 @@ export function getSitesTab() {
 		route: 'sites',
 		type: 'list',
 		list: {
-			doctype: 'Site',
+			pagetype: 'Site',
 			filters: r => ({
 				group: r.pg.group,
 				bench: r.name,
diff --git a/dashboard/src/objects/common/apps.ts b/dashboard/src/objects/common/apps.ts
index 21e80e79..d24c070f 100644
--- a/dashboard/src/objects/common/apps.ts
+++ b/dashboard/src/objects/common/apps.ts
@@ -31,7 +31,7 @@ export function getAppsTab(forSite: boolean) {
 function getAppsTabList(forSite: boolean) {
 	const options = forSite ? siteAppListOptions : benchAppListOptions;
 	const list: TabList = {
-		doctype: '',
+		pagetype: '',
 		filters: () => ({}),
 		...options,
 		columns: getAppsTabColumns(forSite),
@@ -144,7 +144,7 @@ function getAppsTabColumns(forSite: boolean) {
 }
 
 const siteAppListOptions: Partial<TabList> = {
-	doctype: 'Site App',
+	pagetype: 'Site App',
 	pageLength: 999,
 	filters: (res) => {
 		return { parenttype: 'Site', parent: res.pg?.name };
@@ -228,7 +228,7 @@ const siteAppListOptions: Partial<TabList> = {
 };
 
 const benchAppListOptions: Partial<TabList> = {
-	doctype: 'Bench App',
+	pagetype: 'Bench App',
 	filters: (res) => {
 		return { parenttype: 'Bench', parent: res.pg?.name };
 	},
diff --git a/dashboard/src/objects/common/jobs.ts b/dashboard/src/objects/common/jobs.ts
index 70a116d2..4ebe2038 100644
--- a/dashboard/src/objects/common/jobs.ts
+++ b/dashboard/src/objects/common/jobs.ts
@@ -7,23 +7,23 @@ import { ColumnField, Tab } from './types';
 
 type JobDocTypes = 'Site' | 'Bench' | 'Server' | 'Release Group';
 
-export function getJobsTab(doctype: JobDocTypes) {
-	const jobRoute = getJobRoute(doctype);
+export function getJobsTab(pagetype: JobDocTypes) {
+	const jobRoute = getJobRoute(pagetype);
 
 	return {
 		label: 'Jobs',
 		icon: icon('truck'),
-		condition: (record) => (doctype === 'Server' && record.pg?.status !== 'Archived') || doctype !== 'Server',
+		condition: (record) => (pagetype === 'Server' && record.pg?.status !== 'Archived') || pagetype !== 'Server',
 		childrenRoutes: [jobRoute],
 		route: 'jobs',
 		type: 'list',
 		list: {
-			doctype: 'Agent Job',
+			pagetype: 'Agent Job',
 			filters: res => {
-				if (doctype === 'Site') return { site: res.name };
-				else if (doctype === 'Bench') return { bench: res.name };
-				else if (doctype === 'Server') return { server: res.name };
-				else if (doctype === 'Release Group') return { group: res.name };
+				if (pagetype === 'Site') return { site: res.name };
+				else if (pagetype === 'Bench') return { bench: res.name };
+				else if (pagetype === 'Server') return { server: res.name };
+				else if (pagetype === 'Release Group') return { group: res.name };
 				throw unreachable;
 			},
 			route(row) {
@@ -49,7 +49,7 @@ export function getJobsTab(doctype: JobDocTypes) {
 						label: 'Type',
 						fieldname: 'job_type',
 						options: {
-							doctype: 'Agent Job Type',
+							pagetype: 'Agent Job Type',
 							orderBy: 'name asc',
 							pageLength: 100
 						}
@@ -68,20 +68,20 @@ export function getJobsTab(doctype: JobDocTypes) {
 					}
 				}
 			],
-			columns: getJobTabColumns(doctype)
+			columns: getJobTabColumns(pagetype)
 		}
 	} satisfies Tab as Tab;
 }
 
-function getJobRoute(doctype: JobDocTypes) {
-	if (doctype === 'Site') return 'Site Job';
-	else if (doctype === 'Bench') return 'Bench Job';
-	else if (doctype === 'Server') return 'Server Job';
-	else if (doctype === 'Release Group') return 'Release Group Job';
+function getJobRoute(pagetype: JobDocTypes) {
+	if (pagetype === 'Site') return 'Site Job';
+	else if (pagetype === 'Bench') return 'Bench Job';
+	else if (pagetype === 'Server') return 'Server Job';
+	else if (pagetype === 'Release Group') return 'Release Group Job';
 	throw unreachable;
 }
 
-function getJobTabColumns(doctype: JobDocTypes) {
+function getJobTabColumns(pagetype: JobDocTypes) {
 	const columns: ColumnField[] = [
 		{
 			label: 'Job Type',
@@ -121,6 +121,6 @@ function getJobTabColumns(doctype: JobDocTypes) {
 		}
 	];
 
-	if (doctype !== 'Site') return columns;
+	if (pagetype !== 'Site') return columns;
 	return columns.filter(c => c.fieldname !== 'site');
 }
diff --git a/dashboard/src/objects/common/patches.ts b/dashboard/src/objects/common/patches.ts
index 3f560845..e9087870 100644
--- a/dashboard/src/objects/common/patches.ts
+++ b/dashboard/src/objects/common/patches.ts
@@ -22,9 +22,9 @@ export function getPatchesTab(forBench: boolean) {
 		route: 'patches',
 		type: 'list',
 		list: {
-			experimental: true, // If removing this, uncheck App Patch doctype beta flag.
+			experimental: true, // If removing this, uncheck App Patch pagetype beta flag.
 			documentation: 'https://docs.framework.jingrow.com/cloud/benches/app-patches',
-			doctype: 'App Patch',
+			pagetype: 'App Patch',
 			filters: (res) => ({ [forBench ? 'bench' : 'group']: res.name }),
 			searchField: 'filename',
 			filterControls: (r) =>
@@ -54,7 +54,7 @@ export function getPatchesTab(forBench: boolean) {
 						prefix: icon('plus'),
 					},
 					onClick() {
-						const group = pg.doctype === 'Bench' ? pg.pg.group : pg.name;
+						const group = pg.pagetype === 'Bench' ? pg.pg.group : pg.name;
 
 						renderDialog(h(PatchAppDialog, { group: group, app: '' }));
 					},
diff --git a/dashboard/src/objects/common/tags.js b/dashboard/src/objects/common/tags.js
index 383152ee..90ca7e87 100644
--- a/dashboard/src/objects/common/tags.js
+++ b/dashboard/src/objects/common/tags.js
@@ -3,24 +3,24 @@ import { confirmDialog, icon, renderDialog } from '../../utils/components';
 import { toast } from 'vue-sonner';
 import { getToastErrorMessage } from '../../utils/toast';
 
-export function tagTab(doctype) {
+export function tagTab(pagetype) {
 	return {
 		label: 'Tags',
 		icon: icon('tag'),
 		condition: (record) => {
 			return (
-				doctype != 'Server' ||
-				(doctype == 'Server' && record.pg?.status !== 'Archived')
+				pagetype != 'Server' ||
+				(pagetype == 'Server' && record.pg?.status !== 'Archived')
 			);
 		},
 		route: 'tags',
 		type: 'list',
 		list: {
-			doctype: 'Resource Tag',
+			pagetype: 'Resource Tag',
 			filters: (documentResource) => {
 				return {
 					parent: documentResource.name,
-					parenttype: documentResource.doctype,
+					parenttype: documentResource.pagetype,
 				};
 			},
 			orderBy: 'creation desc',
@@ -42,7 +42,7 @@ export function tagTab(doctype) {
 						);
 						renderDialog(
 							h(AddTagDialog, {
-								doctype: documentResource.doctype,
+								pagetype: documentResource.pagetype,
 								docname: documentResource.name,
 								onAdded() {
 									tags.reload();
diff --git a/dashboard/src/objects/common/types.ts b/dashboard/src/objects/common/types.ts
index 117011cb..aef60387 100644
--- a/dashboard/src/objects/common/types.ts
+++ b/dashboard/src/objects/common/types.ts
@@ -37,7 +37,7 @@ type Icon = ReturnType<typeof icon>;
 type AsyncComponent = ReturnType<typeof defineAsyncComponent>;
 
 export interface DashboardObject {
-	doctype: string;
+	pagetype: string;
 	whitelistedMethods: Record<string, string>;
 	list: List;
 	detail: Detail;
@@ -93,9 +93,9 @@ export interface FilterField {
 	class?: string;
 	options?:
 		| {
-				doctype: string;
+				pagetype: string;
 				filters?: {
-					doctype_name?: string;
+					pagetype_name?: string;
 				};
 		  }
 		| string[];
@@ -130,7 +130,7 @@ export interface Tab {
 }
 
 export interface TabList {
-	doctype?: string;
+	pagetype?: string;
 	orderBy?: string;
 	filters?: (r: DocumentResource) => Record<string, unknown>;
 	route?: (row: Row) => Route;
diff --git a/dashboard/src/objects/generateRoutes.js b/dashboard/src/objects/generateRoutes.js
index 4b429ff0..e2a735cb 100644
--- a/dashboard/src/objects/generateRoutes.js
+++ b/dashboard/src/objects/generateRoutes.js
@@ -5,7 +5,7 @@ export default function generateRoutes() {
 	for (let objectType in objects) {
 		let object = objects[objectType];
 		if (object.list) {
-			let routeName = `${object.doctype} List`;
+			let routeName = `${object.pagetype} List`;
 			object.list.routeName = routeName;
 			routes.push({
 				name: routeName,
@@ -18,7 +18,7 @@ export default function generateRoutes() {
 		}
 		if (object.detail) {
 			let children = object.detail.tabs.map((tab) => {
-				const routeName = `${object.doctype} Detail ${tab.label}`;
+				const routeName = `${object.pagetype} Detail ${tab.label}`;
 				tab.routeName = routeName;
 				const nestedChildren = [];
 
@@ -54,7 +54,7 @@ export default function generateRoutes() {
 				}
 			}
 
-			object.detail.routeName = `${object.doctype} Detail`;
+			object.detail.routeName = `${object.pagetype} Detail`;
 			routes.push({
 				name: object.detail.routeName,
 				path: object.detail.route,
diff --git a/dashboard/src/objects/group.js b/dashboard/src/objects/group.js
index d52cbe35..6c1d7467 100644
--- a/dashboard/src/objects/group.js
+++ b/dashboard/src/objects/group.js
@@ -18,7 +18,7 @@ import { getPatchesTab } from './common/patches';
 import { tagTab } from './common/tags';
 
 export default {
-	doctype: 'Release Group',
+	pagetype: 'Release Group',
 	whitelistedMethods: {
 		addApp: 'add_app',
 		removeApp: 'remove_app',
@@ -52,7 +52,7 @@ export default {
 					label: 'Version',
 					fieldname: 'version',
 					options: {
-						doctype: 'Jingrow Version',
+						pagetype: 'Jingrow Version',
 					},
 				},
 				{
@@ -60,9 +60,9 @@ export default {
 					label: 'Tag',
 					fieldname: 'tags.tag',
 					options: {
-						doctype: 'Jcloude Tag',
+						pagetype: 'Jcloude Tag',
 						filters: {
-							doctype_name: 'Release Group',
+							pagetype_name: 'Release Group',
 						},
 					},
 				},
@@ -175,7 +175,7 @@ export default {
 				route: 'apps',
 				type: 'list',
 				list: {
-					doctype: 'Release Group App',
+					pagetype: 'Release Group App',
 					filters: (releaseGroup) => {
 						return {
 							parenttype: 'Release Group',
@@ -412,7 +412,7 @@ export default {
 				childrenRoutes: ['Deploy Candidate'],
 				type: 'list',
 				list: {
-					doctype: 'Deploy Candidate Build',
+					pagetype: 'Deploy Candidate Build',
 					route: (row) => ({
 						name: 'Deploy Candidate',
 						params: { id: row.name },
@@ -565,7 +565,7 @@ export default {
 				route: 'bench-config',
 				type: 'list',
 				list: {
-					doctype: 'Common Site Config',
+					pagetype: 'Common Site Config',
 					filters: (releaseGroup) => {
 						return {
 							parenttype: 'Release Group',
@@ -713,7 +713,7 @@ export default {
 				route: 'regions',
 				type: 'list',
 				list: {
-					doctype: 'Cluster',
+					pagetype: 'Cluster',
 					filters: (releaseGroup) => {
 						return { group: releaseGroup.name };
 					},
@@ -770,7 +770,7 @@ export default {
 				route: 'bench-dependencies',
 				type: 'list',
 				list: {
-					doctype: 'Release Group Dependency',
+					pagetype: 'Release Group Dependency',
 					filters: (releaseGroup) => {
 						return {
 							parenttype: 'Release Group',
@@ -839,7 +839,7 @@ export default {
 				route: 'bench-environment-variable',
 				type: 'list',
 				list: {
-					doctype: 'Release Group Variable',
+					pagetype: 'Release Group Variable',
 					filters: (releaseGroup) => {
 						return {
 							parenttype: 'Release Group',
diff --git a/dashboard/src/objects/marketplace.js b/dashboard/src/objects/marketplace.js
index 4cb87afc..a63456ce 100644
--- a/dashboard/src/objects/marketplace.js
+++ b/dashboard/src/objects/marketplace.js
@@ -13,7 +13,7 @@ import { isMobile } from '../utils/device';
 import router from '../router';
 
 export default {
-	doctype: 'Marketplace App',
+	pagetype: 'Marketplace App',
 	whitelistedMethods: {
 		removeVersion: 'remove_version',
 		addVersion: 'add_version',
@@ -126,7 +126,7 @@ export default {
 				route: 'versions',
 				type: 'list',
 				list: {
-					doctype: 'Marketplace App Version',
+					pagetype: 'Marketplace App Version',
 					filters: (app) => {
 						return { parent: app.pg.name, parenttype: 'Marketplace App' };
 					},
@@ -308,7 +308,7 @@ export default {
 				route: 'pricing',
 				type: 'list',
 				list: {
-					doctype: 'Marketplace App Plan',
+					pagetype: 'Marketplace App Plan',
 					filters: (app) => {
 						return { app: app.pg.name };
 					},
@@ -385,7 +385,7 @@ export default {
 				route: 'subscription',
 				type: 'list',
 				list: {
-					doctype: 'Subscription',
+					pagetype: 'Subscription',
 					filters: (app) => {
 						return {
 							document_type: 'Marketplace App',
@@ -537,7 +537,7 @@ function showReleases(row, app) {
 						options: {
 							label: 'Version',
 							type: 'list',
-							doctype: 'App Release',
+							pagetype: 'App Release',
 							filters: {
 								app: app.pg.name,
 								source: row.source,
diff --git a/dashboard/src/objects/notification.js b/dashboard/src/objects/notification.js
index d71c75fc..0830143b 100644
--- a/dashboard/src/objects/notification.js
+++ b/dashboard/src/objects/notification.js
@@ -9,7 +9,7 @@ import { toast } from 'vue-sonner';
 
 const getNotification = (name) => {
 	return getDocResource({
-		doctype: 'Jcloude Notification',
+		pagetype: 'Jcloude Notification',
 		name: name,
 		whitelistedMethods: {
 			markNotificationAsRead: 'mark_as_read',
@@ -18,14 +18,14 @@ const getNotification = (name) => {
 };
 
 export default {
-	doctype: 'Jcloude Notification',
+	pagetype: 'Jcloude Notification',
 	whitelistedMethods: {},
 	list: {
 		resource() {
 			let $team = getTeam();
 			return {
 				type: 'list',
-				doctype: 'Jcloude Notification',
+				pagetype: 'Jcloude Notification',
 				url: 'jcloude.api.notifications.get_notifications',
 				auto: true,
 				filters: {
diff --git a/dashboard/src/objects/server.js b/dashboard/src/objects/server.js
index 78c910a5..839a938f 100644
--- a/dashboard/src/objects/server.js
+++ b/dashboard/src/objects/server.js
@@ -14,7 +14,7 @@ import { getJobsTab } from './common/jobs';
 import { tagTab } from './common/tags';
 
 export default {
-	doctype: 'Server',
+	pagetype: 'Server',
 	whitelistedMethods: {
 		increaseDiskSize: 'increase_disk_size_for_server',
 		configureAutoAddStorage: 'configure_auto_add_storage',
@@ -200,7 +200,7 @@ export default {
 								window.open(
 									`${window.location.protocol}//${
 										window.location.host
-									}/app/${server.doctype.replace(' ', '-').toLowerCase()}/${
+									}/app/${server.pagetype.replace(' ', '-').toLowerCase()}/${
 										server.pg.name
 									}`,
 									'_blank',
@@ -300,7 +300,7 @@ export default {
 				route: 'sites',
 				type: 'list',
 				list: {
-					doctype: 'Site',
+					pagetype: 'Site',
 					filters: (server) => {
 						return { server: server.pg.name };
 					},
@@ -332,7 +332,7 @@ export default {
 								label: 'Version',
 								fieldname: 'group.version',
 								options: {
-									doctype: 'Jingrow Version',
+									pagetype: 'Jingrow Version',
 								},
 							},
 							{
@@ -340,7 +340,7 @@ export default {
 								label: 'Bench Group',
 								fieldname: 'group',
 								options: {
-									doctype: 'Release Group',
+									pagetype: 'Release Group',
 								},
 							},
 							{
@@ -348,9 +348,9 @@ export default {
 								label: 'Tag',
 								fieldname: 'tags.tag',
 								options: {
-									doctype: 'Jcloude Tag',
+									pagetype: 'Jcloude Tag',
 									filters: {
-										doctype_name: 'Site',
+										pagetype_name: 'Site',
 									},
 								},
 							},
@@ -409,7 +409,7 @@ export default {
 				route: 'groups',
 				type: 'list',
 				list: {
-					doctype: 'Release Group',
+					pagetype: 'Release Group',
 					filters: (server) => {
 						return { server: server.pg.name };
 					},
@@ -452,7 +452,7 @@ export default {
 								label: 'Version',
 								fieldname: 'version',
 								options: {
-									doctype: 'Jingrow Version',
+									pagetype: 'Jingrow Version',
 								},
 							},
 							{
@@ -460,9 +460,9 @@ export default {
 								label: 'Tag',
 								fieldname: 'tags.tag',
 								options: {
-									doctype: 'Jcloude Tag',
+									pagetype: 'Jcloude Tag',
 									filters: {
-										doctype_name: 'Release Group',
+										pagetype_name: 'Release Group',
 									},
 								},
 							},
@@ -500,7 +500,7 @@ export default {
 				route: 'snapshots',
 				type: 'list',
 				list: {
-					doctype: 'Server Snapshot',
+					pagetype: 'Server Snapshot',
 					filters: (server) => {
 						let filters = {
 							app_server: server.pg?.name,
@@ -823,7 +823,7 @@ export default {
 				type: 'list',
 				searchField: 'play',
 				list: {
-					doctype: 'Ansible Play',
+					pagetype: 'Ansible Play',
 					filterControls({ documentResource: server }) {
 						return [
 							{
@@ -950,7 +950,7 @@ export default {
 					return server.pg?.status !== 'Archived';
 				},
 				list: {
-					doctype: 'Server Activity',
+					pagetype: 'Server Activity',
 					filters: (server) => {
 						return {
 							document_name: [
diff --git a/dashboard/src/objects/site.js b/dashboard/src/objects/site.js
index a35c8157..ecb234ba 100644
--- a/dashboard/src/objects/site.js
+++ b/dashboard/src/objects/site.js
@@ -26,7 +26,7 @@ import { isMobile } from '../utils/device';
 import { getQueryParam, setQueryParam } from '../utils/index';
 
 export default {
-	doctype: 'Site',
+	pagetype: 'Site',
 	whitelistedMethods: {
 		activate: 'activate',
 		addDomain: 'add_domain',
@@ -105,7 +105,7 @@ export default {
 					label: 'Version',
 					fieldname: 'group.version',
 					options: {
-						doctype: 'Jingrow Version',
+						pagetype: 'Jingrow Version',
 					},
 				},
 				{
@@ -113,7 +113,7 @@ export default {
 					label: 'Bench Group',
 					fieldname: 'group',
 					options: {
-						doctype: 'Release Group',
+						pagetype: 'Release Group',
 					},
 				},
 				{
@@ -127,9 +127,9 @@ export default {
 					label: 'Tag',
 					fieldname: 'tags.tag',
 					options: {
-						doctype: 'Jcloude Tag',
+						pagetype: 'Jcloude Tag',
 						filters: {
-							doctype_name: 'Site',
+							pagetype_name: 'Site',
 						},
 					},
 				},
@@ -223,7 +223,7 @@ export default {
 							'creation',
 						];
 						createListResource({
-							doctype: 'Site',
+							pagetype: 'Site',
 							url: 'jcloude.api.site.fetch_sites_data_for_export',
 							auto: true,
 							onSuccess(data) {
@@ -401,7 +401,7 @@ export default {
 					return site.pg?.status !== 'Archived';
 				},
 				list: {
-					doctype: 'Site Domain',
+					pagetype: 'Site Domain',
 					fields: ['redirect_to_primary'],
 					filters: (site) => {
 						return { site: site.pg?.name };
@@ -637,7 +637,7 @@ export default {
 				route: 'backups',
 				type: 'list',
 				list: {
-					doctype: 'Site Backup',
+					pagetype: 'Site Backup',
 					filters: (site) => {
 						let filters = {
 							site: site.pg?.name,
@@ -1081,7 +1081,7 @@ export default {
 					return site.pg?.status !== 'Archived';
 				},
 				list: {
-					doctype: 'Site Config',
+					pagetype: 'Site Config',
 					filters: (site) => {
 						return { parent: site.pg?.name, parenttype: 'Site' };
 					},
@@ -1226,7 +1226,7 @@ export default {
 				},
 				childrenRoutes: ['Site Update'],
 				list: {
-					doctype: 'Site Update',
+					pagetype: 'Site Update',
 					filters: (site) => {
 						return { site: site.pg?.name };
 					},
@@ -1343,7 +1343,7 @@ export default {
 								condition: () => row.status === 'Scheduled',
 								onClick() {
 									let siteUpdate = getDocResource({
-										doctype: 'Site Update',
+										pagetype: 'Site Update',
 										name: row.name,
 										whitelistedMethods: {
 											updateNow: 'start',
@@ -1368,7 +1368,7 @@ export default {
 								label: 'View App Changes',
 								onClick() {
 									createListResource({
-										doctype: 'Deploy Candidate Difference App',
+										pagetype: 'Deploy Candidate Difference App',
 										fields: [
 											'difference.github_diff_url as diff_url',
 											'difference.source_hash as source_hash',
@@ -1506,7 +1506,7 @@ export default {
 				type: 'list',
 				condition: (site) => site.pg?.status !== 'Archived',
 				list: {
-					doctype: 'Site Activity',
+					pagetype: 'Site Activity',
 					filters: (site) => {
 						return { site: site.pg?.name };
 					},
diff --git a/dashboard/src/objects/tabs/site/logs.ts b/dashboard/src/objects/tabs/site/logs.ts
index 7074c38a..65ec8a4e 100644
--- a/dashboard/src/objects/tabs/site/logs.ts
+++ b/dashboard/src/objects/tabs/site/logs.ts
@@ -16,7 +16,7 @@ export function getLogsTab(forSite: boolean) {
 			resource({ documentResource: res }) {
 				return {
 					makeParams: () => {
-						if (res.doctype === 'Site') {
+						if (res.pagetype === 'Site') {
 							return { name: res.pg.name };
 						} else {
 							return { name: res.pg.group, bench: res.name };
diff --git a/dashboard/src/pages/BillingBalances.vue b/dashboard/src/pages/BillingBalances.vue
index 11b00520..21d546c8 100644
--- a/dashboard/src/pages/BillingBalances.vue
+++ b/dashboard/src/pages/BillingBalances.vue
@@ -14,7 +14,7 @@ export default {
 	computed: {
 		options() {
 			return {
-				doctype: 'Balance Transaction',
+				pagetype: 'Balance Transaction',
 				fields: ['type', 'source', 'invoice'],
 				columns: [
 					{
diff --git a/dashboard/src/pages/BillingInvoices.vue b/dashboard/src/pages/BillingInvoices.vue
index 118931c6..bea38551 100644
--- a/dashboard/src/pages/BillingInvoices.vue
+++ b/dashboard/src/pages/BillingInvoices.vue
@@ -62,7 +62,7 @@ export default {
 	computed: {
 		options() {
 			return {
-				doctype: 'Invoice',
+				pagetype: 'Invoice',
 				fields: [
 					'type',
 					'invoice_pdf',
diff --git a/dashboard/src/pages/BillingMarketplacePayouts.vue b/dashboard/src/pages/BillingMarketplacePayouts.vue
index 05edd4f8..d4ed2f8f 100644
--- a/dashboard/src/pages/BillingMarketplacePayouts.vue
+++ b/dashboard/src/pages/BillingMarketplacePayouts.vue
@@ -39,7 +39,7 @@ export default {
 	computed: {
 		options() {
 			return {
-				doctype: 'Payout Order',
+				pagetype: 'Payout Order',
 				fields: [
 					'period_end',
 					'mode_of_payment',
diff --git a/dashboard/src/pages/BillingMpesaInvoices.vue b/dashboard/src/pages/BillingMpesaInvoices.vue
index 974dd576..c6c236d5 100644
--- a/dashboard/src/pages/BillingMpesaInvoices.vue
+++ b/dashboard/src/pages/BillingMpesaInvoices.vue
@@ -46,7 +46,7 @@ export default {
 	computed: {
 		options() {
 			return {
-				doctype: 'Mpesa Payment Record',
+				pagetype: 'Mpesa Payment Record',
 				fields: [
 					'name',
 					'posting_date',
diff --git a/dashboard/src/pages/BillingPaymentMethods.vue b/dashboard/src/pages/BillingPaymentMethods.vue
index cb73f0a1..0c383c88 100644
--- a/dashboard/src/pages/BillingPaymentMethods.vue
+++ b/dashboard/src/pages/BillingPaymentMethods.vue
@@ -18,7 +18,7 @@ export default {
 	computed: {
 		options() {
 			return {
-				doctype: 'Stripe Payment Method',
+				pagetype: 'Stripe Payment Method',
 				fields: [
 					'name',
 					'is_default',
diff --git a/dashboard/src/pages/CreateSiteForMarketplaceApp.vue b/dashboard/src/pages/CreateSiteForMarketplaceApp.vue
index 6c6dcd74..ba2a4e92 100644
--- a/dashboard/src/pages/CreateSiteForMarketplaceApp.vue
+++ b/dashboard/src/pages/CreateSiteForMarketplaceApp.vue
@@ -127,7 +127,7 @@ export default {
 		siteGroupDeploy() {
 			return {
 				type: 'document',
-				doctype: 'Site Group Deploy',
+				pagetype: 'Site Group Deploy',
 				name: this.siteGroupDeployName,
 				onSuccess: (pg) => {
 					if (pg.status === 'Site Created') {
diff --git a/dashboard/src/pages/DeployCandidate.vue b/dashboard/src/pages/DeployCandidate.vue
index cf10464d..cb9409b3 100644
--- a/dashboard/src/pages/DeployCandidate.vue
+++ b/dashboard/src/pages/DeployCandidate.vue
@@ -23,7 +23,7 @@
 			type="warning"
 			class="mb-5"
 		/>
-		<Button :route="{ name: `${object.doctype} Detail Deploys` }">
+		<Button :route="{ name: `${object.pagetype} Detail Deploys` }">
 			<template #prefix>
 				<lucide-arrow-left class="inline-block h-4 w-4" />
 			</template>
@@ -137,7 +137,7 @@ export default {
 		deploy() {
 			return {
 				type: 'document',
-				doctype: 'Deploy Candidate Build',
+				pagetype: 'Deploy Candidate Build',
 				name: this.id,
 				transform: this.transformDeploy,
 			};
@@ -151,7 +151,7 @@ export default {
 					'Deploy Candidate Build',
 					this.id,
 				],
-				doctype: 'Jcloude Notification',
+				pagetype: 'Jcloude Notification',
 				auto: true,
 				fields: ['title', 'name'],
 				filters: {
@@ -171,7 +171,7 @@ export default {
 					'Deploy Candidate Build',
 					this.id,
 				],
-				doctype: 'Jcloude Notification',
+				pagetype: 'Jcloude Notification',
 				auto: true,
 				fields: ['title', 'name'],
 				filters: {
diff --git a/dashboard/src/pages/DetailPage.vue b/dashboard/src/pages/DetailPage.vue
index fb51db5e..60f7e15c 100644
--- a/dashboard/src/pages/DetailPage.vue
+++ b/dashboard/src/pages/DetailPage.vue
@@ -14,7 +14,7 @@
 					<Badge v-if="$resources.document?.pg && badge" v-bind="badge" />
 				</div>
 				<AccessRequestButton
-					:doctype="object.doctype"
+					:pagetype="object.pagetype"
 					:docname="name"
 					:pg="$resources.document?.pg"
 					:error="$resources.document.get.error"
@@ -48,7 +48,7 @@
 		</TabsWithRouter>
 		<DetailPageError
 			class="mt-60"
-			:doctype="object.doctype"
+			:pagetype="object.pagetype"
 			:docname="name"
 			:error="$resources.document.get.error"
 		/>
@@ -89,7 +89,7 @@ export default {
 		document() {
 			return {
 				type: 'document',
-				doctype: this.object.doctype,
+				pagetype: this.object.pagetype,
 				name: this.name,
 				whitelistedMethods: this.object.whitelistedMethods || {},
 				onError(error) {
@@ -104,21 +104,21 @@ export default {
 		},
 	},
 	mounted() {
-		if (!subscribed[`${this.object.doctype}:${this.name}`]) {
-			this.$socket.emit('pg_subscribe', this.object.doctype, this.name);
-			subscribed[`${this.object.doctype}:${this.name}`] = true;
+		if (!subscribed[`${this.object.pagetype}:${this.name}`]) {
+			this.$socket.emit('pg_subscribe', this.object.pagetype, this.name);
+			subscribed[`${this.object.pagetype}:${this.name}`] = true;
 		}
 		this.$socket.on('pg_update', (data) => {
-			if (data.doctype === this.object.doctype && data.name === this.name) {
+			if (data.pagetype === this.object.pagetype && data.name === this.name) {
 				this.$resources.document.reload();
 			}
 		});
 	},
 	beforeUnmount() {
-		let doctype = this.object.doctype;
-		if (subscribed[`${doctype}:${this.name}`]) {
-			this.$socket.emit('pg_unsubscribe', doctype, this.name);
-			subscribed[`${doctype}:${this.name}`] = false;
+		let pagetype = this.object.pagetype;
+		if (subscribed[`${pagetype}:${this.name}`]) {
+			this.$socket.emit('pg_unsubscribe', pagetype, this.name);
+			subscribed[`${pagetype}:${this.name}`] = false;
 		}
 	},
 	computed: {
@@ -169,7 +169,7 @@ export default {
 				{
 					label: this.title,
 					route: {
-						name: `${this.object.doctype} Detail`,
+						name: `${this.object.pagetype} Detail`,
 						params: { name: this.name },
 					},
 				},
diff --git a/dashboard/src/pages/InstallApp.vue b/dashboard/src/pages/InstallApp.vue
index 09be93d1..7067308d 100644
--- a/dashboard/src/pages/InstallApp.vue
+++ b/dashboard/src/pages/InstallApp.vue
@@ -338,12 +338,12 @@ export default {
 					}
 				},
 				onSuccess: (pg) => {
-					if (pg.doctype === 'Site') {
+					if (pg.pagetype === 'Site') {
 						this.$router.push({
 							name: 'Site Jobs',
 							params: { name: pg.name },
 						});
-					} else if (pg.doctype === 'Site Group Deploy') {
+					} else if (pg.pagetype === 'Site Group Deploy') {
 						this.$router.push({
 							name: 'CreateSiteForMarketplaceApp',
 							params: { app: this.app },
diff --git a/dashboard/src/pages/JobPage.vue b/dashboard/src/pages/JobPage.vue
index bb7d398e..f54bd9a7 100644
--- a/dashboard/src/pages/JobPage.vue
+++ b/dashboard/src/pages/JobPage.vue
@@ -10,9 +10,9 @@
 		<Button
 			:route="{
 				name:
-					object.doctype === 'Site'
+					object.pagetype === 'Site'
 						? 'Site Jobs'
-						: `${object.doctype} Detail Jobs`,
+						: `${object.pagetype} Detail Jobs`,
 			}"
 		>
 			<template #prefix>
@@ -105,7 +105,7 @@ export default {
 		job() {
 			return {
 				type: 'document',
-				doctype: 'Agent Job',
+				pagetype: 'Agent Job',
 				name: this.id,
 				transform(job) {
 					for (let step of job.steps) {
@@ -133,7 +133,7 @@ export default {
 			return {
 				type: 'list',
 				cache: ['Jcloude Notification', 'Error', 'Agent Job', this.id],
-				doctype: 'Jcloude Notification',
+				pagetype: 'Jcloude Notification',
 				auto: true,
 				fields: ['title', 'name'],
 				filters: {
diff --git a/dashboard/src/pages/ListPage.vue b/dashboard/src/pages/ListPage.vue
index 8d3f96f7..3f734982 100644
--- a/dashboard/src/pages/ListPage.vue
+++ b/dashboard/src/pages/ListPage.vue
@@ -99,7 +99,7 @@ export default {
 	methods: {
 		getRoute(row) {
 			return {
-				name: `${this.object.doctype} Detail`,
+				name: `${this.object.pagetype} Detail`,
 				params: {
 					name: row.name,
 				},
@@ -113,7 +113,7 @@ export default {
 		listOptions() {
 			return {
 				...this.object.list,
-				doctype: this.object.doctype,
+				pagetype: this.object.pagetype,
 				route: this.object.detail ? this.getRoute : null,
 			};
 		},
diff --git a/dashboard/src/pages/LogPage.vue b/dashboard/src/pages/LogPage.vue
index 32990b34..f466c9a1 100644
--- a/dashboard/src/pages/LogPage.vue
+++ b/dashboard/src/pages/LogPage.vue
@@ -4,9 +4,9 @@
 			<Button
 				:route="{
 					name:
-						object.doctype === 'Site'
+						object.pagetype === 'Site'
 							? 'Site Logs'
-							: `${object.doctype} Detail Logs`,
+							: `${object.pagetype} Detail Logs`,
 				}"
 			>
 				<template #icon>
@@ -19,7 +19,7 @@
 					:route="{
 						name: 'Log Browser',
 						params: {
-							mode: object.doctype === 'Site' ? 'site' : 'bench',
+							mode: object.pagetype === 'Site' ? 'site' : 'bench',
 							docName: name,
 							logId: logName,
 						},
diff --git a/dashboard/src/pages/NewSite.vue b/dashboard/src/pages/NewSite.vue
index 9fdd133b..36b3f087 100644
--- a/dashboard/src/pages/NewSite.vue
+++ b/dashboard/src/pages/NewSite.vue
@@ -410,7 +410,7 @@ export default {
 
 						return {
 							pg: {
-								doctype: 'Site',
+								pagetype: 'Site',
 								team: this.$team.pg.name,
 								subdomain: this.subdomain,
 								apps: [
diff --git a/dashboard/src/pages/PartnerAdminCertificates.vue b/dashboard/src/pages/PartnerAdminCertificates.vue
index 2e3a9170..c960d6fd 100644
--- a/dashboard/src/pages/PartnerAdminCertificates.vue
+++ b/dashboard/src/pages/PartnerAdminCertificates.vue
@@ -17,7 +17,7 @@ export default {
 	computed: {
 		partnerCertificatesList() {
 			return {
-				doctype: 'Partner Certificate',
+				pagetype: 'Partner Certificate',
 				fields: ['free', 'certificate_link'],
 				columns: [
 					{
diff --git a/dashboard/src/pages/PartnerAdminLeads.vue b/dashboard/src/pages/PartnerAdminLeads.vue
index 0b84982f..e035d224 100644
--- a/dashboard/src/pages/PartnerAdminLeads.vue
+++ b/dashboard/src/pages/PartnerAdminLeads.vue
@@ -14,7 +14,7 @@ export default {
 		originList() {
 			return {
 				type: 'list',
-				doctype: 'Partner Lead Origin',
+				pagetype: 'Partner Lead Origin',
 				fields: ['name'],
 				auto: true,
 			};
@@ -23,7 +23,7 @@ export default {
 	computed: {
 		partnerAdminLeadsList() {
 			return {
-				doctype: 'Partner Lead',
+				pagetype: 'Partner Lead',
 				fields: [],
 				columns: [
 					{
diff --git a/dashboard/src/pages/PartnerLeadDetails.vue b/dashboard/src/pages/PartnerLeadDetails.vue
index 8919c0ff..b2091f3b 100644
--- a/dashboard/src/pages/PartnerLeadDetails.vue
+++ b/dashboard/src/pages/PartnerLeadDetails.vue
@@ -38,7 +38,7 @@ export default {
 		lead() {
 			return {
 				type: 'document',
-				doctype: 'Partner Lead',
+				pagetype: 'Partner Lead',
 				name: this.$route.params.leadId,
 			};
 		},
diff --git a/dashboard/src/pages/PartnerNewPayout.vue b/dashboard/src/pages/PartnerNewPayout.vue
index 394d00b2..333315ca 100644
--- a/dashboard/src/pages/PartnerNewPayout.vue
+++ b/dashboard/src/pages/PartnerNewPayout.vue
@@ -206,7 +206,7 @@ export default {
 	resources: {
 		submitPaymentPayout() {
 			return {
-				url: 'jcloude.jcloude.doctype.partner_payment_payout.partner_payment_payout.submit_payment_payout',
+				url: 'jcloude.jcloude.pagetype.partner_payment_payout.partner_payment_payout.submit_payment_payout',
 				params: {
 					partner: this.partnerInput.value,
 					payment_gateway: this.paymentGateway.value,
diff --git a/dashboard/src/pages/PlayPage.vue b/dashboard/src/pages/PlayPage.vue
index 957d98ae..ae7b238a 100644
--- a/dashboard/src/pages/PlayPage.vue
+++ b/dashboard/src/pages/PlayPage.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="p-5" v-if="play">
-		<Button :route="{ name: `${object.doctype} Detail Plays` }">
+		<Button :route="{ name: `${object.pagetype} Detail Plays` }">
 			<template #prefix>
 				<lucide-arrow-left class="inline-block h-4 w-4" />
 			</template>
@@ -88,7 +88,7 @@ export default {
 		play() {
 			return {
 				type: 'document',
-				doctype: 'Ansible Play',
+				pagetype: 'Ansible Play',
 				name: this.id,
 				transform(play) {
 					for (let task of play.tasks) {
diff --git a/dashboard/src/pages/ReleaseGroupBenchSites.vue b/dashboard/src/pages/ReleaseGroupBenchSites.vue
index 22f3a96b..cbcd2c8a 100644
--- a/dashboard/src/pages/ReleaseGroupBenchSites.vue
+++ b/dashboard/src/pages/ReleaseGroupBenchSites.vue
@@ -62,7 +62,7 @@ export default {
 		benches() {
 			return {
 				type: 'list',
-				doctype: 'Bench',
+				pagetype: 'Bench',
 				filters: {
 					group: this.$releaseGroup.name,
 					skip_team_filter_for_system_user_and_support_agent: true,
@@ -79,7 +79,7 @@ export default {
 		sites() {
 			return {
 				type: 'list',
-				doctype: 'Site',
+				pagetype: 'Site',
 				filters: {
 					group: this.$releaseGroup.name,
 					skip_team_filter_for_system_user_and_support_agent: true,
diff --git a/dashboard/src/pages/SiteLogin.vue b/dashboard/src/pages/SiteLogin.vue
index 40fb8933..7a03d3d3 100644
--- a/dashboard/src/pages/SiteLogin.vue
+++ b/dashboard/src/pages/SiteLogin.vue
@@ -262,7 +262,7 @@ const isCookieValid = createResource({
 
 const sites = createResource({
 	url: 'jcloude.api.site_login.get_product_sites_of_user',
-	doctype: 'Site',
+	pagetype: 'Site',
 	auto: session.user,
 	params: {
 		user: email.value || session.user,
diff --git a/dashboard/src/pages/SiteUpdate.vue b/dashboard/src/pages/SiteUpdate.vue
index b879f4d6..4fa6afd3 100644
--- a/dashboard/src/pages/SiteUpdate.vue
+++ b/dashboard/src/pages/SiteUpdate.vue
@@ -101,7 +101,7 @@ export default {
 			if (!this.id) return;
 			return {
 				type: 'document',
-				doctype: 'Site Update',
+				pagetype: 'Site Update',
 				name: this.id,
 				auto: true,
 				transform: (record) => {
diff --git a/dashboard/src/pages/backups/ServerSnapshots.vue b/dashboard/src/pages/backups/ServerSnapshots.vue
index a6d69763..c6ae898e 100644
--- a/dashboard/src/pages/backups/ServerSnapshots.vue
+++ b/dashboard/src/pages/backups/ServerSnapshots.vue
@@ -32,7 +32,7 @@ export default {
 	computed: {
 		listOptions() {
 			return {
-				doctype: 'Server Snapshot',
+				pagetype: 'Server Snapshot',
 				filters: () => {
 					return { status: ['!=', 'Unavailable'] };
 				},
@@ -156,7 +156,7 @@ export default {
 							label: 'App Server',
 							fieldname: 'app_server',
 							options: {
-								doctype: 'Server',
+								pagetype: 'Server',
 							},
 						},
 						{
@@ -164,7 +164,7 @@ export default {
 							label: 'Database Server',
 							fieldname: 'database_server',
 							options: {
-								doctype: 'Database Server',
+								pagetype: 'Database Server',
 							},
 						},
 						{
diff --git a/dashboard/src/pages/backups/SiteBackups.vue b/dashboard/src/pages/backups/SiteBackups.vue
index 9969b830..b4146922 100644
--- a/dashboard/src/pages/backups/SiteBackups.vue
+++ b/dashboard/src/pages/backups/SiteBackups.vue
@@ -32,7 +32,7 @@ export default {
 	computed: {
 		listOptions() {
 			return {
-				doctype: 'Site Backup',
+				pagetype: 'Site Backup',
 				orderBy: 'creation desc',
 				fields: [
 					'name',
@@ -121,7 +121,7 @@ export default {
 							label: 'Site',
 							fieldname: 'site',
 							options: {
-								doctype: 'Site',
+								pagetype: 'Site',
 							},
 						},
 						{
diff --git a/dashboard/src/pages/devtools/database/BinlogBrowser.vue b/dashboard/src/pages/devtools/database/BinlogBrowser.vue
index 01964408..9bc718ba 100644
--- a/dashboard/src/pages/devtools/database/BinlogBrowser.vue
+++ b/dashboard/src/pages/devtools/database/BinlogBrowser.vue
@@ -52,7 +52,7 @@
 
 					<LinkControl
 						class="cursor-pointer"
-						:options="{ doctype: 'Site', filters: { status: 'Active' } }"
+						:options="{ pagetype: 'Site', filters: { status: 'Active' } }"
 						placeholder="Select a site"
 						v-model="site"
 					/>
@@ -455,7 +455,7 @@ export default {
 				url: 'jcloude.api.client.get',
 				initialData: {},
 				makeParams: () => {
-					return { doctype: 'Site', name: this.site };
+					return { pagetype: 'Site', name: this.site };
 				},
 				auto: false,
 				onSuccess: (data) => {
diff --git a/dashboard/src/pages/devtools/database/DatabaseAnalyzer.vue b/dashboard/src/pages/devtools/database/DatabaseAnalyzer.vue
index 21a2363a..cd2e4dfd 100644
--- a/dashboard/src/pages/devtools/database/DatabaseAnalyzer.vue
+++ b/dashboard/src/pages/devtools/database/DatabaseAnalyzer.vue
@@ -16,7 +16,7 @@
 				<LinkControl
 					class="cursor-pointer"
 					:options="{
-						doctype: 'Site',
+						pagetype: 'Site',
 						filters: {
 							status: ['in', ['Active', 'Suspended', 'Broken', 'Inactive']],
 						},
@@ -436,7 +436,7 @@ export default {
 				url: 'jcloude.api.client.get',
 				initialData: {},
 				makeParams: () => {
-					return { doctype: 'Site', name: this.site };
+					return { pagetype: 'Site', name: this.site };
 				},
 				auto: false,
 			};
diff --git a/dashboard/src/pages/devtools/database/DatabaseSQLPlayground.vue b/dashboard/src/pages/devtools/database/DatabaseSQLPlayground.vue
index 6e0d9a05..0657edb3 100644
--- a/dashboard/src/pages/devtools/database/DatabaseSQLPlayground.vue
+++ b/dashboard/src/pages/devtools/database/DatabaseSQLPlayground.vue
@@ -34,7 +34,7 @@
 				<LinkControl
 					class="cursor-pointer"
 					:options="{
-						doctype: 'Site',
+						pagetype: 'Site',
 						filters: { status: ['!=', 'Archived'] },
 					}"
 					placeholder="Select a site"
diff --git a/dashboard/src/pages/devtools/log-browser/LogBrowser.vue b/dashboard/src/pages/devtools/log-browser/LogBrowser.vue
index 1a6d8068..1de279e6 100644
--- a/dashboard/src/pages/devtools/log-browser/LogBrowser.vue
+++ b/dashboard/src/pages/devtools/log-browser/LogBrowser.vue
@@ -39,7 +39,7 @@
 					<LinkControl
 						v-show="mode === 'site'"
 						:options="{
-							doctype: 'Site',
+							pagetype: 'Site',
 							filters: { status: 'Active' },
 							initialData: [{ label: site, value: site }],
 						}"
@@ -59,7 +59,7 @@
 						class="w-52"
 						v-show="mode === 'bench'"
 						:options="{
-							doctype: 'Bench',
+							pagetype: 'Bench',
 							filters: { status: 'Active' },
 							initialData: [
 								{
diff --git a/dashboard/src/pages/signup/LoginToSite.vue b/dashboard/src/pages/signup/LoginToSite.vue
index 01324c8c..a1d4201d 100644
--- a/dashboard/src/pages/signup/LoginToSite.vue
+++ b/dashboard/src/pages/signup/LoginToSite.vue
@@ -141,7 +141,7 @@ export default {
 		saasProduct() {
 			return {
 				type: 'document',
-				doctype: 'Product Trial',
+				pagetype: 'Product Trial',
 				name: this.productId,
 				auto: true,
 			};
@@ -149,7 +149,7 @@ export default {
 		siteRequest() {
 			return {
 				type: 'document',
-				doctype: 'Product Trial Request',
+				pagetype: 'Product Trial Request',
 				name: this.product_trial_request,
 				realtime: true,
 				auto: true,
diff --git a/dashboard/src/pages/signup/SetupSite.vue b/dashboard/src/pages/signup/SetupSite.vue
index fb9d5c0b..505309f0 100644
--- a/dashboard/src/pages/signup/SetupSite.vue
+++ b/dashboard/src/pages/signup/SetupSite.vue
@@ -112,7 +112,7 @@ export default {
 		saasProduct() {
 			return {
 				type: 'document',
-				doctype: 'Product Trial',
+				pagetype: 'Product Trial',
 				name: this.productId,
 				auto: true,
 				onSuccess: (data) => {
diff --git a/dashboard/src/utils/resource.js b/dashboard/src/utils/resource.js
index 84c9b824..68b54afd 100644
--- a/dashboard/src/utils/resource.js
+++ b/dashboard/src/utils/resource.js
@@ -1,7 +1,7 @@
 import { createDocumentResource, getCachedDocumentResource } from 'jingrow-ui';
 
 export function getDocResource(object) {
-	let pg = getCachedDocumentResource(object.doctype, object.name);
+	let pg = getCachedDocumentResource(object.pagetype, object.name);
 	if (!pg) pg = createDocumentResource(object);
 	return pg;
 }
diff --git a/docs/General Guide/DevOps Manual.MD b/docs/General Guide/DevOps Manual.MD
index 405b71e5..d31c1b25 100644
--- a/docs/General Guide/DevOps Manual.MD	
+++ b/docs/General Guide/DevOps Manual.MD	
@@ -145,7 +145,7 @@ Increasing the Storage on AWS Server
 
 You can increase the storage of the AWS Server by using **Jingrow Cloud Alerts Telegram Bot**. You can do this by invoking the bot in the group.   
 `@jingrow_cloud_bot server f29-mumbai.jingrow.cloud execute increase_disk_size <size in gb>`   
-The server name can be any server on AWS present in the server doctype and `increase_disk_size` can be changed to any whitelisted method on the doctype(server). An EBS instance of 50GB will be attached to the server if no size is specified.
+The server name can be any server on AWS present in the server pagetype and `increase_disk_size` can be changed to any whitelisted method on the pagetype(server). An EBS instance of 50GB will be attached to the server if no size is specified.
 
 
 > Note that the Volume increase can only be done once in 6 hours for a server
diff --git a/docs/General Guide/Marketplace Review Process.MD b/docs/General Guide/Marketplace Review Process.MD
index 45173eab..3f67efc0 100644
--- a/docs/General Guide/Marketplace Review Process.MD	
+++ b/docs/General Guide/Marketplace Review Process.MD	
@@ -4,9 +4,9 @@ allow_guest: 1
 published: 1
 ---
 
-## The Marketplace App DocType
+## The Marketplace App PageType
 
-The main master for marketplace is the “Marketplace App” DocType around which all the other doctypes revolve around. 
+The main master for marketplace is the “Marketplace App” PageType around which all the other doctypes revolve around. 
 
 ## Release Management
 
diff --git a/docs/General Guide/Operational Manual.MD b/docs/General Guide/Operational Manual.MD
index f7933ed3..d9cfeabc 100644
--- a/docs/General Guide/Operational Manual.MD	
+++ b/docs/General Guide/Operational Manual.MD	
@@ -38,7 +38,7 @@ This documentation is intended to help consultants carry out daily operational t
 
 ### Visit Desk page of Bench Group from Dashboard
 
-* From the dashboard page of bench group, click on **View in Desk** to see desk page. This corresponds to the **Release Group** doctype.
+* From the dashboard page of bench group, click on **View in Desk** to see desk page. This corresponds to the **Release Group** pagetype.
 
 ![](../files/view_in_desk.png) ![](../files/release-group.png)  
 
@@ -214,11 +214,11 @@ DEL <db_name>|rate-limit-counter-XXXXX
 
 
 	* Open desk page of site you want to copy
-	* Go to linked **Site Backup** doctype list
+	* Go to linked **Site Backup** pagetype list
 	* Create new
 	* Check the `with files` and `offsite` option and save
 	* Go to dashboard page of site to see progress and wait for it to finish
-2. Open [Site Replication](/app/site-replication) doctype list
+2. Open [Site Replication](/app/site-replication) pagetype list
 
 
 	* Enter name of the site
@@ -236,7 +236,7 @@ DEL <db_name>|rate-limit-counter-XXXXX
 
 
 	* Open desk page of site you want to copy
-	* Go to linked **Site Backup** doctype list. Keep this open in another tab.
+	* Go to linked **Site Backup** pagetype list. Keep this open in another tab.
 	* Create new
 	* Check the `with files` and `offsite` option and save
 	* Go to dashboard page of site to see progress and wait for it to finish
diff --git a/docs/How to ?/Add New Press Webhook.MD b/docs/How to ?/Add New Press Webhook.MD
index 52b94261..cbf6b043 100644
--- a/docs/How to ?/Add New Press Webhook.MD	
+++ b/docs/How to ?/Add New Press Webhook.MD	
@@ -9,7 +9,7 @@ General introduction to jcloude webhook can be found in [the public documentatio
 Add New Webhook Event
 ---------------------
 
-1. Go to `Jcloude Webhook Event` doctype in desk.
+1. Go to `Jcloude Webhook Event` pagetype in desk.
 2. Create a new record and fill up the title and description of event. This title and description will be shown to users to select.
 3. If you are on local development setup, you can export fixtures.
 4. Update the documentation of `Webhook Events` as well > <https://jcloud.jingrow.com/docs/webhook-events>
@@ -30,8 +30,8 @@ from jcloude.utils.webhook import create_webhook_event
 create_webhook_event("Site Status Update", payload, team_name)
 ```
 
-	* **Payload** can be doctype object or a python dictionary.
-	* If you want to pass doctype object as payload, you should add the required non-sensitive fields in `dashboard_fields` list in your doctype class. Check the `_process_document_payload` method ([ref](http://git.jingrow.com/jingrow/jcloude/blob/d548d10269fb31dacc5ce257a8ff2d41fe451d6a/jcloude/utils/webhook.py#L66)) to understand that.
+	* **Payload** can be pagetype object or a python dictionary.
+	* If you want to pass pagetype object as payload, you should add the required non-sensitive fields in `dashboard_fields` list in your pagetype class. Check the `_process_document_payload` method ([ref](http://git.jingrow.com/jingrow/jcloude/blob/d548d10269fb31dacc5ce257a8ff2d41fe451d6a/jcloude/utils/webhook.py#L66)) to understand that.
 3. ⚠️ In the codebase, at many place we use `jingrow.db.set_value` to set some specific field's value, it can cause little bit issues.
 
   
@@ -49,6 +49,6 @@ Related Doctypes
 
 1. **Jcloude Webhook Event** - Type of webhook events (e.g. *Site Status Update*).
 2. **Jcloude Webhook** - Holds the configured webhook of teams.
-3. **Jcloude Webhook Selected Event** - Child table to hold selected events for `Jcloude Webhook` doctype.
-4. **Jcloude Webhook Log** - This doctype record gets created, when we try to dispatch a webhook event to a team. It has a child table `Jcloude Webhook Attempts` which hold request/response of webhook calls. Also manage status, retry information as well.
+3. **Jcloude Webhook Selected Event** - Child table to hold selected events for `Jcloude Webhook` pagetype.
+4. **Jcloude Webhook Log** - This pagetype record gets created, when we try to dispatch a webhook event to a team. It has a child table `Jcloude Webhook Attempts` which hold request/response of webhook calls. Also manage status, retry information as well.
 5. **Jcloude Webhook Attempt** - Child table which hold request, response, status code, overall status, timestamp of a webhook request.
diff --git a/docs/How to ?/Update Agents on Prod.MD b/docs/How to ?/Update Agents on Prod.MD
index ffa2bfa3..308d3ca3 100644
--- a/docs/How to ?/Update Agents on Prod.MD	
+++ b/docs/How to ?/Update Agents on Prod.MD	
@@ -45,10 +45,10 @@ If you want to update to a specific commit hash only, you can provide that info,
 
 #### How to Update ?
 
-1. Create a agent doctype, with all necessary config,
+1. Create a agent pagetype, with all necessary config,
 	![](/files/Pasted%20image%2020250516170638.png)
 
-2. Once you save the doctype, server list will be populated.
+2. Once you save the pagetype, server list will be populated.
 	![](/files/Pasted%20image%2020250516170716.png)
 
 	> Check the sever list once. If you want to remove some servers, just remove the row.
@@ -83,7 +83,7 @@ This feature will solve that. You can split 500 updates in 10 batches. So, that
 
 **Steps -**
 
-For example, we have an agent update doctype with 2 servers.
+For example, we have an agent update pagetype with 2 servers.
 
 ![](/files/Pasted%20image%2020250516172935.png)
 
diff --git a/docs/Internals/Billing & Subscription.MD b/docs/Internals/Billing & Subscription.MD
index 20fe830f..3036a20a 100644
--- a/docs/Internals/Billing & Subscription.MD	
+++ b/docs/Internals/Billing & Subscription.MD	
@@ -112,7 +112,7 @@ charged. A new invoice will be created for the upcoming month of February.
 
 ## Scheduler Events
 
-### [subscription.create\_usage\_records](http://git.jingrow.com/jingrow/jcloude/blob/master/jcloude/jcloude/doctype/subscription/subscription.py#L109) (hourly_long)
+### [subscription.create\_usage\_records](http://git.jingrow.com/jingrow/jcloude/blob/master/jcloude/jcloude/pagetype/subscription/subscription.py#L109) (hourly_long)
 
 This job runs hourly and creates a Usage Record for every active Subscription.
 It will not create more than one record per day for one Subscription even if it
@@ -124,7 +124,7 @@ Now, for every Usage Record that is created, the amount is updated in the
 corresponding invoice for that month. For e.g., if a Usage Record of $0.32 is
 created in the month of January, the amount will updated in the January invoice.
 
-### [invoice.finalize\_draft\_invoices](http://git.jingrow.com/jingrow/jcloude/blob/master/jcloude/jcloude/doctype/invoice/invoice.py#L541) (Daily at 6pm IST)
+### [invoice.finalize\_draft\_invoices](http://git.jingrow.com/jingrow/jcloude/blob/master/jcloude/jcloude/pagetype/invoice/invoice.py#L541) (Daily at 6pm IST)
 
 This job runs every day at 6pm IST. It will go through every Draft Invoice whose
 period_end date has ended (today or before) and has a total amount greater than
diff --git a/docs/Introduction/Local Setup Troubleshooting.MD b/docs/Introduction/Local Setup Troubleshooting.MD
index 5e7fde14..6f93b226 100644
--- a/docs/Introduction/Local Setup Troubleshooting.MD	
+++ b/docs/Introduction/Local Setup Troubleshooting.MD	
@@ -7,6 +7,6 @@ published: 1
 1. Check if scheduler is enabled (bench doctor)
 1. Ping Agent
 2. Update Agent
-3. Check if TLS Certificate is expired on Server (TLS Certificate doctype)
+3. Check if TLS Certificate is expired on Server (TLS Certificate pagetype)
  - If expired, obtain a new one by calling \_obtain\_certificate
 4. Run install_nginx on Server and Proxy Server
\ No newline at end of file
diff --git a/docs/Introduction/Local Setup Using Cloud.MD b/docs/Introduction/Local Setup Using Cloud.MD
index 84c3b0da..39e96c18 100644
--- a/docs/Introduction/Local Setup Using Cloud.MD	
+++ b/docs/Introduction/Local Setup Using Cloud.MD	
@@ -293,7 +293,7 @@ Now, when you run a _Build and Deploy_, the image that is created for the deploy
 Creating a Free Plan
 --------------------
 
-You should create at least one site plan for the tenants to be able to start using the dashboard and creating sites. Without this, the _Create Site_ wizard will not work as intended. This can be done using the `Site Plan` doctype. Go ahead and create a Free site plan.
+You should create at least one site plan for the tenants to be able to start using the dashboard and creating sites. Without this, the _Create Site_ wizard will not work as intended. This can be done using the `Site Plan` pagetype. Go ahead and create a Free site plan.
 
 
 ![](../files/site-plan-16c3ee4.png)
diff --git a/guide-to-testing.md b/guide-to-testing.md
index 0889615e..45c0abe2 100644
--- a/guide-to-testing.md
+++ b/guide-to-testing.md
@@ -75,7 +75,7 @@ http://git.jingrow.com/jingrow/jcloude/blob/983631ccb59f88e57fd60fdad1615e9abd87
 
 It is also possible to fake multiple jobs in the same context, for when multiple jobs are processed in the same request or job:
 
-http://git.jingrow.com/jingrow/jcloude/blob/983631ccb59f88e57fd60fdad1615e9abd87d99f/jcloude/jcloude/doctype/site_migration/test_site_migration.py#L29-L77
+http://git.jingrow.com/jingrow/jcloude/blob/983631ccb59f88e57fd60fdad1615e9abd87d99f/jcloude/jcloude/pagetype/site_migration/test_site_migration.py#L29-L77
 
 > Note that with this, you can't fake 2 results for the same type of job. This is still a limitation. As a workaround, you can have multiple `with` statements for such cases.
 
@@ -95,9 +95,9 @@ internal things, which forms the basis of testing, which is
 Making test records is also kind of a pain as we have validations all around
 code that will need to be passed every time you create a pg. This is too much
 cognition. Therefore, we can create utility functions (with sensible defaults)
-to make test record of the corresponding Doctype in their own corresponding
+to make test record of the corresponding Pagetype in their own corresponding
 test files (for organization reasons). These functions will be doing the bare
-minimum to make a valid document of that doctype.
+minimum to make a valid document of that pagetype.
 
 Eg: `create_test_bench` in `test_bench.py` can be imported and used whenever
 you need a valid bench (which itself has dependencies on many other doctypes)
@@ -112,7 +112,7 @@ tell what it's trying to test is supposed without even having to read the code.
 Making the method name small is pointless; we're never going to reference this
 method anywhere in code, ever. Eg:
 
-http://git.jingrow.com/jingrow/jcloude/blob/2503e523284fb905eca60acf3271d3fb1dccbc3f/jcloude/jcloude/doctype/site/test_site.py#L215-L228
+http://git.jingrow.com/jingrow/jcloude/blob/2503e523284fb905eca60acf3271d3fb1dccbc3f/jcloude/jcloude/pagetype/site/test_site.py#L215-L228
 
 You can also go the extra mile and write a function docstring. This docstring
 will be shown in the output when the testrunner detects that the test has
@@ -144,7 +144,7 @@ You can mock certain lines while testing a piece of code with the `patch` decora
 from unittest.mock import MagicMock, patch
 
 # this will mock all the jingrow.db.commit calls in server.py while in this test suite
-@patch("jcloude.jcloude.doctype.server.server.jingrow.db.commit", new=MagicMock)
+@patch("jcloude.jcloude.pagetype.server.server.jingrow.db.commit", new=MagicMock)
 class TestBench(FrappeTestCase):
 ```
 
@@ -173,7 +173,7 @@ method.
 > case you want to do asserts on it, you can use the `wraps` kwarg instead of
 > new). Eg:
 
-http://git.jingrow.com/jingrow/jcloude/blob/23711e2799f2d24dfd7bbe2b6cd148f54f4b253b/jcloude/jcloude/doctype/database_server_mariadb_variable/test_database_server_mariadb_variable.py#L138-L155
+http://git.jingrow.com/jingrow/jcloude/blob/23711e2799f2d24dfd7bbe2b6cd148f54f4b253b/jcloude/jcloude/pagetype/database_server_mariadb_variable/test_database_server_mariadb_variable.py#L138-L155
 
 Here, we check what args was Ansible constructor was called with.
 
@@ -201,9 +201,9 @@ control/predict when the background job will run and finish. So, when your code
 involves creating a background job, we can simply mock the call so that it runs
 in foreground instead. There's a utility method you can use to achieve this with ease:
 
-http://git.jingrow.com/jingrow/jcloude/blob/23711e2799f2d24dfd7bbe2b6cd148f54f4b253b/jcloude/jcloude/doctype/database_server_mariadb_variable/test_database_server_mariadb_variable.py#L12
+http://git.jingrow.com/jingrow/jcloude/blob/23711e2799f2d24dfd7bbe2b6cd148f54f4b253b/jcloude/jcloude/pagetype/database_server_mariadb_variable/test_database_server_mariadb_variable.py#L12
 
-http://git.jingrow.com/jingrow/jcloude/blob/23711e2799f2d24dfd7bbe2b6cd148f54f4b253b/jcloude/jcloude/doctype/database_server_mariadb_variable/test_database_server_mariadb_variable.py#L104-L108
+http://git.jingrow.com/jingrow/jcloude/blob/23711e2799f2d24dfd7bbe2b6cd148f54f4b253b/jcloude/jcloude/pagetype/database_server_mariadb_variable/test_database_server_mariadb_variable.py#L104-L108
 
 ## Running tests
 
@@ -216,7 +216,7 @@ bench --site test_site run-tests --app jcloude
 But you'll never have to. That's what CI is for. Instead, you'll mostly want to use:
 
 ```sh
-bench --site test_site run-tests --app jcloude --module jcloude.jcloude.doctype.some_doctype.test_some_doctype
+bench --site test_site run-tests --app jcloude --module jcloude.jcloude.pagetype.some_pagetype.test_some_pagetype
 ```
 
 This is because while writing bugs, your changes will mostly affect that one
@@ -226,7 +226,7 @@ very long to run a module's test by itself anyway. Give your eyes a break while
 You can also run individual test with:
 
 ```sh
-bench --site test_site run-tests --module  jcloude.jcloude.doctype.some_doctype.test_some_doctype --test test_very_specific_thing
+bench --site test_site run-tests --module  jcloude.jcloude.pagetype.some_pagetype.test_some_pagetype --test test_very_specific_thing
 ```
 
 You most likely won't enjoy running commands manually like this. So you'd want
diff --git a/libs/fc_cli/fc/commands/deploy.py b/libs/fc_cli/fc/commands/deploy.py
index ad1f2995..1ef39520 100644
--- a/libs/fc_cli/fc/commands/deploy.py
+++ b/libs/fc_cli/fc/commands/deploy.py
@@ -93,7 +93,7 @@ def drop_bench_group(
 			Print.info(console, "Operation cancelled.")
 			return
 
-		payload = {"doctype": "Release Group", "name": name}
+		payload = {"pagetype": "Release Group", "name": name}
 		delete_url = _build_method_url(session, "jcloude.api.client.delete")
 		response = session.post(
 			delete_url,
diff --git a/libs/fc_cli/fc/commands/server.py b/libs/fc_cli/fc/commands/server.py
index 98f35237..bbd5d09e 100644
--- a/libs/fc_cli/fc/commands/server.py
+++ b/libs/fc_cli/fc/commands/server.py
@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Annotated
 import typer
 from rich.console import Console
 
-from fc.commands.utils import get_doctype, validate_server_name
+from fc.commands.utils import get_pagetype, validate_server_name
 from fc.printer import Print, print_full_plan_details, print_plan_details, show_usage
 
 if TYPE_CHECKING:
@@ -59,8 +59,8 @@ def show_plan(
 	session: CloudSession = ctx.obj
 
 	try:
-		doctype = get_doctype(name)
-		payload = {"name": doctype, "cluster": "Mumbai", "platform": "arm64"}
+		pagetype = get_pagetype(name)
+		payload = {"name": pagetype, "cluster": "Mumbai", "platform": "arm64"}
 
 		plans = session.post(
 			"jcloude.api.server.plans", json=payload, message="[bold green]Fetching available server plans..."
@@ -85,9 +85,9 @@ def server_plan(
 	session: CloudSession = ctx.obj
 
 	try:
-		doctype = get_doctype(name)
+		pagetype = get_pagetype(name)
 		payload = {
-			"doctype": doctype,
+			"pagetype": pagetype,
 			"name": name,
 			"fields": ["current_plan"],
 			"debug": 0,
@@ -96,7 +96,7 @@ def server_plan(
 			"jcloude.api.client.get", json=payload, message="[bold green]Getting server details..."
 		)
 		if not response or "current_plan" not in response:
-			Print.error(console, f"{doctype} '{name}' or its current plan not found.")
+			Print.error(console, f"{pagetype} '{name}' or its current plan not found.")
 			return
 		plan = response["current_plan"]
 		print_full_plan_details(plan, console)
@@ -121,7 +121,7 @@ def increase_storage(
 		return
 
 	try:
-		doctype = get_doctype(name)
+		pagetype = get_pagetype(name)
 
 		if not _should_proceed(
 			f"Increase storage for server '{name}' by {increment} GB? This action may be irreversible.",
@@ -131,7 +131,7 @@ def increase_storage(
 			return
 
 		payload = {
-			"dt": doctype,
+			"dt": pagetype,
 			"dn": name,
 			"method": "increase_disk_size_for_server",
 			"args": {"server": name, "increment": increment},
@@ -169,8 +169,8 @@ def choose_plan(
 	session: CloudSession = ctx.obj
 
 	try:
-		doctype = get_doctype(name)
-		payload = {"name": doctype, "cluster": "Mumbai", "platform": "arm64"}
+		pagetype = get_pagetype(name)
+		payload = {"name": pagetype, "cluster": "Mumbai", "platform": "arm64"}
 		plans = session.post(
 			"jcloude.api.server.plans", json=payload, message="[bold green]Fetching available server plans..."
 		)
@@ -180,7 +180,7 @@ def choose_plan(
 			Print.error(console, f"Plan '{plan}' not found for server '{name}'")
 			return
 
-		current_plan_name = _get_current_plan_name(session, doctype, name)
+		current_plan_name = _get_current_plan_name(session, pagetype, name)
 
 		if current_plan_name and current_plan_name == selected_plan.get("name"):
 			Print.info(
@@ -197,7 +197,7 @@ def choose_plan(
 			return
 
 		change_payload = {
-			"dt": doctype,
+			"dt": pagetype,
 			"dn": name,
 			"method": "change_plan",
 			"args": {"plan": selected_plan.get("name")},
@@ -310,11 +310,11 @@ def _should_proceed(message: str, confirm_token: str | None) -> bool:
 	return typer.confirm(message, default=False)
 
 
-def _get_current_plan_name(session: "CloudSession", doctype: str, name: str) -> str | None:
+def _get_current_plan_name(session: "CloudSession", pagetype: str, name: str) -> str | None:
 	resp = session.post(
 		"jcloude.api.client.get",
 		json={
-			"doctype": doctype,
+			"pagetype": pagetype,
 			"name": name,
 			"fields": ["current_plan"],
 			"debug": 0,
diff --git a/libs/fc_cli/fc/commands/utils.py b/libs/fc_cli/fc/commands/utils.py
index 82da5345..117a256a 100644
--- a/libs/fc_cli/fc/commands/utils.py
+++ b/libs/fc_cli/fc/commands/utils.py
@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 
-def get_doctype(name: str) -> str:
-	"""Infer doctype from a server name."""
+def get_pagetype(name: str) -> str:
+	"""Infer pagetype from a server name."""
 	return "Server" if name and name.startswith("f") else "Database Server"
 
 
diff --git a/libs/fc_cli/fc/models.py b/libs/fc_cli/fc/models.py
index 17b68939..9ec015d8 100644
--- a/libs/fc_cli/fc/models.py
+++ b/libs/fc_cli/fc/models.py
@@ -2,7 +2,7 @@ from typing import TypedDict
 
 
 class ClientList(TypedDict):
-	doctype: str
+	pagetype: str
 	filters: dict[str, str]
 	fields: list[str]
 	start: int
@@ -13,7 +13,7 @@ class ClientList(TypedDict):
 
 
 class ClientGet(TypedDict):
-	doctype: str
+	pagetype: str
 	name: str
 
 
diff --git a/libs/fcrestore/requests.go b/libs/fcrestore/requests.go
index 65f27009..076285ae 100644
--- a/libs/fcrestore/requests.go
+++ b/libs/fcrestore/requests.go
@@ -397,7 +397,7 @@ func (s *Session) IsLoggedIn() bool {
 
 func (s *Session) FetchSites() ([]string, error) {
 	resp, err := s.SendRequest("jcloude.api.client.get_list", map[string]any{
-		"doctype":           "Site",
+		"pagetype":           "Site",
 		"fields":            []string{"name"},
 		"filters":           map[string]any{},
 		"order_by":          "creation desc",
diff --git a/press/access/__init__.py b/press/access/__init__.py
index ef012ce4..68a08c07 100644
--- a/press/access/__init__.py
+++ b/press/access/__init__.py
@@ -27,20 +27,20 @@ def dashboard_access_rules(data: jingrow._dict):
 		return data
 
 	# Casting to string to avoid issues with `None`
-	doctype, docname = str(data.doctype), str(data.name)
+	pagetype, docname = str(data.pagetype), str(data.name)
 
-	actions = ACTIONS_RULES.get(doctype, {})
-	actions_maps = ACTION_DF_MAP.get(doctype, {})
+	actions = ACTIONS_RULES.get(pagetype, {})
+	actions_maps = ACTION_DF_MAP.get(pagetype, {})
 	for rule, value in actions.items():
 		data.actions_access[rule] = value
 		if rule in actions_maps:
-			data.actions_access[rule] = has_support_access(doctype, docname, rule)
+			data.actions_access[rule] = has_support_access(pagetype, docname, rule)
 
-	tabs = TABS_RULES.get(doctype, {})
-	tabs_maps = TAB_DF_MAP.get(doctype, {})
+	tabs = TABS_RULES.get(pagetype, {})
+	tabs_maps = TAB_DF_MAP.get(pagetype, {})
 	for rule, value in tabs.items():
 		data.tabs_access[rule] = value
 		if rule in tabs_maps:
-			data.tabs_access[rule] = has_support_access(doctype, docname, rule)
+			data.tabs_access[rule] = has_support_access(pagetype, docname, rule)
 
 	return data
diff --git a/press/access/decorators.py b/press/access/decorators.py
index bbfc117e..6ee2e067 100644
--- a/press/access/decorators.py
+++ b/press/access/decorators.py
@@ -33,11 +33,11 @@ def action_guard(action: str):
 			if instance_team and instance_team == current_team:
 				return fn(instance, *args, **kwargs)
 
-			if has_support_access(instance.doctype, instance.name, action):
+			if has_support_access(instance.pagetype, instance.name, action):
 				return fn(instance, *args, **kwargs)
 
-			doctype_rules = ACTIONS_RULES.get(instance.doctype, {})
-			action_allowed = doctype_rules.get(action, True)
+			pagetype_rules = ACTIONS_RULES.get(instance.pagetype, {})
+			action_allowed = pagetype_rules.get(action, True)
 			if not action_allowed:
 				throw_err()
 
diff --git a/press/access/support_access.py b/press/access/support_access.py
index c05ef8e7..3cf15f82 100644
--- a/press/access/support_access.py
+++ b/press/access/support_access.py
@@ -21,17 +21,17 @@ ACTION_DF_MAP = {
 }
 
 
-def get_extra_field(doctype: str, perm: str | None) -> str | None:
+def get_extra_field(pagetype: str, perm: str | None) -> str | None:
 	if not perm:
 		return None
-	if field := TAB_DF_MAP.get(doctype, {}).get(perm):
+	if field := TAB_DF_MAP.get(pagetype, {}).get(perm):
 		return field
-	if field := ACTION_DF_MAP.get(doctype, {}).get(perm):
+	if field := ACTION_DF_MAP.get(pagetype, {}).get(perm):
 		return field
 	return None
 
 
-def has_support_access(doctype: str, docname: str, action: str | None = None) -> bool:
+def has_support_access(pagetype: str, docname: str, action: str | None = None) -> bool:
 	"""
 	Checks if current team has support access to given document.
 	"""
@@ -42,7 +42,7 @@ def has_support_access(doctype: str, docname: str, action: str | None = None) ->
 	if not jcloude_utils.has_role("Jcloude Support Agent"):
 		return False
 
-	if access_utils.is_public_resource(doctype, docname):
+	if access_utils.is_public_resource(pagetype, docname):
 		return True
 
 	filters = {
@@ -50,7 +50,7 @@ def has_support_access(doctype: str, docname: str, action: str | None = None) ->
 		"access_allowed_till": (">", jingrow.utils.now_datetime()),
 	}
 
-	if field := get_extra_field(doctype, action):
+	if field := get_extra_field(pagetype, action):
 		filters[field] = 1
 
 	accesses = jingrow.get_all("Support Access", filters=filters, pluck="name")
@@ -60,7 +60,7 @@ def has_support_access(doctype: str, docname: str, action: str | None = None) ->
 			"Support Access Resource",
 			{
 				"parent": access,
-				"document_type": doctype,
+				"document_type": pagetype,
 				"document_name": docname,
 			},
 		):
diff --git a/press/access/utils.py b/press/access/utils.py
index 26fe6410..6e9c3adf 100644
--- a/press/access/utils.py
+++ b/press/access/utils.py
@@ -1,15 +1,15 @@
 import jingrow
 
 
-def is_public_resource(doctype: str, docname: str) -> bool:
+def is_public_resource(pagetype: str, docname: str) -> bool:
 	def bench(bench: str):
 		release_group = jingrow.get_value("Bench", bench, "group")
 		return jingrow.get_value("Release Group", release_group, "public")
 
-	if doctype == "Bench":
+	if pagetype == "Bench":
 		return bench(docname)
 
-	if not jingrow.get_meta(doctype).has_field("public"):
+	if not jingrow.get_meta(pagetype).has_field("public"):
 		return False
 
-	return bool(jingrow.get_value(doctype, docname, "public"))
+	return bool(jingrow.get_value(pagetype, docname, "public"))
diff --git a/press/agent.py b/press/agent.py
index 71998143..c0e9ed29 100644
--- a/press/agent.py
+++ b/press/agent.py
@@ -26,15 +26,15 @@ from jcloude.utils import (
 if TYPE_CHECKING:
 	from io import BufferedReader
 
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.app_patch.app_patch import AgentPatchConfig, AppPatch
-	from jcloude.jcloude.doctype.bench.bench import Bench
-	from jcloude.jcloude.doctype.database_server.database_server import DatabaseServer
-	from jcloude.jcloude.doctype.physical_backup_restoration.physical_backup_restoration import (
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.app_patch.app_patch import AgentPatchConfig, AppPatch
+	from jcloude.jcloude.pagetype.bench.bench import Bench
+	from jcloude.jcloude.pagetype.database_server.database_server import DatabaseServer
+	from jcloude.jcloude.pagetype.physical_backup_restoration.physical_backup_restoration import (
 		PhysicalBackupRestoration,
 	)
-	from jcloude.jcloude.doctype.site.site import Site
-	from jcloude.jcloude.doctype.site_backup.site_backup import SiteBackup
+	from jcloude.jcloude.pagetype.site.site import Site
+	from jcloude.jcloude.pagetype.site_backup.site_backup import SiteBackup
 
 
 APPS_LIST_REGEX = re.compile(r"\[.*\]")
@@ -255,7 +255,7 @@ class Agent:
 		def sanitized_site_config(site):
 			sanitized_config = {}
 			if site.remote_config_file:
-				from jcloude.jcloude.doctype.site_activity.site_activity import log_site_activity
+				from jcloude.jcloude.pagetype.site_activity.site_activity import log_site_activity
 
 				site_config = jingrow.get_pg("Remote File", site.remote_config_file)
 				new_config = site_config.get_content()
@@ -347,23 +347,23 @@ class Agent:
 			site=site.name,
 		)
 
-	def activate_site(self, site, reference_doctype=None, reference_name=None):
+	def activate_site(self, site, reference_pagetype=None, reference_name=None):
 		return self.create_agent_job(
 			"Activate Site",
 			f"benches/{site.bench}/sites/{site.name}/activate",
 			bench=site.bench,
 			site=site.name,
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
-	def deactivate_site(self, site, reference_doctype=None, reference_name=None):
+	def deactivate_site(self, site, reference_pagetype=None, reference_name=None):
 		return self.create_agent_job(
 			"Deactivate Site",
 			f"benches/{site.bench}/sites/{site.name}/deactivate",
 			bench=site.bench,
 			site=site.name,
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
@@ -527,11 +527,11 @@ class Agent:
 			bench=site.bench,
 			site=site.name,
 			reference_name=backup_restoration.name,
-			reference_doctype=backup_restoration.doctype,
+			reference_pagetype=backup_restoration.pagetype,
 		)
 
 	def backup_site(self, site, site_backup: SiteBackup):
-		from jcloude.jcloude.doctype.site_backup.site_backup import get_backup_bucket
+		from jcloude.jcloude.pagetype.site_backup.site_backup import get_backup_bucket
 
 		data = {"with_files": site_backup.with_files}
 
@@ -658,9 +658,9 @@ class Agent:
 		_server = jingrow.get_pg("Server", server)
 		ip = _server.ip if _server.is_self_hosted else _server.private_ip
 		data = {"name": site if site else code_server}
-		doctype = "Site" if site else "Code Server"
+		pagetype = "Site" if site else "Code Server"
 		return self.create_agent_job(
-			f"Add {doctype} to Upstream",
+			f"Add {pagetype} to Upstream",
 			f"proxy/upstreams/{ip}/sites",
 			data,
 			site=site,
@@ -683,7 +683,7 @@ class Agent:
 	def remove_upstream_file(self, server, site=None, site_name=None, code_server=None):
 		_server = jingrow.get_pg("Server", server)
 		ip = _server.ip if _server.is_self_hosted else _server.private_ip
-		doctype = "Site" if site else "Code Server"
+		pagetype = "Site" if site else "Code Server"
 		file_name = site_name or site if (site or site_name) else code_server
 		extra_domains = jingrow.get_all(
 			"Site Domain",
@@ -692,7 +692,7 @@ class Agent:
 		)
 		data = {"extra_domains": extra_domains}
 		return self.create_agent_job(
-			f"Remove {doctype} from Upstream",
+			f"Remove {pagetype} from Upstream",
 			f"proxy/upstreams/{ip}/sites/{file_name}",
 			method="DELETE",
 			site=site,
@@ -761,7 +761,7 @@ class Agent:
 		password: str,
 		max_connections: int,
 		database_server,
-		reference_doctype=None,
+		reference_pagetype=None,
 		reference_name=None,
 	):
 		data = {
@@ -777,7 +777,7 @@ class Agent:
 			data,
 			site=site.name,
 			reference_name=reference_name,
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 		)
 
 	def add_proxysql_backend(self, database_server):
@@ -786,13 +786,13 @@ class Agent:
 		}
 		return self.create_agent_job("Add Backend to ProxySQL", "proxysql/backends", data)
 
-	def remove_proxysql_user(self, site, username, reference_doctype=None, reference_name=None):
+	def remove_proxysql_user(self, site, username, reference_pagetype=None, reference_name=None):
 		return self.create_agent_job(
 			"Remove User from ProxySQL",
 			f"proxysql/users/{username}",
 			method="DELETE",
 			site=site.name,
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
@@ -830,7 +830,7 @@ class Agent:
 			f"benches/{site.bench}/sites/{site.name}/database/users",
 			data,
 			site=site.name,
-			reference_doctype="Site Database User",
+			reference_pagetype="Site Database User",
 			reference_name=reference_name,
 		)
 
@@ -847,7 +847,7 @@ class Agent:
 			method="DELETE",
 			data=data,
 			site=site.name,
-			reference_doctype="Site Database User",
+			reference_pagetype="Site Database User",
 			reference_name=reference_name,
 		)
 
@@ -866,7 +866,7 @@ class Agent:
 			method="POST",
 			data=data,
 			site=site.name,
-			reference_doctype="Site Database User",
+			reference_pagetype="Site Database User",
 			reference_name=reference_name,
 		)
 
@@ -1049,7 +1049,7 @@ Response: {reason or getattr(result, "text", "Unknown")}
 		code_server=None,
 		upstream=None,
 		host=None,
-		reference_doctype=None,
+		reference_pagetype=None,
 		reference_name=None,
 	):
 		"""
@@ -1071,7 +1071,7 @@ Response: {reason or getattr(result, "text", "Unknown")}
 
 		job: "AgentJob" = jingrow.get_pg(
 			{
-				"doctype": "Agent Job",
+				"pagetype": "Agent Job",
 				"server_type": self.server_type,
 				"server": self.server,
 				"bench": bench,
@@ -1085,7 +1085,7 @@ Response: {reason or getattr(result, "text", "Unknown")}
 				"request_data": json.dumps(data or {}, indent=4, sort_keys=True),
 				"request_files": json.dumps(files or {}, indent=4, sort_keys=True),
 				"job_type": job_type,
-				"reference_doctype": reference_doctype,
+				"reference_pagetype": reference_pagetype,
 				"reference_name": reference_name,
 			}
 		).insert()
@@ -1168,15 +1168,15 @@ Response: {reason or getattr(result, "text", "Unknown")}
 	def get_sites_analytics(self, bench):
 		return self.get(f"benches/{bench.name}/analytics")
 
-	def describe_database_table(self, site, doctype, columns):
-		data = {"doctype": doctype, "columns": list(columns)}
+	def describe_database_table(self, site, pagetype, columns):
+		data = {"pagetype": pagetype, "columns": list(columns)}
 		return self.post(
 			f"benches/{site.bench}/sites/{site.name}/describe-database-table",
 			data=data,
 		)["data"]
 
-	def add_database_index(self, site, doctype, columns):
-		data = {"doctype": doctype, "columns": list(columns)}
+	def add_database_index(self, site, pagetype, columns):
+		data = {"pagetype": pagetype, "columns": list(columns)}
 		return self.create_agent_job(
 			"Add Database Index",
 			f"benches/{site.bench}/sites/{site.name}/add-database-index",
@@ -1266,7 +1266,7 @@ Response: {reason or getattr(result, "text", "Unknown")}
 			f"benches/{bench}/patch/{app}",
 			bench=bench,
 			data=data,
-			reference_doctype="App Patch",
+			reference_pagetype="App Patch",
 			reference_name=app_patch.name,
 		)
 
@@ -1286,7 +1286,7 @@ Response: {reason or getattr(result, "text", "Unknown")}
 			"Run Remote Builder",
 			"builder/build",
 			data=data,
-			reference_doctype="Deploy Candidate Build",
+			reference_pagetype="Deploy Candidate Build",
 			reference_name=reference_name,
 		)
 
@@ -1347,7 +1347,7 @@ Response: {reason or getattr(result, "text", "Unknown")}
 				"include_table_size": include_table_size,
 				"include_index_info": include_index_info,
 			},
-			reference_doctype="Site",
+			reference_pagetype="Site",
 			reference_name=site.name,
 		)
 
@@ -1412,7 +1412,7 @@ Response: {reason or getattr(result, "text", "Unknown")}
 					"Database Server", self.server, "mariadb_root_password"
 				),
 			},
-			reference_doctype=self.server_type,
+			reference_pagetype=self.server_type,
 			reference_name=self.server,
 		)
 
@@ -1432,7 +1432,7 @@ Response: {reason or getattr(result, "text", "Unknown")}
 	def fetch_binlog_list(self):
 		return self.get("database/binlogs/list")
 
-	def pull_docker_images(self, image_tags: list[str], reference_doctype=None, reference_name=None):
+	def pull_docker_images(self, image_tags: list[str], reference_pagetype=None, reference_name=None):
 		settings = jingrow.db.get_value(
 			"Jcloude Settings",
 			None,
@@ -1450,12 +1450,12 @@ Response: {reason or getattr(result, "text", "Unknown")}
 					"password": settings.docker_registry_password,
 				},
 			},
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
 	def push_docker_images(
-		self, images: list[str], reference_doctype: str | None = None, reference_name: str | None = None
+		self, images: list[str], reference_pagetype: str | None = None, reference_name: str | None = None
 	) -> AgentJob:
 		settings = jingrow.db.get_value(
 			"Jcloude Settings",
@@ -1474,12 +1474,12 @@ Response: {reason or getattr(result, "text", "Unknown")}
 					"password": settings.docker_registry_password,
 				},
 			},
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
 	def upload_binlogs_to_s3(self, binlogs: list[str]):
-		from jcloude.jcloude.doctype.site_backup.site_backup import get_backup_bucket
+		from jcloude.jcloude.pagetype.site_backup.site_backup import get_backup_bucket
 
 		if self.server_type != "Database Server":
 			return NotImplementedError("Only Database Server supports this method")
@@ -1657,12 +1657,12 @@ Response: {reason or getattr(result, "text", "Unknown")}
 		)
 
 	# Snapshot Recovery Related Methods
-	def search_sites_in_snapshot(self, sites: list[str], reference_doctype=None, reference_name=None):
+	def search_sites_in_snapshot(self, sites: list[str], reference_pagetype=None, reference_name=None):
 		return self.create_agent_job(
 			"Search Sites In Snapshot",
 			"/snapshot_recovery/search_sites",
 			data={"sites": sites},
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
@@ -1672,10 +1672,10 @@ Response: {reason or getattr(result, "text", "Unknown")}
 		site: str,
 		database_name: str,
 		database_server: str,
-		reference_doctype=None,
+		reference_pagetype=None,
 		reference_name=None,
 	):
-		from jcloude.jcloude.doctype.site_backup.site_backup import get_backup_bucket
+		from jcloude.jcloude.pagetype.site_backup.site_backup import get_backup_bucket
 
 		database_server_pg: DatabaseServer = jingrow.get_pg("Database Server", database_server)  # type: ignore
 		data = {
@@ -1706,7 +1706,7 @@ Response: {reason or getattr(result, "text", "Unknown")}
 			"Backup Database From Snapshot",
 			"/snapshot_recovery/backup_database",
 			data=data,
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
@@ -1715,10 +1715,10 @@ Response: {reason or getattr(result, "text", "Unknown")}
 		cluster: str,
 		site: str,
 		bench: str,
-		reference_doctype=None,
+		reference_pagetype=None,
 		reference_name=None,
 	):
-		from jcloude.jcloude.doctype.site_backup.site_backup import get_backup_bucket
+		from jcloude.jcloude.pagetype.site_backup.site_backup import get_backup_bucket
 
 		data: dict[str, Any] = {
 			"site": site,
@@ -1744,12 +1744,12 @@ Response: {reason or getattr(result, "text", "Unknown")}
 			"Backup Files From Snapshot",
 			"/snapshot_recovery/backup_files",
 			data=data,
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
 	def update_database_host_in_all_benches(
-		self, db_host: str, reference_doctype: str | None = None, reference_name: str | None = None
+		self, db_host: str, reference_pagetype: str | None = None, reference_name: str | None = None
 	):
 		return self.create_agent_job(
 			"Update Database Host",
@@ -1757,7 +1757,7 @@ Response: {reason or getattr(result, "text", "Unknown")}
 			data={
 				"db_host": db_host,
 			},
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
@@ -1769,7 +1769,7 @@ Response: {reason or getattr(result, "text", "Unknown")}
 		restart_benches: bool,
 		reference_name: str | None = None,
 		redis_connection_string_ip: str | None = None,
-		reference_doctype: str | None = None,
+		reference_pagetype: str | None = None,
 		registry_settings: dict | None = None,
 	) -> AgentJob:
 		return self.create_agent_job(
@@ -1783,14 +1783,14 @@ Response: {reason or getattr(result, "text", "Unknown")}
 				"secondary_server_private_ip": secondary_server_private_ip,
 				"registry_settings": registry_settings,
 			},
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
 	def add_servers_to_acl(
 		self,
 		secondary_server_private_ip: str,
-		reference_doctype: str | None = None,
+		reference_pagetype: str | None = None,
 		reference_name: str | None = None,
 	) -> AgentJob:
 		return self.create_agent_job(
@@ -1799,14 +1799,14 @@ Response: {reason or getattr(result, "text", "Unknown")}
 			data={
 				"secondary_server_private_ip": secondary_server_private_ip,
 			},
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
 	def remove_servers_from_acl(
 		self,
 		secondary_server_private_ip: str,
-		reference_doctype: str | None = None,
+		reference_pagetype: str | None = None,
 		reference_name: str | None = None,
 	) -> AgentJob:
 		return self.create_agent_job(
@@ -1815,47 +1815,47 @@ Response: {reason or getattr(result, "text", "Unknown")}
 			data={
 				"secondary_server_private_ip": secondary_server_private_ip,
 			},
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
 	def stop_bench_workers(
-		self, reference_doctype: str | None = None, reference_name: str | None = None
+		self, reference_pagetype: str | None = None, reference_name: str | None = None
 	) -> AgentJob:
 		return self.create_agent_job(
 			"Stop Bench Workers",
 			"/server/stop-bench-workers",
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
 	def start_bench_workers(
-		self, reference_doctype: str | None = None, reference_name: str | None = None
+		self, reference_pagetype: str | None = None, reference_name: str | None = None
 	) -> AgentJob:
 		return self.create_agent_job(
 			"Start Bench Workers",
 			"/server/start-bench-workers",
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
 	def remove_redis_localhost_bind(
-		self, reference_doctype: str | None = None, reference_name: str | None = None
+		self, reference_pagetype: str | None = None, reference_name: str | None = None
 	) -> AgentJob:
 		return self.create_agent_job(
 			"Remove Redis Localhost Bind",
 			"/server/remove-localhost-redis-bind",
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
 	def force_remove_all_benches(
-		self, reference_doctype: str | None = None, reference_name: str | None = None
+		self, reference_pagetype: str | None = None, reference_name: str | None = None
 	) -> AgentJob:
 		return self.create_agent_job(
 			"Force Remove All Benches",
 			"/server/force-remove-all-benches",
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
diff --git a/press/api/__init__.py b/press/api/__init__.py
index 346e736c..63d31a8d 100644
--- a/press/api/__init__.py
+++ b/press/api/__init__.py
@@ -16,7 +16,7 @@ def script_2():
 
 @jingrow.whitelist(allow_guest=True)
 def handle_suspended_site_redirection():
-	from jcloude.saas.doctype.product_trial_request.product_trial_request import (
+	from jcloude.saas.pagetype.product_trial_request.product_trial_request import (
 		get_app_trial_page_url,
 	)
 
diff --git a/press/api/access.py b/press/api/access.py
index c02be9b1..f0ca01a4 100644
--- a/press/api/access.py
+++ b/press/api/access.py
@@ -9,13 +9,13 @@ from jcloude.access import support_access
 @jingrow.whitelist()
 @caching.redis_cache(ttl=60, user=True)
 @typing_validations.validate_argument_types
-def status(doctype: str, docname: str):
-	if not support_access.has_support_access(doctype, docname):
+def status(pagetype: str, docname: str):
+	if not support_access.has_support_access(pagetype, docname):
 		message = _("You do not have support access to this document.")
 		jingrow.throw(message, jingrow.PermissionError)
 
-	AccessRequest = jingrow.qb.DocType("Support Access")
-	AccessRequestResource = jingrow.qb.DocType("Support Access Resource")
+	AccessRequest = jingrow.qb.PageType("Support Access")
+	AccessRequestResource = jingrow.qb.PageType("Support Access Resource")
 
 	query = (
 		jingrow.qb.from_(AccessRequest)
@@ -23,7 +23,7 @@ def status(doctype: str, docname: str):
 		.on(AccessRequest.name == AccessRequestResource.parent)
 		.select(AccessRequest.star)
 		.where(AccessRequest.status == "Accepted")
-		.where(AccessRequestResource.document_type == doctype)
+		.where(AccessRequestResource.document_type == pagetype)
 		.where(AccessRequestResource.document_name == docname)
 		.where(AccessRequest.access_allowed_till > jingrow.utils.now_datetime())
 		.orderby(AccessRequest.access_allowed_till, order=jingrow.qb.desc)
@@ -48,7 +48,7 @@ def status(doctype: str, docname: str):
 		}
 
 	def get_permissions() -> list[str]:
-		match doctype:
+		match pagetype:
 			case "Site":
 				return ["site_domains", "login_as_administrator", "site_release_group", "bench_ssh"]
 			case "Release Group":
diff --git a/press/api/account.py b/press/api/account.py
index 21055475..30c8596f 100644
--- a/press/api/account.py
+++ b/press/api/account.py
@@ -10,7 +10,7 @@ import jingrow
 import jingrow.utils
 import pyotp
 from jingrow import _
-from jingrow.core.doctype.user.user import update_password
+from jingrow.core.pagetype.user.user import update_password
 from jingrow.core.utils import find
 from jingrow.exceptions import DoesNotExistError
 from jingrow.query_builder.custom import GROUP_CONCAT
@@ -24,7 +24,7 @@ from pypika.terms import ValueWrapper
 
 from jcloude.api.site import protected
 from jcloude.guards import mfa
-from jcloude.jcloude.doctype.team.team import (
+from jcloude.jcloude.pagetype.team.team import (
 	Team,
 	get_child_team_members,
 	get_team_members,
@@ -33,7 +33,7 @@ from jcloude.utils import get_country_info, get_current_team, is_user_part_of_te
 from jcloude.utils.telemetry import capture
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.account_request.account_request import AccountRequest
+	from jcloude.jcloude.pagetype.account_request.account_request import AccountRequest
 
 
 @jingrow.whitelist(allow_guest=True)
@@ -59,7 +59,7 @@ def signup(email: str, product: str | None = None, referrer: str | None = None)
 	if not account_request:
 		account_request_pg = jingrow.get_pg(
 			{
-				"doctype": "Account Request",
+				"pagetype": "Account Request",
 				"email": email,
 				"role": "Jcloude Admin",
 				"referrer_id": referrer,
@@ -347,7 +347,7 @@ def enable_account():
 @jingrow.whitelist()
 def request_team_deletion():
 	team = get_current_team(get_pg=True)
-	pg = jingrow.get_pg({"doctype": "Team Deletion Request", "team": team.name}).insert()
+	pg = jingrow.get_pg({"pagetype": "Team Deletion Request", "team": team.name}).insert()
 	return pg.name
 
 
@@ -482,7 +482,7 @@ def _get():
 
 	teams = []
 	if parent_teams:
-		Team = jingrow.qb.DocType("Team")
+		Team = jingrow.qb.PageType("Team")
 		teams = (
 			jingrow.qb.from_(Team)
 			.select(Team.name, Team.team_title, Team.user)
@@ -552,12 +552,12 @@ def get_permissions():
 
 
 @jingrow.whitelist()
-def has_method_permission(doctype, docname, method) -> bool:
-	from jcloude.jcloude.doctype.jcloude_permission_group.jcloude_permission_group import (
+def has_method_permission(pagetype, docname, method) -> bool:
+	from jcloude.jcloude.pagetype.jcloude_permission_group.jcloude_permission_group import (
 		has_method_permission,
 	)
 
-	return has_method_permission(doctype, docname, method)
+	return has_method_permission(pagetype, docname, method)
 
 
 @jingrow.whitelist(allow_guest=True)
@@ -612,7 +612,7 @@ def create_child_team(title):
 
 	pg = jingrow.get_pg(
 		{
-			"doctype": "Team",
+			"pagetype": "Team",
 			"team_title": team,
 			"user": current_team.user,
 			"parent_team": current_team.name,
@@ -634,7 +634,7 @@ def new_team(email, current_team):
 
 	jingrow.get_pg(
 		{
-			"doctype": "Account Request",
+			"pagetype": "Account Request",
 			"email": email,
 			"role": "Jcloude Member",
 			"send_email": True,
@@ -678,8 +678,8 @@ def update_profile_picture():
 	user = jingrow.session.user
 	_file = jingrow.get_pg(
 		{
-			"doctype": "File",
-			"attached_to_doctype": "User",
+			"pagetype": "File",
+			"attached_to_pagetype": "User",
 			"attached_to_name": user,
 			"attached_to_field": "user_image",
 			"folder": "Home/Attachments",
@@ -855,7 +855,7 @@ def update_billing_information(billing_details):
 		log_error(
 			"Billing update failing",
 			data=ex,
-			reference_doctype="Team",
+			reference_pagetype="Team",
 		)
 
 
@@ -995,7 +995,7 @@ def update_emails(data):
 
 @jingrow.whitelist()
 def add_key(key):
-	jingrow.get_pg({"doctype": "User SSH Key", "user": jingrow.session.user, "ssh_public_key": key}).insert()
+	jingrow.get_pg({"pagetype": "User SSH Key", "user": jingrow.session.user, "ssh_public_key": key}).insert()
 
 
 @jingrow.whitelist()
@@ -1032,19 +1032,19 @@ def fuse_list():
 	team = get_current_team(get_pg=True)
 	query = f"""
 		SELECT
-			'Site' as doctype, name as title, name as route
+			'Site' as pagetype, name as title, name as route
 		FROM
 			`tabSite`
 		WHERE
 			team = '{team.name}' AND status NOT IN ('Archived')
 		UNION ALL
-		SELECT 'Bench' as doctype, title as title, name as route
+		SELECT 'Bench' as pagetype, title as title, name as route
 		FROM
 			`tabRelease Group`
 		WHERE
 			team = '{team.name}' AND enabled = 1
 		UNION ALL
-		SELECT 'Server' as doctype, name as title, name as route
+		SELECT 'Server' as pagetype, name as title, name as route
 		FROM
 			`tabServer`
 		WHERE
@@ -1058,18 +1058,18 @@ def fuse_list():
 @jingrow.whitelist()
 def get_permission_options(name, ptype):
 	"""
-	[{'doctype': 'Site', 'name': 'ccc.jingrow.cloud', title: '', 'perms': 'jcloude.api.site.get'}, ...]
+	[{'pagetype': 'Site', 'name': 'ccc.jingrow.cloud', title: '', 'perms': 'jcloude.api.site.get'}, ...]
 	"""
-	from jcloude.jcloude.doctype.jcloude_method_permission.jcloude_method_permission import (
+	from jcloude.jcloude.pagetype.jcloude_method_permission.jcloude_method_permission import (
 		available_actions,
 	)
 
 	doctypes = jingrow.get_all("Jcloude Method Permission", pluck="document_type", distinct=True)
 
 	options = []
-	for doctype in doctypes:
-		pg = jingrow.qb.DocType(doctype)
-		perm_pg = jingrow.qb.DocType("Jcloude User Permission")
+	for pagetype in doctypes:
+		pg = jingrow.qb.PageType(pagetype)
+		perm_pg = jingrow.qb.PageType("Jcloude User Permission")
 		subtable = (
 			jingrow.qb.from_(perm_pg)
 			.select("*")
@@ -1081,14 +1081,14 @@ def get_permission_options(name, ptype):
 			.left_join(subtable)
 			.on(pg.name == subtable.document_name)
 			.select(
-				ValueWrapper(doctype, alias="doctype"),
+				ValueWrapper(pagetype, alias="pagetype"),
 				pg.name,
-				pg.title if doctype != "Site" else None,
+				pg.title if pagetype != "Site" else None,
 				GROUP_CONCAT(subtable.action, alias="perms"),
 			)
 			.where(
 				(pg.team == get_current_team())
-				& ((pg.enabled == 1) if doctype == "Release Group" else (pg.status != "Archived"))
+				& ((pg.enabled == 1) if pagetype == "Release Group" else (pg.status != "Archived"))
 			)
 			.groupby(pg.name)
 		)
@@ -1102,7 +1102,7 @@ def update_permissions(user, ptype, updated):
 	values = []
 	drop = []
 
-	for doctype, docs in updated.items():
+	for pagetype, docs in updated.items():
 		for pg, updated_perms in docs.items():
 			ptype_cap = ptype.capitalize()
 			old_perms = jingrow.get_all(
@@ -1110,14 +1110,14 @@ def update_permissions(user, ptype, updated):
 				filters={
 					"type": ptype_cap,
 					ptype: user,
-					"document_type": doctype,
+					"document_type": pagetype,
 					"document_name": pg,
 				},
 				pluck="action",
 			)
 			# perms to insert
 			add = set(updated_perms).difference(set(old_perms))
-			values += [(jingrow.generate_hash(4), ptype_cap, doctype, pg, user, a) for a in add]
+			values += [(jingrow.generate_hash(4), ptype_cap, pagetype, pg, user, a) for a in add]
 
 			# perms to remove
 			remove = set(old_perms).difference(set(updated_perms))
@@ -1126,7 +1126,7 @@ def update_permissions(user, ptype, updated):
 				filters={
 					"type": ptype_cap,
 					ptype: user,
-					"document_type": doctype,
+					"document_type": pagetype,
 					"document_name": pg,
 					"action": ("in", remove),
 				},
@@ -1161,7 +1161,7 @@ def permission_group_users(name):
 @jingrow.whitelist()
 def add_permission_group(title):
 	pg = jingrow.get_pg(
-		{"doctype": "Jcloude Permission Group", "team": get_current_team(), "title": title}
+		{"pagetype": "Jcloude Permission Group", "team": get_current_team(), "title": title}
 	).insert(ignore_permissions=True)
 	return {"name": pg.name, "title": pg.title}
 
@@ -1194,8 +1194,8 @@ def remove_permission_group_user(name, user):
 
 @jingrow.whitelist()
 def get_permission_roles():
-	PressRole = jingrow.qb.DocType("Jcloude Role")
-	PressRoleUser = jingrow.qb.DocType("Jcloude Role User")
+	PressRole = jingrow.qb.PageType("Jcloude Role")
+	PressRoleUser = jingrow.qb.PageType("Jcloude Role User")
 
 	return (
 		jingrow.qb.from_(PressRole)
@@ -1261,7 +1261,7 @@ def get_2fa_qr_code_url():
 		user_totp_secret = pyotp.random_base32()
 		jingrow.get_pg(
 			{
-				"doctype": "User 2FA",
+				"pagetype": "User 2FA",
 				"user": jingrow.session.user,
 				"totp_secret": user_totp_secret,
 			}
@@ -1303,7 +1303,7 @@ def enable_2fa(totp_code):
 		log_error(
 			"2FA Enable: Failed clearing other sessions",
 			data=e,
-			reference_doctype="User 2FA",
+			reference_pagetype="User 2FA",
 			reference_name=two_fa.name,
 		)
 
@@ -1437,7 +1437,7 @@ def get_user_banners():
 	sites = list(set([pair["name"] for pair in site_server_pairs]))
 	servers = list(set([pair["server"] for pair in site_server_pairs if pair.get("server")]))
 
-	DashboardBanner = jingrow.qb.DocType("Dashboard Banner")
+	DashboardBanner = jingrow.qb.PageType("Dashboard Banner")
 	now = jingrow.utils.now()
 
 	# fetch all enabled banners for this user
diff --git a/press/api/analytics.py b/press/api/analytics.py
index 37fe3688..4f5efeb2 100644
--- a/press/api/analytics.py
+++ b/press/api/analytics.py
@@ -27,7 +27,7 @@ from pytz import timezone as pytz_timezone
 from jcloude.agent import Agent
 from jcloude.api.site import protected
 from jcloude.guards import site
-from jcloude.jcloude.doctype.site_plan.site_plan import get_plan_config
+from jcloude.jcloude.pagetype.site_plan.site_plan import get_plan_config
 from jcloude.jcloude.report.binary_log_browser.binary_log_browser import (
 	get_data as get_binary_log_data,
 )
@@ -39,7 +39,7 @@ if TYPE_CHECKING:
 	from elasticsearch_dsl.response import AggResponse
 	from elasticsearch_dsl.response.aggs import FieldBucket, FieldBucketData
 
-	from jcloude.jcloude.doctype.jcloude_settings.jcloude_settings import PressSettings
+	from jcloude.jcloude.pagetype.jcloude_settings.jcloude_settings import PressSettings
 
 	class Dataset(TypedDict):
 		"""Single element of list of Datasets returned for stacked histogram chart"""
@@ -960,7 +960,7 @@ COMMONLY_SLOW_JOBS: list[CommonSlowPath] = [
 		"function": get_generate_report_reports,
 	},
 	{
-		"path": "jingrow.core.doctype.prepared_report.prepared_report.generate_report",
+		"path": "jingrow.core.pagetype.prepared_report.prepared_report.generate_report",
 		"id": "generate_report_reports",
 		"function": get_generate_report_reports,
 	},
@@ -1337,7 +1337,7 @@ def plausible_analytics(name):
 	return response
 
 
-def get_doctype_name(table_name: str) -> str:
+def get_pagetype_name(table_name: str) -> str:
 	return table_name.removeprefix("tab")
 
 
@@ -1354,7 +1354,7 @@ def mariadb_add_suggested_index(name, table, column):
 	)
 	if record_exists:
 		jingrow.throw("There is already a pending job for Add Database Index. Please wait until finished.")
-	doctype = get_doctype_name(table)
+	pagetype = get_pagetype_name(table)
 	site = jingrow.get_cached_pg("Site", name)
 	agent = Agent(site.server)
-	agent.add_database_index(site, doctype=doctype, columns=[column])
+	agent.add_database_index(site, pagetype=pagetype, columns=[column])
diff --git a/press/api/app.py b/press/api/app.py
index 70aa306d..ccd08cc8 100644
--- a/press/api/app.py
+++ b/press/api/app.py
@@ -7,12 +7,12 @@ import json
 from typing import TYPE_CHECKING
 
 import jingrow
-from jcloude.jcloude.doctype.app.app import new_app
+from jcloude.jcloude.pagetype.app.app import new_app
 from jcloude.utils import get_current_team
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app.app import App
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.app.app import App
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
 
 
 @jingrow.whitelist()
diff --git a/press/api/bench.py b/press/api/bench.py
index 38dee8d9..b048018d 100644
--- a/press/api/bench.py
+++ b/press/api/bench.py
@@ -13,23 +13,23 @@ from jingrow.utils import flt, sbool
 
 from jcloude.api.github import branches
 from jcloude.api.site import protected
-from jcloude.jcloude.doctype.agent_job.agent_job import job_detail
-from jcloude.jcloude.doctype.app_patch.app_patch import create_app_patch
-from jcloude.jcloude.doctype.bench_update.bench_update import get_bench_update
-from jcloude.jcloude.doctype.cluster.cluster import Cluster
-from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import job_detail
+from jcloude.jcloude.pagetype.app_patch.app_patch import create_app_patch
+from jcloude.jcloude.pagetype.bench_update.bench_update import get_bench_update
+from jcloude.jcloude.pagetype.cluster.cluster import Cluster
+from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import (
 	fail_and_redeploy as fail_and_redeploy_build,
 )
-from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import fail_remote_job
-from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import redeploy as redeploy_candidate
-from jcloude.jcloude.doctype.marketplace_app.marketplace_app import (
+from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import fail_remote_job
+from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import redeploy as redeploy_candidate
+from jcloude.jcloude.pagetype.marketplace_app.marketplace_app import (
 	get_total_installs_by_app,
 )
-from jcloude.jcloude.doctype.release_group.release_group import (
+from jcloude.jcloude.pagetype.release_group.release_group import (
 	ReleaseGroup,
 	new_release_group,
 )
-from jcloude.jcloude.doctype.team.team import get_child_team_members
+from jcloude.jcloude.pagetype.team.team import get_child_team_members
 from jcloude.utils import (
 	get_app_tag,
 	get_client_blacklisted_keys,
@@ -38,10 +38,10 @@ from jcloude.utils import (
 )
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app_source.app_source import AppSource
-	from jcloude.jcloude.doctype.bench.bench import Bench
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-	from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+	from jcloude.jcloude.pagetype.app_source.app_source import AppSource
+	from jcloude.jcloude.pagetype.bench.bench import Bench
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
 
 
 @jingrow.whitelist()
@@ -89,7 +89,7 @@ def get(name):
 		"no_sites": jingrow.db.count("Site", {"group": group.name, "status": "Active"}),
 		"bench_tags": [{"name": x.tag, "tag": x.tag_name} for x in group.tags],
 		"tags": jingrow.get_all(
-			"Jcloude Tag", {"team": group.team, "doctype_name": "Release Group"}, ["name", "tag"]
+			"Jcloude Tag", {"team": group.team, "pagetype_name": "Release Group"}, ["name", "tag"]
 		),
 	}
 
@@ -111,8 +111,8 @@ def all(server=None, bench_filter=None):
 	child_teams = [team.name for team in get_child_team_members(team)]
 	teams = [team, *child_teams]
 
-	group = jingrow.qb.DocType("Release Group")
-	site = jingrow.qb.DocType("Site")
+	group = jingrow.qb.PageType("Release Group")
+	site = jingrow.qb.PageType("Site")
 	query = (
 		jingrow.qb.from_(group)
 		.left_join(site)
@@ -130,20 +130,20 @@ def all(server=None, bench_filter=None):
 		.orderby(group.title, order=jingrow.qb.desc)
 	)
 
-	bench = jingrow.qb.DocType("Bench")
+	bench = jingrow.qb.PageType("Bench")
 	if bench_filter["status"] == "Active":
 		query = query.inner_join(bench).on(group.name == bench.group)
 	elif bench_filter["status"] == "Awaiting Deploy":
 		group_names = jingrow.get_all("Bench", {"status": "Active"}, pluck="group", distinct=True)
 		query = query.inner_join(bench).on(group.name.notin(group_names))
 	if bench_filter["tag"]:
-		jcloude_tag = jingrow.qb.DocType("Resource Tag")
+		jcloude_tag = jingrow.qb.PageType("Resource Tag")
 		query = query.inner_join(jcloude_tag).on(
 			(jcloude_tag.tag_name == bench_filter["tag"]) & (jcloude_tag.parent == group.name)
 		)
 
 	if server:
-		group_server = jingrow.qb.DocType("Release Group Server")
+		group_server = jingrow.qb.PageType("Release Group Server")
 		query = (
 			query.inner_join(group_server)
 			.on(group_server.parent == group.name)
@@ -166,11 +166,11 @@ def all(server=None, bench_filter=None):
 @jingrow.whitelist()
 def bench_tags():
 	team = get_current_team()
-	return jingrow.get_all("Jcloude Tag", {"team": team, "doctype_name": "Release Group"}, pluck="tag")
+	return jingrow.get_all("Jcloude Tag", {"team": team, "pagetype_name": "Release Group"}, pluck="tag")
 
 
 def get_app_counts_for_groups(rg_names):
-	rg_app = jingrow.qb.DocType("Release Group App")
+	rg_app = jingrow.qb.PageType("Release Group App")
 
 	app_counts = (
 		jingrow.qb.from_(rg_app)
@@ -213,9 +213,9 @@ def get_default_apps():
 
 
 def get_app_versions_list(only_jingrow=False):
-	AppSource = jingrow.qb.DocType("App Source")
-	FrappeVersion = jingrow.qb.DocType("Jingrow Version")
-	AppSourceVersion = jingrow.qb.DocType("App Source Version")
+	AppSource = jingrow.qb.PageType("App Source")
+	FrappeVersion = jingrow.qb.PageType("Jingrow Version")
+	AppSourceVersion = jingrow.qb.PageType("App Source Version")
 	rows = (
 		jingrow.qb.from_(AppSourceVersion)
 		.left_join(AppSource)
@@ -499,8 +499,8 @@ def all_apps(name):
 	if not marketplace_apps:
 		return []
 
-	AppSource = jingrow.qb.DocType("App Source")
-	AppSourceVersion = jingrow.qb.DocType("App Source Version")
+	AppSource = jingrow.qb.PageType("App Source")
+	AppSourceVersion = jingrow.qb.PageType("App Source Version")
 	marketplace_app_sources = (
 		jingrow.qb.from_(AppSource)
 		.left_join(AppSourceVersion)
@@ -565,8 +565,8 @@ def remove_app(name, app):
 @jingrow.whitelist()
 @protected("Release Group")
 def versions(name):
-	Bench = jingrow.qb.DocType("Bench")
-	Server = jingrow.qb.DocType("Server")
+	Bench = jingrow.qb.PageType("Bench")
+	Server = jingrow.qb.PageType("Server")
 	deployed_versions = (
 		jingrow.qb.from_(Bench)
 		.left_join(Server)
@@ -591,7 +591,7 @@ def versions(name):
 	)
 
 	if sites_in_group_details:
-		Cluster = jingrow.qb.DocType("Cluster")
+		Cluster = jingrow.qb.PageType("Cluster")
 		cluster_data = (
 			jingrow.qb.from_(Cluster)
 			.select(Cluster.name, Cluster.title, Cluster.image)
@@ -599,7 +599,7 @@ def versions(name):
 			.run(as_dict=True)
 		)
 
-		Plan = jingrow.qb.DocType("Site Plan")
+		Plan = jingrow.qb.PageType("Site Plan")
 		plan_data = (
 			jingrow.qb.from_(Plan)
 			.select(Plan.name, Plan.plan_title, Plan.price_inr, Plan.price_usd)
@@ -607,7 +607,7 @@ def versions(name):
 			.run(as_dict=True)
 		)
 
-		ResourceTag = jingrow.qb.DocType("Resource Tag")
+		ResourceTag = jingrow.qb.PageType("Resource Tag")
 		tag_data = (
 			jingrow.qb.from_(ResourceTag)
 			.select(ResourceTag.tag_name, ResourceTag.parent)
diff --git a/press/api/billing.py b/press/api/billing.py
index bf42417b..8011a47f 100644
--- a/press/api/billing.py
+++ b/press/api/billing.py
@@ -20,8 +20,8 @@ from jcloude.api.regional_payments.mpesa.utils import (
 	update_tax_id_or_phone_no,
 )
 from jcloude.guards import role_guard
-from jcloude.jcloude.doctype.mpesa_setup.mpesa_connector import MpesaConnector
-from jcloude.jcloude.doctype.team.team import (
+from jcloude.jcloude.pagetype.mpesa_setup.mpesa_connector import MpesaConnector
+from jcloude.jcloude.pagetype.team.team import (
 	_enqueue_finalize_unpaid_invoices_for_team,
 	has_unsettled_invoices,
 )
@@ -39,7 +39,7 @@ from jcloude.utils.billing import (
 )
 from jcloude.utils.mpesa_utils import create_mpesa_request_log
 
-# from jcloude.jcloude.doctype.paymob_callback_log.paymob_callback_log import create_payment_partner_transaction
+# from jcloude.jcloude.pagetype.paymob_callback_log.paymob_callback_log import create_payment_partner_transaction
 
 
 @jingrow.whitelist()
@@ -114,8 +114,8 @@ def balances():
 	if not has_bought_credits:
 		return []
 
-	bt = jingrow.qb.DocType("Balance Transaction")
-	inv = jingrow.qb.DocType("Invoice")
+	bt = jingrow.qb.PageType("Balance Transaction")
+	inv = jingrow.qb.PageType("Invoice")
 	query = (
 		jingrow.qb.from_(bt)
 		.left_join(inv)
@@ -718,7 +718,7 @@ def create_razorpay_order(amount, transaction_type, pg_name=None) -> dict | None
 
 	payment_record = jingrow.get_pg(
 		{
-			"doctype": "Razorpay Payment Record",
+			"pagetype": "Razorpay Payment Record",
 			"order_id": order.get("id"),
 			"team": team.name,
 			"type": payment_record_type,
@@ -1027,7 +1027,7 @@ def create_mpesa_payment_record(transaction_response):
 	try:
 		payment_record = jingrow.get_pg(
 			{
-				"doctype": "Mpesa Payment Record",
+				"pagetype": "Mpesa Payment Record",
 				"transaction_id": transaction_id,
 				"transaction_time": parse_datetime(transaction_time),
 				"transaction_type": "Mpesa Express",
@@ -1067,7 +1067,7 @@ def create_mpesa_payment_record(transaction_response):
 def create_balance_transaction_and_invoice(team, amount, mpesa_details):
 	try:
 		balance_transaction = jingrow.get_pg(
-			doctype="Balance Transaction",
+			pagetype="Balance Transaction",
 			team=team,
 			source="Prepaid Credits",
 			type="Adjustment",
@@ -1079,7 +1079,7 @@ def create_balance_transaction_and_invoice(team, amount, mpesa_details):
 		balance_transaction.submit()
 
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=team,
 			type="Prepaid Credits",
 			status="Paid",
@@ -1243,7 +1243,7 @@ def _calculate_forecast_data(
 
 def _get_active_subscriptions(team: str):
 	"""Get all active subscriptions for a team."""
-	Subscription = jingrow.qb.DocType("Subscription")
+	Subscription = jingrow.qb.PageType("Subscription")
 
 	return (
 		jingrow.qb.from_(Subscription)
@@ -1346,7 +1346,7 @@ def _get_usage_records_total_for_date_range(team: str, start_date, end_date):
 	"""Get total amount from Usage Records for a team in a date range."""
 	from jingrow.query_builder.functions import Sum
 
-	UsageRecord = jingrow.qb.DocType("Usage Record")
+	UsageRecord = jingrow.qb.PageType("Usage Record")
 	total_amount = (
 		jingrow.qb.from_(UsageRecord)
 		.select(Sum(UsageRecord.amount))
diff --git a/press/api/callbacks.py b/press/api/callbacks.py
index 8b12a6e2..d76af5c2 100644
--- a/press/api/callbacks.py
+++ b/press/api/callbacks.py
@@ -7,7 +7,7 @@ import ipaddress
 import jingrow
 
 from jcloude.agent import Agent
-from jcloude.jcloude.doctype.agent_job.agent_job import handle_polled_job
+from jcloude.jcloude.pagetype.agent_job.agent_job import handle_polled_job
 from jcloude.utils import log_error
 
 
@@ -81,7 +81,7 @@ def handle_job_updates(server: str, job_identifier: str):
 
 		callback = jingrow.get_pg(
 			{
-				"doctype": "Agent Job Callback",
+				"pagetype": "Agent Job Callback",
 				"job_name": job.job_type,
 				"agent_job": polled_job["agent_job_id"],
 				"status": polled_job["status"],
diff --git a/press/api/central.py b/press/api/central.py
index ef59713d..7c8103e1 100644
--- a/press/api/central.py
+++ b/press/api/central.py
@@ -6,13 +6,13 @@ from jingrow.core.utils import find
 from jingrow.geo.country_info import get_country_timezone_info
 
 from jcloude.api.account import get_account_request_from_key
-from jcloude.jcloude.doctype.site.erpnext_site import (
+from jcloude.jcloude.pagetype.site.erpnext_site import (
 	ERPNextSite,
 	get_erpnext_domain,
 	get_erpnext_plan,
 )
-from jcloude.jcloude.doctype.site.pool import get as get_pooled_site
-from jcloude.jcloude.doctype.team.team import Team
+from jcloude.jcloude.pagetype.site.pool import get as get_pooled_site
+from jcloude.jcloude.pagetype.team.team import Team
 
 
 @jingrow.whitelist(allow_guest=True)
@@ -32,7 +32,7 @@ def account_request(
 
 	account_request = jingrow.get_pg(
 		{
-			"doctype": "Account Request",
+			"pagetype": "Account Request",
 			"erpnext": True,
 			"subdomain": subdomain,
 			"email": email,
diff --git a/press/api/client.py b/press/api/client.py
index a40bce4a..9d9ed68b 100644
--- a/press/api/client.py
+++ b/press/api/client.py
@@ -100,7 +100,7 @@ whitelisted_methods = set()
 
 @jingrow.whitelist()
 def get_list(
-	doctype: str,
+	pagetype: str,
 	fields: list | None = None,
 	filters: dict | None = None,
 	order_by: str | None = None,
@@ -113,14 +113,14 @@ def get_list(
 		filters = {}
 
 	# these doctypes doesn't have a team field to filter by but are used in get or run_pg_method
-	if doctype in ["Team", "User SSH Key"]:
+	if pagetype in ["Team", "User SSH Key"]:
 		return []
 
-	check_permissions(doctype)
-	valid_fields = validate_fields(doctype, fields)
-	valid_filters = validate_filters(doctype, filters)
+	check_permissions(pagetype)
+	valid_fields = validate_fields(pagetype, fields)
+	valid_filters = validate_filters(pagetype, filters)
 
-	meta = jingrow.get_meta(doctype)
+	meta = jingrow.get_meta(pagetype)
 	if meta.istable and not (filters.get("parenttype") and filters.get("parent")):
 		jingrow.throw("parenttype and parent are required to get child records")
 
@@ -132,7 +132,7 @@ def get_list(
 		valid_filters.team = jingrow.local.team().name
 
 	query = get_list_query(
-		doctype,
+		pagetype,
 		meta,
 		filters,
 		valid_filters,
@@ -151,7 +151,7 @@ def get_list(
 		parent=parent,
 		debug=debug,
 	)
-	query = apply_custom_filters(doctype, query, **list_args)
+	query = apply_custom_filters(pagetype, query, **list_args)
 	if isinstance(query, QueryBuilder):
 		return query.run(as_dict=1, debug=debug)
 
@@ -162,13 +162,13 @@ def get_list(
 
 
 @role_guard.document(
-	document_type=lambda args: str(args.get("doctype")),
+	document_type=lambda args: str(args.get("pagetype")),
 	should_throw=False,
 	inject_values=True,
 	injection_key="document_options",
 )
 def get_list_query(
-	doctype: str,
+	pagetype: str,
 	meta: "Meta",
 	filters: dict,
 	valid_filters: jingrow._dict,
@@ -179,12 +179,12 @@ def get_list_query(
 	document_options=None,
 ):
 	query = jingrow.qb.get_query(
-		doctype, filters=valid_filters, fields=valid_fields, offset=start, limit=limit, order_by=order_by
+		pagetype, filters=valid_filters, fields=valid_fields, offset=start, limit=limit, order_by=order_by
 	)
 
 	if meta.istable and jingrow.get_meta(filters.get("parenttype")).has_field("team"):
-		ParentDocType = jingrow.qb.DocType(filters.get("parenttype"))
-		ChildDocType = jingrow.qb.DocType(doctype)
+		ParentDocType = jingrow.qb.PageType(filters.get("parenttype"))
+		ChildDocType = jingrow.qb.PageType(pagetype)
 
 		query = (
 			query.join(ParentDocType)
@@ -193,7 +193,7 @@ def get_list_query(
 		)
 
 	if document_options and isinstance(document_options, list):
-		QueryDoctype = jingrow.qb.DocType(doctype)
+		QueryDoctype = jingrow.qb.PageType(pagetype)
 		query = query.where(QueryDoctype.name.isin(document_options))
 
 	return query
@@ -201,22 +201,22 @@ def get_list_query(
 
 @jingrow.whitelist()
 @role_guard.document(
-	document_type=lambda args: str(args.get("doctype")),
+	document_type=lambda args: str(args.get("pagetype")),
 	document_name=lambda args: str(args.get("name")),
 )
-def get(doctype, name):
-	check_permissions(doctype)
+def get(pagetype, name):
+	check_permissions(pagetype)
 	try:
-		pg = jingrow.get_pg(doctype, name)
+		pg = jingrow.get_pg(pagetype, name)
 	except jingrow.DoesNotExistError:
-		controller = get_controller(doctype)
+		controller = get_controller(pagetype)
 		if hasattr(controller, "on_not_found"):
 			return controller.on_not_found(name)
 		raise
 
 	if (
-		not (jingrow.local.system_user() or has_support_access(doctype, name))
-		and jingrow.get_meta(doctype).has_field("team")
+		not (jingrow.local.system_user() or has_support_access(pagetype, name))
+		and jingrow.get_meta(pagetype).has_field("team")
 		and pg.team != jingrow.local.team().name
 	):
 		raise_not_permitted()
@@ -239,29 +239,29 @@ def get(doctype, name):
 
 @jingrow.whitelist(methods=["POST", "PUT"])
 def insert(pg=None):
-	if not pg or not pg.get("doctype"):
-		jingrow.throw(jingrow._("pg.doctype is required"))
+	if not pg or not pg.get("pagetype"):
+		jingrow.throw(jingrow._("pg.pagetype is required"))
 
-	check_permissions(pg.get("doctype"))
+	check_permissions(pg.get("pagetype"))
 
 	pg = jingrow._dict(pg)
-	if jingrow.is_table(pg.doctype):
+	if jingrow.is_table(pg.pagetype):
 		if not (pg.parenttype and pg.parent and pg.parentfield):
 			jingrow.throw(jingrow._("Parenttype, Parent and Parentfield are required to insert a child record"))
 
 		# inserting a child record
 		parent = jingrow.get_pg(pg.parenttype, pg.parent)
 
-		if jingrow.get_meta(parent.doctype).has_field("team") and parent.team != jingrow.local.team().name:
+		if jingrow.get_meta(parent.pagetype).has_field("team") and parent.team != jingrow.local.team().name:
 			raise_not_permitted()
 
 		parent.append(pg.parentfield, pg)
 		parent.save()
-		return get(parent.doctype, parent.name)
+		return get(parent.pagetype, parent.name)
 
 	_pg = jingrow.get_pg(pg)
 
-	if jingrow.get_meta(pg.doctype).has_field("team"):
+	if jingrow.get_meta(pg.pagetype).has_field("team"):
 		if not _pg.team:
 			# set team if not set
 			_pg.team = jingrow.local.team().name
@@ -269,33 +269,33 @@ def insert(pg=None):
 			# don't allow dashboard user to set any other team
 			_pg.team = jingrow.local.team().name
 	_pg.insert()
-	return get(_pg.doctype, _pg.name)
+	return get(_pg.pagetype, _pg.name)
 
 
 @jingrow.whitelist(methods=["POST", "PUT"])
-def set_value(doctype: str, name: str, fieldname: dict | str, value: str | None = None):
-	check_permissions(doctype)
-	check_document_access(doctype, name)
+def set_value(pagetype: str, name: str, fieldname: dict | str, value: str | None = None):
+	check_permissions(pagetype)
+	check_document_access(pagetype, name)
 
 	for field in fieldname:
 		# fields mentioned in dashboard_fields are allowed to be set via set_value
-		is_allowed_field(doctype, field)
+		is_allowed_field(pagetype, field)
 
-	_set_value(doctype, name, fieldname, value)
+	_set_value(pagetype, name, fieldname, value)
 
 	# jingrow set_value returns just the pg and not jcloude's overriden `get_pg`
-	return get(doctype, name)
+	return get(pagetype, name)
 
 
 @jingrow.whitelist(methods=["DELETE", "POST"])
-def delete(doctype: str, name: str):
+def delete(pagetype: str, name: str):
 	method = "delete"
 
-	check_permissions(doctype)
-	check_document_access(doctype, name)
-	check_dashboard_actions(doctype, name, method)
+	check_permissions(pagetype)
+	check_document_access(pagetype, name)
+	check_dashboard_actions(pagetype, name, method)
 
-	_run_pg_method(dt=doctype, dn=name, method=method, args=None)
+	_run_pg_method(dt=pagetype, dn=name, method=method, args=None)
 
 
 @jingrow.whitelist()
@@ -316,22 +316,22 @@ def run_pg_method(dt: str, dn: str, method: str, args: dict | None = None):
 
 @jingrow.whitelist()
 def search_link(
-	doctype: str,
+	pagetype: str,
 	query: str | None = None,
 	filters: dict | None = None,
 	order_by: str | None = None,
 	page_length: int | None = None,
 ):
-	check_permissions(doctype)
-	if doctype == "Team" and not jingrow.local.system_user():
+	check_permissions(pagetype)
+	if pagetype == "Team" and not jingrow.local.system_user():
 		raise_not_permitted()
 
-	meta = jingrow.get_meta(doctype)
-	DocType = jingrow.qb.DocType(doctype)
-	valid_filters = validate_filters(doctype, filters)
-	valid_fields = validate_fields(doctype, ["name", meta.title_field or "name"])
+	meta = jingrow.get_meta(pagetype)
+	PageType = jingrow.qb.PageType(pagetype)
+	valid_filters = validate_filters(pagetype, filters)
+	valid_fields = validate_fields(pagetype, ["name", meta.title_field or "name"])
 	q = get_list_query(
-		doctype,
+		pagetype,
 		meta,
 		filters,
 		valid_filters,
@@ -340,36 +340,36 @@ def search_link(
 		page_length or 10,
 		order_by or "modified desc",
 	)
-	q = q.select(DocType.name.as_("value"))
+	q = q.select(PageType.name.as_("value"))
 	if meta.title_field:
-		q = q.select(DocType[meta.title_field].as_("label"))
+		q = q.select(PageType[meta.title_field].as_("label"))
 	if meta.has_field("enabled"):
-		q = q.where(DocType.enabled == 1)
+		q = q.where(PageType.enabled == 1)
 	if meta.has_field("disabled"):
-		q = q.where(DocType.disabled != 1)
+		q = q.where(PageType.disabled != 1)
 	if meta.has_field("team") and (not jingrow.local.system_user() or 1):
-		q = q.where(DocType.team == jingrow.local.team().name)
+		q = q.where(PageType.team == jingrow.local.team().name)
 	if query:
-		condition = DocType.name.like(f"%{query}%")
+		condition = PageType.name.like(f"%{query}%")
 		if meta.title_field:
-			condition = condition | DocType[meta.title_field].like(f"%{query}%")
+			condition = condition | PageType[meta.title_field].like(f"%{query}%")
 		q = q.where(condition)
 	return q.run(as_dict=1)
 
 
-def check_document_access(doctype: str, name: str):
+def check_document_access(pagetype: str, name: str):
 	if jingrow.local.system_user():
 		return
 
 	team = ""
-	meta = jingrow.get_meta(doctype)
+	meta = jingrow.get_meta(pagetype)
 	if meta.has_field("team"):
-		team = jingrow.db.get_value(doctype, name, "team")
+		team = jingrow.db.get_value(pagetype, name, "team")
 	elif meta.has_field("bench"):
-		bench = jingrow.db.get_value(doctype, name, "bench")
+		bench = jingrow.db.get_value(pagetype, name, "bench")
 		team = jingrow.db.get_value("Bench", bench, "team")
 	elif meta.has_field("group"):
-		group = jingrow.db.get_value(doctype, name, "group")
+		group = jingrow.db.get_value(pagetype, name, "group")
 		team = jingrow.db.get_value("Release Group", group, "team")
 	else:
 		return
@@ -377,14 +377,14 @@ def check_document_access(doctype: str, name: str):
 	if team == jingrow.local.team().name:
 		return
 
-	if has_support_access(doctype, name):
+	if has_support_access(pagetype, name):
 		return
 
 	raise_not_permitted()
 
 
-def check_dashboard_actions(doctype, name, method):
-	pg = jingrow.get_pg(doctype, name)
+def check_dashboard_actions(pagetype, name, method):
+	pg = jingrow.get_pg(pagetype, name)
 	method_obj = getattr(pg, method)
 	fn = getattr(method_obj, "__func__", method_obj)
 
@@ -392,9 +392,9 @@ def check_dashboard_actions(doctype, name, method):
 		raise_not_permitted()
 
 
-def apply_custom_filters(doctype, query, **list_args):
+def apply_custom_filters(pagetype, query, **list_args):
 	"""Apply custom filters to query"""
-	controller = get_controller(doctype)
+	controller = get_controller(pagetype)
 	if hasattr(controller, "get_list_query"):
 		if inspect.getfullargspec(controller.get_list_query).varkw:
 			return controller.get_list_query(query, **list_args)
@@ -403,47 +403,47 @@ def apply_custom_filters(doctype, query, **list_args):
 	return query
 
 
-def validate_filters(doctype, filters):
+def validate_filters(pagetype, filters):
 	"""Filter filters based on permissions"""
 	if not filters:
 		filters = {}
 
 	out = jingrow._dict()
 	for fieldname, value in filters.items():
-		if is_allowed_field(doctype, fieldname):
+		if is_allowed_field(pagetype, fieldname):
 			out[fieldname] = value
 
 	return out
 
 
-def validate_fields(doctype, fields):
+def validate_fields(pagetype, fields):
 	"""Filter fields based on permissions"""
 	if not fields:
 		return fields
 
 	filtered_fields = []
 	for field in fields:
-		if is_allowed_field(doctype, field):
+		if is_allowed_field(pagetype, field):
 			filtered_fields.append(field)
 
 	return filtered_fields
 
 
-def is_allowed_field(doctype, field):
+def is_allowed_field(pagetype, field):
 	"""Check if field is valid"""
 	if not field:
 		return False
 
-	controller = get_controller(doctype)
+	controller = get_controller(pagetype)
 	dashboard_fields = getattr(controller, "dashboard_fields", ())
 
 	if field in dashboard_fields:
 		return True
 
-	if "." in field and is_allowed_linked_field(doctype, field):
+	if "." in field and is_allowed_linked_field(pagetype, field):
 		return True
 
-	if isinstance(field, dict) and is_allowed_table_field(doctype, field):
+	if isinstance(field, dict) and is_allowed_table_field(pagetype, field):
 		return True
 
 	if field in [*default_fields, *child_table_fields]:
@@ -452,7 +452,7 @@ def is_allowed_field(doctype, field):
 	return False
 
 
-def is_allowed_linked_field(doctype, field):
+def is_allowed_linked_field(pagetype, field):
 	linked_field = linked_field_fieldname = None
 	if " as " in field:
 		linked_field, _ = field.split(" as ")
@@ -460,30 +460,30 @@ def is_allowed_linked_field(doctype, field):
 		linked_field = field
 
 	linked_field, linked_field_fieldname = linked_field.split(".")
-	if not is_allowed_field(doctype, linked_field):
+	if not is_allowed_field(pagetype, linked_field):
 		return False
 
-	linked_field_doctype = jingrow.get_meta(doctype).get_field(linked_field).options
-	if not is_allowed_field(linked_field_doctype, linked_field_fieldname):
+	linked_field_pagetype = jingrow.get_meta(pagetype).get_field(linked_field).options
+	if not is_allowed_field(linked_field_pagetype, linked_field_fieldname):
 		return False
 
 	return True
 
 
-def is_allowed_table_field(doctype, field):
+def is_allowed_table_field(pagetype, field):
 	for table_fieldname, table_fields in field.items():
-		if not is_allowed_field(doctype, table_fieldname):
+		if not is_allowed_field(pagetype, table_fieldname):
 			return False
 
-		table_doctype = jingrow.get_meta(doctype).get_field(table_fieldname).options
+		table_pagetype = jingrow.get_meta(pagetype).get_field(table_fieldname).options
 		for table_field in table_fields:
-			if not is_allowed_field(table_doctype, table_field):
+			if not is_allowed_field(table_pagetype, table_field):
 				return False
 	return True
 
 
-def check_permissions(doctype):
-	if doctype not in ALLOWED_DOCTYPES:
+def check_permissions(pagetype):
+	if pagetype not in ALLOWED_DOCTYPES:
 		raise_not_permitted()
 
 	if not hasattr(jingrow.local, "team") or not jingrow.local.team():
@@ -495,12 +495,12 @@ def check_permissions(doctype):
 	return True
 
 
-def is_owned_by_team(doctype, docname, raise_exception=True):
+def is_owned_by_team(pagetype, docname, raise_exception=True):
 	if not jingrow.local.team():
 		return False
 
 	docname = cstr(docname)
-	owned = jingrow.db.get_value(doctype, docname, "team") == jingrow.local.team().name
+	owned = jingrow.db.get_value(pagetype, docname, "team") == jingrow.local.team().name
 	if not owned and raise_exception:
 		raise_not_permitted()
 	return owned
diff --git a/press/api/cookies.py b/press/api/cookies.py
index bbde7361..fc2de864 100644
--- a/press/api/cookies.py
+++ b/press/api/cookies.py
@@ -36,7 +36,7 @@ def update_preferences(preferences):
 def log_cookie_consent(preferences):
 	jingrow.get_pg(
 		{
-			"doctype": "Cookie Preference Log",
+			"pagetype": "Cookie Preference Log",
 			"ip_address": jingrow.local.request_ip,
 			"agreed_to_analytics_cookies": preferences.get("analytics"),
 			"agreed_to_functionality_cookies": preferences.get("functionality"),
diff --git a/press/api/dashboard.py b/press/api/dashboard.py
index cd922017..a9c56544 100644
--- a/press/api/dashboard.py
+++ b/press/api/dashboard.py
@@ -22,27 +22,27 @@ def all():
 
 @jingrow.whitelist()
 @protected(["Site", "Release Group", "Server", "Database Server"])
-def create_new_tag(name, doctype, tag):
+def create_new_tag(name, pagetype, tag):
 	team = get_current_team()
-	if jingrow.db.exists("Jcloude Tag", {"tag": tag, "doctype_name": doctype, "team": team}):
+	if jingrow.db.exists("Jcloude Tag", {"tag": tag, "pagetype_name": pagetype, "team": team}):
 		jingrow.throw(f"Tag '{tag}' already exists")
 	tag = jingrow.get_pg(
 		{
-			"doctype": "Jcloude Tag",
-			"doctype_name": doctype,
+			"pagetype": "Jcloude Tag",
+			"pagetype_name": pagetype,
 			"team": team,
 			"tag": tag,
 		}
 	).insert(ignore_permissions=True)
-	pg = jingrow.get_pg(doctype, name).append("tags", {"tag": tag})
+	pg = jingrow.get_pg(pagetype, name).append("tags", {"tag": tag})
 	pg.save()
 	return tag
 
 
 @jingrow.whitelist()
 @protected(["Site", "Release Group", "Server", "Database Server"])
-def add_tag(name, doctype, tag):
-	pg = jingrow.get_pg(doctype, name)
+def add_tag(name, pagetype, tag):
+	pg = jingrow.get_pg(pagetype, name)
 	pg.append("tags", {"tag": tag})
 	pg.save()
 	return tag
@@ -50,8 +50,8 @@ def add_tag(name, doctype, tag):
 
 @jingrow.whitelist()
 @protected(["Site", "Release Group", "Server", "Database Server"])
-def remove_tag(name, doctype, tag):
-	pg = jingrow.get_pg(doctype, name)
+def remove_tag(name, pagetype, tag):
+	pg = jingrow.get_pg(pagetype, name)
 	pg.tags = [resource_tag for resource_tag in pg.tags if resource_tag.tag != tag]
 	pg.save()
 	return tag
diff --git a/press/api/developer/marketplace.py b/press/api/developer/marketplace.py
index d42a8925..ddc26d61 100644
--- a/press/api/developer/marketplace.py
+++ b/press/api/developer/marketplace.py
@@ -152,7 +152,7 @@ class DeveloperApiHandler:
 			token = jingrow.generate_hash("Saas Remote Login", 50)
 			jingrow.get_pg(
 				{
-					"doctype": "Saas Remote Login",
+					"pagetype": "Saas Remote Login",
 					"team": team,
 					"token": token,
 				}
diff --git a/press/api/developer/saas.py b/press/api/developer/saas.py
index caf0a0dd..407b9091 100644
--- a/press/api/developer/saas.py
+++ b/press/api/developer/saas.py
@@ -66,7 +66,7 @@ class SaasApiHandler:
 			token = jingrow.generate_hash("Saas Remote Login", 50)
 			jingrow.get_pg(
 				{
-					"doctype": "Saas Remote Login",
+					"pagetype": "Saas Remote Login",
 					"team": team,
 					"token": token,
 				}
@@ -208,7 +208,7 @@ def login_to_fc(token: str):
 
 
 def is_user_logged_in(user):
-	Sessions = jingrow.qb.DocType("Sessions")
+	Sessions = jingrow.qb.PageType("Sessions")
 
 	return bool(
 		jingrow.qb.from_(Sessions)
diff --git a/press/api/email.py b/press/api/email.py
index 0d986c0d..ddca2040 100644
--- a/press/api/email.py
+++ b/press/api/email.py
@@ -19,7 +19,7 @@ from jcloude.api.site import site_config, update_config
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.jcloude_settings.jcloude_settings import PressSettings
+	from jcloude.jcloude.pagetype.jcloude_settings.jcloude_settings import PressSettings
 
 
 class EmailLimitExceeded(TooManyRequestsError):
@@ -75,7 +75,7 @@ def setup(site):
 
 	update_config(site, json.dumps(new_config))
 
-	jingrow.get_pg({"doctype": "Mail Setup", "site": site, "is_complete": 1}).insert(ignore_permissions=True)
+	jingrow.get_pg({"pagetype": "Mail Setup", "site": site, "is_complete": 1}).insert(ignore_permissions=True)
 
 
 @jingrow.whitelist(allow_guest=True)
@@ -290,7 +290,7 @@ def event_log():
 		)
 		jingrow.get_pg(
 			{
-				"doctype": "Mail Log",
+				"pagetype": "Mail Log",
 				"unique_token": secrets.token_hex(25),
 				"message_id": message_id,
 				"sender": headers["from"],
diff --git a/press/api/github.py b/press/api/github.py
index 8555d5ef..2ee6e596 100644
--- a/press/api/github.py
+++ b/press/api/github.py
@@ -17,7 +17,7 @@ from jcloude.utils import get_current_team, log_error
 
 if TYPE_CHECKING:
 
-	from jcloude.jcloude.doctype.github_webhook_log.github_webhook_log import GitHubWebhookLog
+	from jcloude.jcloude.pagetype.github_webhook_log.github_webhook_log import GitHubWebhookLog
 
 
 @jingrow.whitelist(allow_guest=True, xss_safe=True)
@@ -28,7 +28,7 @@ def hook(*args, **kwargs):
 	headers = jingrow.request.headers
 	pg: "GitHubWebhookLog" = jingrow.get_pg(
 		{
-			"doctype": "GitHub Webhook Log",
+			"pagetype": "GitHub Webhook Log",
 			"name": headers.get("X-Github-Delivery"),
 			"event": headers.get("X-Github-Event"),
 			"signature": headers.get("X-Hub-Signature").split("=")[1],
diff --git a/press/api/google.py b/press/api/google.py
index d45a717c..577c8f7b 100644
--- a/press/api/google.py
+++ b/press/api/google.py
@@ -97,7 +97,7 @@ def callback(code=None, state=None):  # noqa: C901
 
 	# create account request
 	account_request = jingrow.get_pg(
-		doctype="Account Request",
+		pagetype="Account Request",
 		email=email,
 		first_name=id_info.get("given_name"),
 		last_name=id_info.get("family_name"),
diff --git a/press/api/marketplace.py b/press/api/marketplace.py
index 4dadd175..f242dffc 100644
--- a/press/api/marketplace.py
+++ b/press/api/marketplace.py
@@ -14,8 +14,8 @@ from jcloude.api.site import (
 	is_prepaid_marketplace_app,
 	protected,
 )
-from jcloude.jcloude.doctype.app.app import new_app as new_app_pg
-from jcloude.jcloude.doctype.marketplace_app.marketplace_app import (
+from jcloude.jcloude.pagetype.app.app import new_app as new_app_pg
+from jcloude.jcloude.pagetype.marketplace_app.marketplace_app import (
 	MarketplaceApp,
 	get_plans_for_app,
 	get_total_installs_by_app,
@@ -24,9 +24,9 @@ from jcloude.utils import get_app_tag, get_current_team, get_last_pg, unique
 from jcloude.utils.billing import get_jingrow_io_connection
 
 if TYPE_CHECKING:
-	from jcloude.marketplace.doctype.marketplace_app_plan.marketplace_app_plan import MarketplaceAppPlan
-	from jcloude.jcloude.doctype.app_release.app_release import AppRelease
-	from jcloude.jcloude.doctype.app_source.app_source import AppSource
+	from jcloude.marketplace.pagetype.marketplace_app_plan.marketplace_app_plan import MarketplaceAppPlan
+	from jcloude.jcloude.pagetype.app_release.app_release import AppRelease
+	from jcloude.jcloude.pagetype.app_source.app_source import AppSource
 
 
 @jingrow.whitelist()
@@ -100,8 +100,8 @@ def get_install_app_options(marketplace_app: str) -> dict:
 	for cluster in clusters:
 		cluster.proxy_server = find(proxy_servers, lambda x: x.cluster == cluster.name)
 
-	ReleasGroup = jingrow.qb.DocType("Release Group")
-	ReleasGroupApp = jingrow.qb.DocType("Release Group App")
+	ReleasGroup = jingrow.qb.PageType("Release Group")
+	ReleasGroupApp = jingrow.qb.PageType("Release Group App")
 	private_groups = (
 		jingrow.qb.from_(ReleasGroup)
 		.left_join(ReleasGroupApp)
@@ -190,8 +190,8 @@ def create_site_on_public_bench(
 			ignore_permissions=True,
 		)
 
-		ReleaseGroup = jingrow.qb.DocType("Release Group")
-		ReleaseGroupApp = jingrow.qb.DocType("Release Group App")
+		ReleaseGroup = jingrow.qb.PageType("Release Group")
+		ReleaseGroupApp = jingrow.qb.PageType("Release Group App")
 		if group := (
 			jingrow.qb.from_(ReleaseGroup)
 			.join(ReleaseGroupApp)
@@ -212,7 +212,7 @@ def create_site_on_public_bench(
 
 	site = jingrow.get_pg(
 		{
-			"doctype": "Site",
+			"pagetype": "Site",
 			"subdomain": subdomain,
 			"subscription_plan": site_plan,
 			"apps": [{"app": app["app"]} for app in apps],
@@ -258,8 +258,8 @@ def create_site_on_private_bench(
 
 	latest_stable_version_supported = sorted(all_latest_stable_version_supported, reverse=True)[0]
 
-	AppSource = jingrow.qb.DocType("App Source")
-	AppSourceVersion = jingrow.qb.DocType("App Source Version")
+	AppSource = jingrow.qb.PageType("App Source")
+	AppSourceVersion = jingrow.qb.PageType("App Source Version")
 	jingrow_app_source = (
 		jingrow.qb.from_(AppSource)
 		.left_join(AppSourceVersion)
@@ -271,8 +271,8 @@ def create_site_on_private_bench(
 		.run(as_dict=True)
 	)
 
-	MarketplaceApp = jingrow.qb.DocType("Marketplace App")
-	MarketplaceAppVersion = jingrow.qb.DocType("Marketplace App Version")
+	MarketplaceApp = jingrow.qb.PageType("Marketplace App")
+	MarketplaceAppVersion = jingrow.qb.PageType("Marketplace App Version")
 	app_sources = (
 		jingrow.qb.from_(MarketplaceApp)
 		.left_join(MarketplaceAppVersion)
@@ -303,7 +303,7 @@ def create_site_on_private_bench(
 
 	site_group_deploy = jingrow.get_pg(
 		{
-			"doctype": "Site Group Deploy",
+			"pagetype": "Site Group Deploy",
 			"subdomain": subdomain,
 			"apps": apps_with_sources,
 			"cluster": cluster,
@@ -370,9 +370,9 @@ def get_candidate_release_groups(marketplace_app: str, app_name: str) -> list[di
 	}
 	"""
 	team = get_current_team()
-	group = jingrow.qb.DocType("Release Group")
-	group_app = jingrow.qb.DocType("Release Group App")
-	marketplace_app_version = jingrow.qb.DocType("Marketplace App Version")
+	group = jingrow.qb.PageType("Release Group")
+	group_app = jingrow.qb.PageType("Release Group App")
+	marketplace_app_version = jingrow.qb.PageType("Marketplace App Version")
 
 	query = (
 		jingrow.qb.from_(group)
@@ -397,10 +397,10 @@ def get_candidate_sites(app_name: str) -> list[str]:
 	List of Active sites on which the given app is NOT installed but CAN BE installed.
 	"""
 	team = get_current_team()
-	site = jingrow.qb.DocType("Site")
-	site_app = jingrow.qb.DocType("Site App")
-	bench = jingrow.qb.DocType("Bench")
-	bench_app = jingrow.qb.DocType("Bench App")
+	site = jingrow.qb.PageType("Site")
+	site_app = jingrow.qb.PageType("Site App")
+	bench = jingrow.qb.PageType("Bench")
+	bench_app = jingrow.qb.PageType("Bench App")
 
 	sites = (
 		jingrow.qb.from_(site)
@@ -488,8 +488,8 @@ def update_app_image() -> str:
 	app_name = jingrow.form_dict.docname
 	_file = jingrow.get_pg(
 		{
-			"doctype": "File",
-			"attached_to_doctype": "Marketplace App",
+			"pagetype": "File",
+			"attached_to_pagetype": "Marketplace App",
 			"attached_to_name": app_name,
 			"attached_to_field": "image",
 			"folder": "Home/Attachments",
@@ -533,7 +533,7 @@ def add_app_screenshot() -> str:
 
 	_file = jingrow.get_pg(
 		{
-			"doctype": "File",
+			"pagetype": "File",
 			"attached_to_field": "image",
 			"folder": "Home/Attachments",
 			"file_name": file_name,
@@ -789,7 +789,7 @@ def add_app(source: str, app: str):
 	if not is_on_marketplace(app):
 		supported_versions = jingrow.get_all("App Source Version", filters={"parent": source}, pluck="version")
 		marketplace_app = jingrow.get_pg(
-			doctype="Marketplace App",
+			pagetype="Marketplace App",
 			app=app,
 			team=get_current_team(),
 			description="Please add a short description about your app here...",
@@ -830,8 +830,8 @@ def analytics(name: str):
 
 @jingrow.whitelist()
 def get_promotional_banners() -> list:
-	promotionalBanner = jingrow.qb.DocType("Marketplace Promotional Banner")
-	marketplaceApp = jingrow.qb.DocType("Marketplace App")
+	promotionalBanner = jingrow.qb.PageType("Marketplace Promotional Banner")
+	marketplaceApp = jingrow.qb.PageType("Marketplace App")
 
 	promotions = (
 		jingrow.qb.from_(promotionalBanner)
@@ -972,7 +972,7 @@ def update_publisher_profile(profile_data=None):
 		profile_pg.update(profile_data or {})
 		profile_pg.save(ignore_permissions=True)
 	else:
-		profile_pg = jingrow.get_pg({"doctype": "Marketplace Publisher Profile"})
+		profile_pg = jingrow.get_pg({"pagetype": "Marketplace Publisher Profile"})
 		profile_pg.team = team
 		profile_pg.update(profile_data or {})
 		profile_pg.insert(ignore_permissions=True)
@@ -982,7 +982,7 @@ def update_publisher_profile(profile_data=None):
 def submit_user_review(title, rating, app, review):
 	return jingrow.get_pg(
 		{
-			"doctype": "App User Review",
+			"pagetype": "App User Review",
 			"title": title,
 			"rating": int(rating) / 5,
 			"app": app,
@@ -996,7 +996,7 @@ def submit_user_review(title, rating, app, review):
 def submit_developer_reply(review, reply):
 	return jingrow.get_pg(
 		{
-			"doctype": "Developer Review Reply",
+			"pagetype": "Developer Review Reply",
 			"review": review,
 			"description": reply,
 			"developer": jingrow.session.user,
@@ -1006,11 +1006,11 @@ def submit_developer_reply(review, reply):
 
 @jingrow.whitelist()
 def get_subscriptions_list(marketplace_app: str) -> list:
-	app_sub = jingrow.qb.DocType("Subscription")
-	app_plan = jingrow.qb.DocType("Marketplace App Plan")
-	site = jingrow.qb.DocType("Site")
-	usage_record = jingrow.qb.DocType("Usage Record")
-	team = jingrow.qb.DocType("Team")
+	app_sub = jingrow.qb.PageType("Subscription")
+	app_plan = jingrow.qb.PageType("Marketplace App Plan")
+	site = jingrow.qb.PageType("Site")
+	usage_record = jingrow.qb.PageType("Usage Record")
+	team = jingrow.qb.PageType("Team")
 
 	conditions = app_plan.price_usd > 0
 	conditions = conditions & (app_sub.document_name == marketplace_app)
@@ -1049,7 +1049,7 @@ def get_subscriptions_list(marketplace_app: str) -> list:
 def create_app_plan(marketplace_app: str, plan_data: dict):
 	app_plan_pg = jingrow.get_pg(
 		{
-			"doctype": "Marketplace App Plan",
+			"pagetype": "Marketplace App Plan",
 			"app": marketplace_app,
 			"title": plan_data.get("title"),
 			"price_inr": plan_data.get("price_inr"),
@@ -1346,14 +1346,14 @@ def mark_app_ready_for_review(name):
 @protected("Marketplace App")
 @jingrow.whitelist()
 def communication(name):
-	comm = jingrow.qb.DocType("Communication")
-	user = jingrow.qb.DocType("User")
+	comm = jingrow.qb.PageType("Communication")
+	user = jingrow.qb.PageType("User")
 	query = (
 		jingrow.qb.from_(comm)
 		.left_join(user)
 		.on(comm.sender == user.email)
 		.select(comm.sender, comm.content, comm.communication_date, user.user_image)
-		.where((comm.reference_doctype == "Marketplace App") & (comm.reference_name == name))
+		.where((comm.reference_pagetype == "Marketplace App") & (comm.reference_name == name))
 		.orderby(comm.creation, order=jingrow.qb.desc)
 	)
 	res = query.run(as_dict=True)
@@ -1363,15 +1363,15 @@ def communication(name):
 @protected("Marketplace App")
 @jingrow.whitelist()
 def add_reply(name, message):
-	doctype = "Marketplace App"
-	app = jingrow.get_pg(doctype, name)
+	pagetype = "Marketplace App"
+	app = jingrow.get_pg(pagetype, name)
 	recipients = ", ".join(list(app.get_assigned_users()) or [])
 	pg = jingrow.get_pg(
 		{
-			"doctype": "Communication",
+			"pagetype": "Communication",
 			"communication_type": "Communication",
 			"communication_medium": "Email",
-			"reference_doctype": doctype,
+			"reference_pagetype": pagetype,
 			"reference_name": name,
 			"subject": f"Marketplace App Review: {name}, New message!",
 			"sender": jingrow.session.user,
diff --git a/press/api/monitoring.py b/press/api/monitoring.py
index 1c69a079..63ccbdb2 100644
--- a/press/api/monitoring.py
+++ b/press/api/monitoring.py
@@ -8,7 +8,7 @@ import jingrow
 from jingrow.rate_limiter import rate_limit
 
 from jcloude.exceptions import AlertRuleNotEnabled
-from jcloude.jcloude.doctype.monitor_server.monitor_server import get_monitor_server_ips
+from jcloude.jcloude.pagetype.monitor_server.monitor_server import get_monitor_server_ips
 from jcloude.utils import log_error, servers_using_alternative_port_for_communication
 
 
@@ -154,7 +154,7 @@ def alert(*args, **kwargs):
 
 		pg = jingrow.get_pg(
 			{
-				"doctype": "Alertmanager Webhook Log",
+				"pagetype": "Alertmanager Webhook Log",
 				"payload": jingrow.request.get_data().decode(),
 			}
 		)
diff --git a/press/api/notifications.py b/press/api/notifications.py
index c986efea..55fe2c21 100644
--- a/press/api/notifications.py
+++ b/press/api/notifications.py
@@ -26,7 +26,7 @@ def get_notifications(
 	if not filters:
 		filters = {}
 
-	PressNotification = jingrow.qb.DocType("Jcloude Notification")
+	PressNotification = jingrow.qb.PageType("Jcloude Notification")
 	query = (
 		jingrow.qb.from_(PressNotification)
 		.select(
diff --git a/press/api/oauth.py b/press/api/oauth.py
index 1472343a..be3fbced 100644
--- a/press/api/oauth.py
+++ b/press/api/oauth.py
@@ -17,7 +17,7 @@ from jcloude.api.saas import (
 	create_marketplace_subscription,
 	create_or_rename_saas_site,
 )
-from jcloude.jcloude.doctype.site.saas_site import get_saas_domain
+from jcloude.jcloude.pagetype.site.saas_site import get_saas_domain
 from jcloude.utils import log_error
 from jcloude.utils.telemetry import capture, identify
 
@@ -133,7 +133,7 @@ def callback(code=None, state=None):
 def create_account_request(email, first_name, last_name, phone_number=""):
 	account_request = jingrow.get_pg(
 		{
-			"doctype": "Account Request",
+			"pagetype": "Account Request",
 			"team": email,
 			"email": email,
 			"first_name": first_name,
@@ -173,7 +173,7 @@ def saas_setup(key, app, country, subdomain):
 	# create a signup account request
 	signup_ar = jingrow.get_pg(
 		{
-			"doctype": "Account Request",
+			"pagetype": "Account Request",
 			"team": account_request.team,
 			"email": account_request.email,
 			"first_name": account_request.first_name,
diff --git a/press/api/partner.py b/press/api/partner.py
index 191c2e6a..54aec537 100644
--- a/press/api/partner.py
+++ b/press/api/partner.py
@@ -62,7 +62,7 @@ def update_website_info(website_info):
 
 	client = get_jingrow_io_connection()
 	try:
-		website_info["doctype"] = "Partner"
+		website_info["pagetype"] = "Partner"
 		client.update(website_info)
 	except Exception:
 		jingrow.log_error("Error updating website info")
@@ -118,7 +118,7 @@ def send_link_certificate_request(user_email, certificate_type):
 
 	jingrow.get_pg(
 		{
-			"doctype": "Certificate Link Request",
+			"pagetype": "Certificate Link Request",
 			"partner_team": team.name,
 			"user_email": user_email,
 			"course": certificate_type,
@@ -468,7 +468,7 @@ def get_current_month_partner_contribution(partner_email):
 	)
 	month_end = jingrow.utils.get_last_day(today())
 
-	invoice = jingrow.qb.DocType("Invoice")
+	invoice = jingrow.qb.PageType("Invoice")
 	query = (
 		jingrow.qb.from_(invoice)
 		.select(invoice.currency, invoice.total_before_discount)
@@ -503,7 +503,7 @@ def get_prev_month_partner_contribution(partner_email):
 	two_weeks = add_days(first_day, 14)  # 15th day of the month
 	last_month_end = get_last_day(add_months(today(), -1))
 
-	invoice = jingrow.qb.DocType("Invoice")
+	invoice = jingrow.qb.PageType("Invoice")
 	query = (
 		jingrow.qb.from_(invoice)
 		.select(invoice.currency, invoice.total_before_discount)
@@ -537,7 +537,7 @@ def get_prev_month_partner_contribution(partner_email):
 @jingrow.whitelist()
 @role_guard.api("partner")
 def calculate_partner_tier(contribution, currency):
-	partner_tier = jingrow.qb.DocType("Partner Tier")
+	partner_tier = jingrow.qb.PageType("Partner Tier")
 	query = jingrow.qb.from_(partner_tier).select(partner_tier.name)
 	if currency == "INR":
 		query = query.where(partner_tier.target_in_inr <= contribution).orderby(
@@ -565,7 +565,7 @@ def add_partner(referral_code: str):
 
 	pg = jingrow.get_pg(
 		{
-			"doctype": "Partner Approval Request",
+			"pagetype": "Partner Approval Request",
 			"partner": partner,
 			"requested_by": team.name,
 			"status": "Pending",
diff --git a/press/api/product_trial.py b/press/api/product_trial.py
index 5523935c..0b23f16b 100644
--- a/press/api/product_trial.py
+++ b/press/api/product_trial.py
@@ -10,8 +10,8 @@ import jingrow.utils
 from jingrow.rate_limiter import rate_limit
 
 from jcloude.api.account import get_account_request_from_key
-from jcloude.jcloude.doctype.team.team import Team
-from jcloude.saas.doctype.product_trial.product_trial import send_verification_mail_for_login
+from jcloude.jcloude.pagetype.team.team import Team
+from jcloude.saas.pagetype.product_trial.product_trial import send_verification_mail_for_login
 from jcloude.utils.telemetry import capture
 
 
diff --git a/press/api/regional_payments/mpesa/utils.py b/press/api/regional_payments/mpesa/utils.py
index 9cb4375e..3bc3644e 100644
--- a/press/api/regional_payments/mpesa/utils.py
+++ b/press/api/regional_payments/mpesa/utils.py
@@ -4,7 +4,7 @@ from datetime import datetime
 import jingrow
 import requests
 from jingrow import _
-from jingrow.query_builder import DocType
+from jingrow.query_builder import PageType
 from jingrow.utils.password import get_decrypted_password
 
 from jcloude.utils import get_current_team
@@ -21,7 +21,7 @@ def update_mpesa_setup(mpesa_details):
 		if not jingrow.db.exists("Mpesa Setup", {"team": team}):
 			mpesa_setup = jingrow.get_pg(
 				{
-					"doctype": "Mpesa Setup",
+					"pagetype": "Mpesa Setup",
 					"team": team,
 					"mpesa_setup_id": mpesa_info.mpesa_setup_id,
 					"api_type": "Mpesa Express",
@@ -135,7 +135,7 @@ def update_payment_gateway_settings(gateway_details):
 			return payment_gateway.save().name
 		payment_gateway_settings = jingrow.get_pg(
 			{
-				"doctype": "Payment Gateway",
+				"pagetype": "Payment Gateway",
 				"team": team,
 				"gateway": gateway_data.gateway_name,
 				"currency": gateway_data.currency,
@@ -180,7 +180,7 @@ def get_payment_gateway_details():
 
 @jingrow.whitelist()
 def get_gateway_controller():
-	# """Get the list of controllers for the given doctype."""
+	# """Get the list of controllers for the given pagetype."""
 	team = get_current_team(get_pg=True)
 	gateway_setting = "Mpesa Setup" if team.country == "Kenya" else None
 	if gateway_setting:
@@ -226,8 +226,8 @@ def update_tax_id_or_phone_no(team, tax_id, phone_number):
 def display_mpesa_payment_partners():
 	"""Display the list of partners in the system with Mpesa integration enabled."""
 
-	Team = DocType("Team")
-	MpesaSetup = DocType("Mpesa Setup")
+	Team = PageType("Team")
+	MpesaSetup = PageType("Mpesa Setup")
 
 	query = (
 		jingrow.qb.from_(Team)
@@ -245,7 +245,7 @@ def display_mpesa_payment_partners():
 @jingrow.whitelist()
 def display_payment_partners():
 	"""Display the list of partners in the system."""
-	Team = DocType("Team")
+	Team = PageType("Team")
 	query = jingrow.qb.from_(Team).select(Team.user).where(Team.erpnext_partner == 1)
 
 	partners = query.run(as_dict=True)
@@ -344,7 +344,7 @@ def create_exchange_rate(**kwargs):
 
 		exchange_rate_pg = jingrow.get_pg(
 			{
-				"doctype": "Currency Exchange",
+				"pagetype": "Currency Exchange",
 				"from_currency": from_currency,
 				"to_currency": to_currency,
 				"exchange_rate": exchange_rate,
@@ -367,7 +367,7 @@ def create_payment_partner_transaction(
 	try:
 		transaction_pg = jingrow.get_pg(
 			{
-				"doctype": "Payment Partner Transaction",
+				"pagetype": "Payment Partner Transaction",
 				"team": team,
 				"payment_partner": payment_partner,
 				"exchange_rate": exchange_rate,
@@ -466,8 +466,8 @@ def create_invoice_partner_site(data, gateway_controller):
 @jingrow.whitelist()
 def display_payment_gateways(payment_partner):
 	"""Display the list of payment gateways for the partner."""
-	Team = DocType("Team")
-	PaymentGateway = DocType("Payment Gateway")
+	Team = PageType("Team")
+	PaymentGateway = PageType("Payment Gateway")
 
 	query = (
 		jingrow.qb.from_(Team)
diff --git a/press/api/saas.py b/press/api/saas.py
index 93e9b1fd..92364a32 100644
--- a/press/api/saas.py
+++ b/press/api/saas.py
@@ -5,21 +5,21 @@ import jingrow
 from jingrow.core.utils import find
 
 from jcloude.api.account import get_account_request_from_key
-from jcloude.jcloude.doctype.site.erpnext_site import get_erpnext_domain
-from jcloude.jcloude.doctype.site.saas_pool import get as get_pooled_saas_site
-from jcloude.jcloude.doctype.site.saas_site import (
+from jcloude.jcloude.pagetype.site.erpnext_site import get_erpnext_domain
+from jcloude.jcloude.pagetype.site.saas_pool import get as get_pooled_saas_site
+from jcloude.jcloude.pagetype.site.saas_site import (
 	SaasSite,
 	get_default_team_for_app,
 	get_saas_domain,
 	get_saas_site_plan,
 	set_site_in_subscription_docs,
 )
-from jcloude.jcloude.doctype.team.team import Team
+from jcloude.jcloude.pagetype.team.team import Team
 from jcloude.utils import log_error
 from jcloude.utils.telemetry import capture, identify
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.site.site import Site
+	from jcloude.jcloude.pagetype.site.site import Site
 
 # ----------------------------- SIGNUP APIs ---------------------------------
 
@@ -59,7 +59,7 @@ def account_request(
 		jingrow.set_user("Administrator")
 		account_request = jingrow.get_pg(
 			{
-				"doctype": "Account Request",
+				"pagetype": "Account Request",
 				"saas": True,
 				"saas_app": app,
 				"erpnext": False,
diff --git a/press/api/selfhosted.py b/press/api/selfhosted.py
index c10f67f4..59307559 100644
--- a/press/api/selfhosted.py
+++ b/press/api/selfhosted.py
@@ -104,7 +104,7 @@ def verify_server(server_type, server_pg):
 		playbook="ping.yml",
 		server=jingrow._dict(
 			{
-				"doctype": "Self Hosted Server",
+				"pagetype": "Self Hosted Server",
 				"name": server_pg.name,
 				"ssh_user": server_pg.ssh_user,
 				"ssh_port": server_pg.ssh_port,
diff --git a/press/api/server.py b/press/api/server.py
index c9e4df5c..0075eeef 100644
--- a/press/api/server.py
+++ b/press/api/server.py
@@ -17,23 +17,23 @@ from jcloude.api.analytics import get_rounded_boundaries
 from jcloude.api.bench import all as all_benches
 from jcloude.api.site import protected
 from jcloude.exceptions import MonitorServerDown
-from jcloude.jcloude.doctype.auto_scale_record.auto_scale_record import validate_scaling_schedule
-from jcloude.jcloude.doctype.site_plan.plan import Plan, filter_by_roles
-from jcloude.jcloude.doctype.team.team import get_child_team_members
+from jcloude.jcloude.pagetype.auto_scale_record.auto_scale_record import validate_scaling_schedule
+from jcloude.jcloude.pagetype.site_plan.plan import Plan, filter_by_roles
+from jcloude.jcloude.pagetype.team.team import get_child_team_members
 from jcloude.utils import get_current_team
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.auto_scale_record.auto_scale_record import AutoScaleRecord
-	from jcloude.jcloude.doctype.cluster.cluster import Cluster
-	from jcloude.jcloude.doctype.database_server.database_server import DatabaseServer
-	from jcloude.jcloude.doctype.server.server import Server
-	from jcloude.jcloude.doctype.server_plan.server_plan import ServerPlan
+	from jcloude.jcloude.pagetype.auto_scale_record.auto_scale_record import AutoScaleRecord
+	from jcloude.jcloude.pagetype.cluster.cluster import Cluster
+	from jcloude.jcloude.pagetype.database_server.database_server import DatabaseServer
+	from jcloude.jcloude.pagetype.server.server import Server
+	from jcloude.jcloude.pagetype.server_plan.server_plan import ServerPlan
 
 
 def poly_get_pg(doctypes, name):
-	for doctype in doctypes:
-		if jingrow.db.exists(doctype, name):
-			return jingrow.get_pg(doctype, name)
+	for pagetype in doctypes:
+		if jingrow.db.exists(pagetype, name):
+			return jingrow.get_pg(pagetype, name)
 	return jingrow.get_pg(doctypes[-1], name)
 
 
@@ -64,9 +64,9 @@ def all(server_filter=None):  # noqa: C901
 	child_teams = [team.name for team in get_child_team_members(team)]
 	teams = [team, *child_teams]
 
-	db_server = jingrow.qb.DocType("Database Server")
-	app_server = jingrow.qb.DocType("Server")
-	res_tag = jingrow.qb.DocType("Resource Tag")
+	db_server = jingrow.qb.PageType("Database Server")
+	app_server = jingrow.qb.PageType("Server")
+	res_tag = jingrow.qb.PageType("Resource Tag")
 
 	if server_filter["server_type"] != "Database Servers":
 		app_server_query = (
@@ -128,7 +128,7 @@ def all(server_filter=None):  # noqa: C901
 @jingrow.whitelist()
 def server_tags():
 	team = get_current_team()
-	return jingrow.get_all("Jcloude Tag", {"team": team, "doctype_name": "Server"}, pluck="tag")
+	return jingrow.get_all("Jcloude Tag", {"team": team, "pagetype_name": "Server"}, pluck="tag")
 
 
 @jingrow.whitelist()
@@ -147,7 +147,7 @@ def get(name):
 			"Cluster", server.cluster, ["name", "title", "image"], as_dict=True
 		),
 		"server_tags": [{"name": x.tag, "tag": x.tag_name} for x in server.tags],
-		"tags": jingrow.get_all("Jcloude Tag", {"team": server.team, "doctype_name": "Server"}, ["name", "tag"]),
+		"tags": jingrow.get_all("Jcloude Tag", {"team": server.team, "pagetype_name": "Server"}, ["name", "tag"]),
 		"type": "database-server" if server.meta.name == "Database Server" else "server",
 	}
 
@@ -585,8 +585,8 @@ def secondary_server_plans(
 	current_plan: str | None = None,
 ):
 	current_price = jingrow.db.get_value("Server Plan", current_plan, "price_inr")
-	ServerPlan = jingrow.qb.DocType("Server Plan")
-	HasRole = jingrow.qb.DocType("Has Role")
+	ServerPlan = jingrow.qb.PageType("Server Plan")
+	HasRole = jingrow.qb.PageType("Has Role")
 	autoscale_discount = jingrow.db.get_single_value("Jcloude Settings", "autoscale_discount")
 
 	query = (
@@ -634,7 +634,7 @@ def plans(name, cluster=None, platform=None):
 		filters.update({"platform": platform})
 
 	return Plan.get_plans(
-		doctype="Server Plan",
+		pagetype="Server Plan",
 		fields=[
 			"name",
 			"title",
@@ -734,7 +734,7 @@ def get_title_and_cluster(name):
 @protected(["Server", "Database Server"])
 def groups(name):
 	server = poly_get_pg(["Server", "Database Server"], name)
-	if server.doctype == "Database Server":
+	if server.pagetype == "Database Server":
 		app_server = jingrow.db.get_value("Server", {"database_server": server.name}, "name")
 		server = jingrow.get_pg("Server", app_server)
 
@@ -805,7 +805,7 @@ def benches_are_idle(server: str, access_token: str) -> None:
 		jingrow.set_user("Administrator")
 		auto_scale_record: "AutoScaleRecord" = jingrow.get_pg(
 			{
-				"doctype": "Auto Scale Record",
+				"pagetype": "Auto Scale Record",
 				"scale_up": False,
 				"scale_down": True,
 				"primary_server": primary_server,
@@ -845,7 +845,7 @@ def schedule_auto_scale(
 	def create_record(action: str, scheduled_time: datetime) -> None:
 		pg = jingrow.get_pg(
 			{
-				"doctype": "Auto Scale Record",
+				"pagetype": "Auto Scale Record",
 				"action": action,
 				"status": "Scheduled",
 				"scheduled_time": scheduled_time,
diff --git a/press/api/site.py b/press/api/site.py
index 7d1ccbd5..56eb0a7f 100644
--- a/press/api/site.py
+++ b/press/api/site.py
@@ -11,7 +11,7 @@ import wrapt
 from boto3 import client
 from botocore.exceptions import ClientError
 from jingrow.core.utils import find
-from jingrow.desk.doctype.tag.tag import add_tag
+from jingrow.desk.pagetype.tag.tag import add_tag
 from jingrow.query_builder import Case
 from jingrow.rate_limiter import rate_limit
 from jingrow.utils import flt, sbool, time_diff_in_hours
@@ -21,16 +21,16 @@ from jingrow.utils.user import is_system_user
 
 from jcloude.access.support_access import has_support_access
 from jcloude.guards import role_guard
-from jcloude.jcloude.doctype.agent_job.agent_job import job_detail
-from jcloude.jcloude.doctype.marketplace_app.marketplace_app import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import job_detail
+from jcloude.jcloude.pagetype.marketplace_app.marketplace_app import (
 	get_plans_for_app,
 	get_total_installs_by_app,
 )
-from jcloude.jcloude.doctype.remote_file.remote_file import get_remote_key
-from jcloude.jcloude.doctype.server.server import is_dedicated_server
-from jcloude.jcloude.doctype.site.site import Site, get_updates_between_current_and_next_apps
-from jcloude.jcloude.doctype.site_plan.plan import Plan
-from jcloude.jcloude.doctype.site_update.site_update import benches_with_available_update
+from jcloude.jcloude.pagetype.remote_file.remote_file import get_remote_key
+from jcloude.jcloude.pagetype.server.server import is_dedicated_server
+from jcloude.jcloude.pagetype.site.site import Site, get_updates_between_current_and_next_apps
+from jcloude.jcloude.pagetype.site_plan.plan import Plan
+from jcloude.jcloude.pagetype.site_update.site_update import benches_with_available_update
 from jcloude.utils import (
 	get_client_blacklisted_keys,
 	get_current_team,
@@ -42,21 +42,21 @@ from jcloude.utils import (
 from jcloude.utils.dns import check_dns_cname_a
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.bench.bench import Bench
-	from jcloude.jcloude.doctype.database_server.database_server import DatabaseServer
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
-	from jcloude.jcloude.doctype.server.server import Server
-	from jcloude.jcloude.doctype.team.team import Team
+	from jcloude.jcloude.pagetype.bench.bench import Bench
+	from jcloude.jcloude.pagetype.database_server.database_server import DatabaseServer
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.server.server import Server
+	from jcloude.jcloude.pagetype.team.team import Team
 
 
 def protected(doctypes):
 	"""
 	This decorator is stupid. It works in magical ways. It checks whether the
-	owner of the Doctype (one of `doctypes`) is the same as the current team.
+	owner of the Pagetype (one of `doctypes`) is the same as the current team.
 
 	The stupid magical part of this decorator is how it gets the name of the
-	Doctype (see: `get_protected_doctype_name`); in order of precedence:
+	Pagetype (see: `get_protected_pagetype_name`); in order of precedence:
 	1. kwargs value with key `name`
 	2. first value in kwargs value with key `filters` i.e. ≈ `kwargs['filters'].values()[0]`
 	3. first value in the args tuple
@@ -77,13 +77,13 @@ def protected(doctypes):
 			return wrapped(*args, **kwargs)
 
 		# Get the name of the document being accessed.
-		if not (docname := get_protected_doctype_name(args, kwargs, doctypes)):
+		if not (docname := get_protected_pagetype_name(args, kwargs, doctypes)):
 			jingrow.throw("Name not found, API access not permitted", jingrow.PermissionError)
 
 		current_team = get_current_team()
-		for doctype in doctypes:
-			document_team = jingrow.db.get_value(doctype, docname, "team")
-			if document_team == current_team or has_support_access(doctype, docname):
+		for pagetype in doctypes:
+			document_team = jingrow.db.get_value(pagetype, docname, "team")
+			if document_team == current_team or has_support_access(pagetype, docname):
 				return wrapped(*args, **kwargs)
 
 		jingrow.throw("Not Permitted", jingrow.PermissionError)
@@ -92,7 +92,7 @@ def protected(doctypes):
 	return wrapper
 
 
-def get_protected_doctype_name(args: list, kwargs: dict, doctypes: list[str]):
+def get_protected_pagetype_name(args: list, kwargs: dict, doctypes: list[str]):
 	# 1. Name from kwargs["name"] or kwargs["pg_name"]
 	if name := (kwargs.get("name") or kwargs.get("pg_name")):
 		return name
@@ -110,8 +110,8 @@ def get_protected_doctype_name(args: list, kwargs: dict, doctypes: list[str]):
 		return None
 
 	# 4. Name from snakecased first `doctypes` name
-	doctype = doctypes[0]
-	key = doctype.lower().replace(" ", "_")
+	pagetype = doctypes[0]
+	key = pagetype.lower().replace(" ", "_")
 	return kwargs.get(key)
 
 
@@ -143,10 +143,10 @@ def _new(site, server: str | None = None, ignore_plan_validation: bool = False):
 
 	cluster = site.get("cluster") or jingrow.db.get_single_value("Jcloude Settings", "cluster")
 
-	Bench = jingrow.qb.DocType("Bench")
-	Server = jingrow.qb.DocType("Server")
-	ProxyServer = jingrow.qb.DocType("Proxy Server")
-	ProxyServerDomain = jingrow.qb.DocType("Proxy Server Domain")
+	Bench = jingrow.qb.PageType("Bench")
+	Server = jingrow.qb.PageType("Server")
+	ProxyServer = jingrow.qb.PageType("Proxy Server")
+	ProxyServerDomain = jingrow.qb.PageType("Proxy Server Domain")
 
 	proxy_servers = (
 		jingrow.qb.from_(ProxyServer)
@@ -184,7 +184,7 @@ def _new(site, server: str | None = None, ignore_plan_validation: bool = False):
 
 	site = jingrow.get_pg(
 		{
-			"doctype": "Site",
+			"pagetype": "Site",
 			"subdomain": site["name"],
 			"domain": domain,
 			"group": group,
@@ -244,8 +244,8 @@ def get_group_for_new_site_and_set_localisation_app(site, apps):
 		pluck="release_group",
 		filters={"parenttype": "Site Plan", "parentfield": "release_groups"},
 	)
-	ReleaseGroup = jingrow.qb.DocType("Release Group")
-	ReleaseGroupApp = jingrow.qb.DocType("Release Group App")
+	ReleaseGroup = jingrow.qb.PageType("Release Group")
+	ReleaseGroupApp = jingrow.qb.PageType("Release Group App")
 	groups = (
 		jingrow.qb.from_(ReleaseGroup)
 		.select(ReleaseGroup.name)
@@ -308,7 +308,7 @@ def get_app_subscriptions(app_plans, team_name: str):
 
 		new_subscription = jingrow.get_pg(
 			{
-				"doctype": "Subscription",
+				"pagetype": "Subscription",
 				"document_type": "Marketplace App",
 				"document_name": app_name,
 				"plan_type": "Marketplace App Plan",
@@ -450,7 +450,7 @@ def domains(name):
 @jingrow.whitelist()
 def activities(filters=None, order_by=None, limit_start=None, limit_page_length=None):
 	# get all site activity except Backup by Administrator
-	SiteActivity = jingrow.qb.DocType("Site Activity")
+	SiteActivity = jingrow.qb.PageType("Site Activity")
 	activities = (
 		jingrow.qb.from_(SiteActivity)
 		.select(SiteActivity.action, SiteActivity.reason, SiteActivity.creation, SiteActivity.owner)
@@ -494,8 +494,8 @@ def app_details_for_new_public_site():
 	if not marketplace_app_sources:
 		return []
 
-	AppSource = jingrow.qb.DocType("App Source")
-	MarketplaceApp = jingrow.qb.DocType("Marketplace App")
+	AppSource = jingrow.qb.PageType("App Source")
+	MarketplaceApp = jingrow.qb.PageType("Marketplace App")
 	app_source_details = (
 		jingrow.qb.from_(AppSource)
 		.select(
@@ -817,7 +817,7 @@ def get_new_site_options(group: str | None = None):
 @jingrow.whitelist()
 def get_site_plans():
 	plans = Plan.get_plans(
-		doctype="Site Plan",
+		pagetype="Site Plan",
 		fields=[
 			"name",
 			"plan_title",
@@ -845,11 +845,11 @@ def get_site_plans():
 
 	filtered_plans = []
 
-	SitePlan = jingrow.qb.DocType("Site Plan")
-	Bench = jingrow.qb.DocType("Bench")
-	ReleaseGroup = jingrow.qb.DocType("Release Group")
-	SitePlanReleaseGroup = jingrow.qb.DocType("Site Plan Release Group")
-	SitePlanAllowedApp = jingrow.qb.DocType("Site Plan Allowed App")
+	SitePlan = jingrow.qb.PageType("Site Plan")
+	Bench = jingrow.qb.PageType("Bench")
+	ReleaseGroup = jingrow.qb.PageType("Release Group")
+	SitePlanReleaseGroup = jingrow.qb.PageType("Site Plan Release Group")
+	SitePlanAllowedApp = jingrow.qb.PageType("Site Plan Allowed App")
 
 	plan_details_query = (
 		jingrow.qb.from_(SitePlan)
@@ -925,7 +925,7 @@ def get_plan_details_dict(plan_details):
 def get_plans(name=None, rg=None):
 	site_name = name
 	plans = Plan.get_plans(
-		doctype="Site Plan",
+		pagetype="Site Plan",
 		fields=[
 			"name",
 			"plan_title",
@@ -982,7 +982,7 @@ def get_plans(name=None, rg=None):
 
 
 def sites_with_recent_activity(sites, limit=3):
-	site_activity = jingrow.qb.DocType("Site Activity")
+	site_activity = jingrow.qb.PageType("Site Activity")
 
 	query = (
 		jingrow.qb.from_(site_activity)
@@ -1022,10 +1022,10 @@ def all(site_filter=None):
 
 
 def get_sites_query(site_filter, benches_with_updates):
-	Site = jingrow.qb.DocType("Site")
-	ReleaseGroup = jingrow.qb.DocType("Release Group")
+	Site = jingrow.qb.PageType("Site")
+	ReleaseGroup = jingrow.qb.PageType("Release Group")
 
-	from jcloude.jcloude.doctype.team.team import get_child_team_members
+	from jcloude.jcloude.pagetype.team.team import get_child_team_members
 
 	team = get_current_team()
 	child_teams = [x.name for x in get_child_team_members(team)]
@@ -1072,7 +1072,7 @@ def get_sites_query(site_filter, benches_with_updates):
 		sites_query = sites_query.where(Site.status != "Archived")
 
 	if site_filter["tag"]:
-		Tag = jingrow.qb.DocType("Resource Tag")
+		Tag = jingrow.qb.PageType("Resource Tag")
 		sites_with_tag = jingrow.qb.from_(Tag).select(Tag.parent).where(Tag.tag_name == site_filter["tag"])
 		sites_query = sites_query.where(Site.name.isin(sites_with_tag))
 	return sites_query
@@ -1081,7 +1081,7 @@ def get_sites_query(site_filter, benches_with_updates):
 @jingrow.whitelist()
 def site_tags():
 	team = get_current_team()
-	return jingrow.get_all("Jcloude Tag", {"team": team, "doctype_name": "Site"}, pluck="tag")
+	return jingrow.get_all("Jcloude Tag", {"team": team, "pagetype_name": "Site"}, pluck="tag")
 
 
 @jingrow.whitelist()
@@ -1170,7 +1170,7 @@ def get(name):
 		],
 		"ip": ip,
 		"site_tags": [{"name": x.tag, "tag": x.tag_name} for x in site.tags],
-		"tags": jingrow.get_all("Jcloude Tag", {"team": team, "doctype_name": "Site"}, ["name", "tag"]),
+		"tags": jingrow.get_all("Jcloude Tag", {"team": team, "pagetype_name": "Site"}, ["name", "tag"]),
 		"info": {
 			"owner": jingrow.db.get_value(
 				"User",
@@ -1249,8 +1249,8 @@ def get_installed_apps(site, query_filters: dict | None = None):
 	bench = jingrow.get_pg("Bench", site.bench)
 	installed_bench_apps = [app for app in bench.apps if app.app in installed_apps]
 
-	AppSource = jingrow.qb.DocType("App Source")
-	MarketplaceApp = jingrow.qb.DocType("Marketplace App")
+	AppSource = jingrow.qb.PageType("App Source")
+	MarketplaceApp = jingrow.qb.PageType("Marketplace App")
 
 	query = (
 		jingrow.qb.from_(AppSource)
@@ -1359,8 +1359,8 @@ def available_apps(name):
 
 	available_sources = []
 
-	AppSource = jingrow.qb.DocType("App Source")
-	MarketplaceApp = jingrow.qb.DocType("Marketplace App")
+	AppSource = jingrow.qb.PageType("App Source")
+	MarketplaceApp = jingrow.qb.PageType("Marketplace App")
 
 	sources = (
 		jingrow.qb.from_(AppSource)
@@ -1605,7 +1605,7 @@ def validate_restoration_space_requirements(
 @jingrow.whitelist(allow_guest=True)
 @rate_limit(limit=10, seconds=60)
 def exists(subdomain, domain):
-	from jcloude.jcloude.doctype.site.site import Site
+	from jcloude.jcloude.pagetype.site.site import Site
 
 	return Site.exists(subdomain, domain)
 
@@ -1809,7 +1809,7 @@ def multipart_exit(file, id, action, parts=None):
 def uploaded_backup_info(file=None, path=None, type=None, size=None, url=None):
 	pg = jingrow.get_pg(
 		{
-			"doctype": "Remote File",
+			"pagetype": "Remote File",
 			"file_name": file,
 			"file_type": type,
 			"file_size": size,
@@ -1818,7 +1818,7 @@ def uploaded_backup_info(file=None, path=None, type=None, size=None, url=None):
 			"bucket": jingrow.db.get_single_value("Jcloude Settings", "remote_uploads_bucket"),
 		}
 	).insert()
-	add_tag("Site Upload", pg.doctype, pg.name)
+	add_tag("Site Upload", pg.pagetype, pg.name)
 	return pg.name
 
 
@@ -1993,8 +1993,8 @@ def change_group_options(name, release_groups=None):
 
 	version = jingrow.db.get_value("Release Group", group, "version")
 
-	Bench = jingrow.qb.DocType("Bench")
-	ReleaseGroup = jingrow.qb.DocType("Release Group")
+	Bench = jingrow.qb.PageType("Bench")
+	ReleaseGroup = jingrow.qb.PageType("Release Group")
 	query = (
 		jingrow.qb.from_(Bench)
 		.select(Bench.group.as_("name"), ReleaseGroup.title)
@@ -2092,7 +2092,7 @@ def change_region(name, cluster, scheduled_datetime=None, skip_failing_patches=F
 
 	site_migration = jingrow.get_pg(
 		{
-			"doctype": "Site Migration",
+			"pagetype": "Site Migration",
 			"site": name,
 			"destination_group": group,
 			"destination_bench": bench,
@@ -2127,8 +2127,8 @@ def get_private_groups_for_upgrade(name, version, release_groups=None):
 		"name",
 	)
 
-	ReleaseGroup = jingrow.qb.DocType("Release Group")
-	ReleaseGroupServer = jingrow.qb.DocType("Release Group Server")
+	ReleaseGroup = jingrow.qb.PageType("Release Group")
+	ReleaseGroupServer = jingrow.qb.PageType("Release Group Server")
 
 	query = (
 		jingrow.qb.from_(ReleaseGroup)
@@ -2160,8 +2160,8 @@ def version_upgrade(
 	next_version = f"Version {int(current_version.split(' ')[1]) + 1}"
 
 	if shared_site or central_site:
-		ReleaseGroup = jingrow.qb.DocType("Release Group")
-		ReleaseGroupServer = jingrow.qb.DocType("Release Group Server")
+		ReleaseGroup = jingrow.qb.PageType("Release Group")
+		ReleaseGroupServer = jingrow.qb.PageType("Release Group Server")
 
 		destination_group = (
 			jingrow.qb.from_(ReleaseGroup)
@@ -2183,7 +2183,7 @@ def version_upgrade(
 
 	version_upgrade = jingrow.get_pg(
 		{
-			"doctype": "Version Upgrade",
+			"pagetype": "Version Upgrade",
 			"site": name,
 			"destination_group": destination_group,
 			"scheduled_time": scheduled_datetime,
@@ -2245,7 +2245,7 @@ def change_server(name, server, scheduled_datetime=None, skip_failing_patches=Fa
 
 	site_migration = jingrow.get_pg(
 		{
-			"doctype": "Site Migration",
+			"pagetype": "Site Migration",
 			"site": name,
 			"destination_bench": bench,
 			"scheduled_time": scheduled_datetime,
diff --git a/press/api/site_backup.py b/press/api/site_backup.py
index c5a95fc4..389a2f74 100644
--- a/press/api/site_backup.py
+++ b/press/api/site_backup.py
@@ -2,10 +2,10 @@ from typing import TYPE_CHECKING
 
 import jingrow
 
-from jcloude.jcloude.doctype.site_backup.site_backup import OngoingSnapshotError
+from jcloude.jcloude.pagetype.site_backup.site_backup import OngoingSnapshotError
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.site_backup.site_backup import SiteBackup
+	from jcloude.jcloude.pagetype.site_backup.site_backup import SiteBackup
 
 from botocore.exceptions import ClientError
 
diff --git a/press/api/site_login.py b/press/api/site_login.py
index 9f41ae59..a7c3ad5a 100644
--- a/press/api/site_login.py
+++ b/press/api/site_login.py
@@ -53,7 +53,7 @@ def sync_product_site_user(**data):
 	else:
 		jingrow.get_pg(
 			{
-				"doctype": "Site User",
+				"pagetype": "Site User",
 				"site": site.name,
 				"user": user_mail,
 				"enabled": enabled,
@@ -108,7 +108,7 @@ def send_otp(email: str):
 	if last_otp and (jingrow.utils.now_datetime() - last_otp).seconds < 30:
 		return jingrow.throw("Please wait for 30 seconds before sending the OTP again")
 
-	session = jingrow.get_pg({"doctype": "Site User Session", "user": email}).insert(ignore_permissions=True)
+	session = jingrow.get_pg({"pagetype": "Site User Session", "user": email}).insert(ignore_permissions=True)
 	return session.send_otp()
 
 
@@ -158,7 +158,7 @@ def login_to_site(email: str, site: str):
 	if not session_id or not isinstance(session_id, str):
 		if jingrow.session.user == "Guest":
 			return jingrow.throw("Invalid session")
-		jingrow.get_pg({"doctype": "Site User Session", "user": email}).insert(ignore_permissions=True)
+		jingrow.get_pg({"pagetype": "Site User Session", "user": email}).insert(ignore_permissions=True)
 
 	site_user_name = jingrow.db.get_value("Site User", {"user": email, "site": site}, "name")
 	if not site_user_name:
diff --git a/press/api/spaces.py b/press/api/spaces.py
index 1b37ccbd..3576f9fa 100644
--- a/press/api/spaces.py
+++ b/press/api/spaces.py
@@ -14,8 +14,8 @@ def spaces(space_filter: Dict | None) -> Dict:
 	if space_filter is None:
 		space_filter = {"status": ""}
 
-	CodeServer = jingrow.qb.DocType("Code Server")
-	ReleaseGroup = jingrow.qb.DocType("Release Group")
+	CodeServer = jingrow.qb.PageType("Code Server")
+	ReleaseGroup = jingrow.qb.PageType("Release Group")
 
 	servers_query = (
 		jingrow.qb.from_(CodeServer)
@@ -133,7 +133,7 @@ def create_code_server(subdomain, domain, bench) -> str:
 
 	code_server = jingrow.get_pg(
 		{
-			"doctype": "Code Server",
+			"pagetype": "Code Server",
 			"subdomain": subdomain,
 			"bench": bench,
 			"domain": domain,
diff --git a/press/api/tests/test_account.py b/press/api/tests/test_account.py
index 08b9eef9..c4974582 100644
--- a/press/api/tests/test_account.py
+++ b/press/api/tests/test_account.py
@@ -4,7 +4,7 @@ from unittest.mock import Mock, patch
 import jingrow
 
 from jcloude.api.account import signup, validate_pincode
-from jcloude.jcloude.doctype.account_request.account_request import AccountRequest
+from jcloude.jcloude.pagetype.account_request.account_request import AccountRequest
 
 
 class TestAccountApi(TestCase):
diff --git a/press/api/tests/test_bench.py b/press/api/tests/test_bench.py
index 860c1f6d..97c51786 100644
--- a/press/api/tests/test_bench.py
+++ b/press/api/tests/test_bench.py
@@ -22,19 +22,19 @@ from jcloude.api.bench import (
 	update_config,
 	update_dependencies,
 )
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.app_release.test_app_release import create_test_app_release
-from jcloude.jcloude.doctype.bench.test_bench import create_test_bench
-from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-from jcloude.jcloude.doctype.jcloude_settings.test_jcloude_settings import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.app_release.test_app_release import create_test_app_release
+from jcloude.jcloude.pagetype.bench.test_bench import create_test_bench
+from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+from jcloude.jcloude.pagetype.jcloude_settings.test_jcloude_settings import (
 	create_test_jcloude_settings,
 )
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.server.test_server import create_test_server
-from jcloude.jcloude.doctype.team.test_team import create_test_jcloude_admin_team
+from jcloude.jcloude.pagetype.server.test_server import create_test_server
+from jcloude.jcloude.pagetype.team.test_team import create_test_jcloude_admin_team
 from jcloude.utils import get_current_team
 from jcloude.utils.test import foreground_enqueue_pg
 
@@ -84,10 +84,10 @@ class TestAPIBench(FrappeTestCase):
 
 	@skip("Local builds deprecated. Builds need to be set for GHA.")
 	@patch(
-		"jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
 	def test_deploy_fn_deploys_bench_container(self):
 		# mark jingrow as approved so that the deploy can happen
 		release = jingrow.get_last_pg("App Release", {"source": self.app_source.name})
@@ -118,11 +118,11 @@ class TestAPIBench(FrappeTestCase):
 		self._check_if_docker_image_was_built(group)
 
 	@patch(
-		"jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	@patch.object(DeployCandidate, "schedule_build_and_deploy", new=MagicMock())
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
 	def test_deploy_and_update_fn_creates_bench_update(self):
 		group = new(
 			{
@@ -148,10 +148,10 @@ class TestAPIBench(FrappeTestCase):
 		self.assertEqual(bu_count_after, bu_count_before + 1)
 
 	@patch(
-		"jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
 	def test_deploy_and_update_fn_fails_without_release_argument(self):
 		group = new(
 			{
@@ -172,7 +172,7 @@ class TestAPIBench(FrappeTestCase):
 			[],
 		)
 
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
 	def test_deploy_fn_fails_without_apps(self):
 		jingrow.set_user(self.team.user)
 		group = new(
@@ -187,7 +187,7 @@ class TestAPIBench(FrappeTestCase):
 		)
 		self.assertRaises(TypeError, deploy, group)
 
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
 	def test_deploy_fn_fails_with_empty_apps(self):
 		jingrow.set_user(self.team.user)
 		group = new(
@@ -555,7 +555,7 @@ class TestAPIBenchConfig(FrappeTestCase):
 
 class TestAPIBenchList(FrappeTestCase):
 	def setUp(self):
-		from jcloude.jcloude.doctype.jcloude_tag.test_jcloude_tag import create_and_add_test_tag
+		from jcloude.jcloude.pagetype.jcloude_tag.test_jcloude_tag import create_and_add_test_tag
 
 		super().setUp()
 
diff --git a/press/api/tests/test_marketplace.py b/press/api/tests/test_marketplace.py
index 2ec1bf95..ac43319c 100644
--- a/press/api/tests/test_marketplace.py
+++ b/press/api/tests/test_marketplace.py
@@ -37,24 +37,24 @@ from jcloude.api.marketplace import (
 	update_app_title,
 	update_publisher_profile,
 )
-from jcloude.marketplace.doctype.marketplace_app_plan.test_marketplace_app_plan import (
+from jcloude.marketplace.pagetype.marketplace_app_plan.test_marketplace_app_plan import (
 	create_test_marketplace_app_plan,
 )
-from jcloude.marketplace.doctype.marketplace_app_subscription.test_marketplace_app_subscription import (
+from jcloude.marketplace.pagetype.marketplace_app_subscription.test_marketplace_app_subscription import (
 	create_test_marketplace_app_subscription,
 )
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.app_release.test_app_release import create_test_app_release
-from jcloude.jcloude.doctype.app_source.test_app_source import create_test_app_source
-from jcloude.jcloude.doctype.marketplace_app.test_marketplace_app import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.app_release.test_app_release import create_test_app_release
+from jcloude.jcloude.pagetype.app_source.test_app_source import create_test_app_source
+from jcloude.jcloude.pagetype.marketplace_app.test_marketplace_app import (
 	create_test_marketplace_app,
 )
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.site.test_site import create_test_bench, create_test_site
-from jcloude.jcloude.doctype.team.test_team import create_test_jcloude_admin_team
+from jcloude.jcloude.pagetype.site.test_site import create_test_bench, create_test_site
+from jcloude.jcloude.pagetype.team.test_team import create_test_jcloude_admin_team
 
 PAYLOAD = [
 	{
diff --git a/press/api/tests/test_server.py b/press/api/tests/test_server.py
index b4b16160..d0734bed 100644
--- a/press/api/tests/test_server.py
+++ b/press/api/tests/test_server.py
@@ -10,18 +10,18 @@ from jingrow.model.naming import make_autoname
 from jingrow.tests.utils import FrappeTestCase
 
 from jcloude.api.server import all, change_plan, new
-from jcloude.jcloude.doctype.ansible_play.test_ansible_play import create_test_ansible_play
-from jcloude.jcloude.doctype.cluster.cluster import Cluster
-from jcloude.jcloude.doctype.cluster.test_cluster import create_test_cluster
-from jcloude.jcloude.doctype.database_server.database_server import DatabaseServer
-from jcloude.jcloude.doctype.proxy_server.test_proxy_server import create_test_proxy_server
-from jcloude.jcloude.doctype.server.server import BaseServer
-from jcloude.jcloude.doctype.team.test_team import create_test_jcloude_admin_team
-from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
-from jcloude.jcloude.doctype.virtual_machine_image.test_virtual_machine_image import (
+from jcloude.jcloude.pagetype.ansible_play.test_ansible_play import create_test_ansible_play
+from jcloude.jcloude.pagetype.cluster.cluster import Cluster
+from jcloude.jcloude.pagetype.cluster.test_cluster import create_test_cluster
+from jcloude.jcloude.pagetype.database_server.database_server import DatabaseServer
+from jcloude.jcloude.pagetype.proxy_server.test_proxy_server import create_test_proxy_server
+from jcloude.jcloude.pagetype.server.server import BaseServer
+from jcloude.jcloude.pagetype.team.test_team import create_test_jcloude_admin_team
+from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
+from jcloude.jcloude.pagetype.virtual_machine_image.test_virtual_machine_image import (
 	create_test_virtual_machine_image,
 )
-from jcloude.jcloude.doctype.virtual_machine_image.virtual_machine_image import (
+from jcloude.jcloude.pagetype.virtual_machine_image.virtual_machine_image import (
 	VirtualMachineImage,
 )
 from jcloude.runner import Ansible
@@ -40,7 +40,7 @@ def create_test_server_plan(
 	title = plan_name
 	plan = jingrow.get_pg(
 		{
-			"doctype": "Server Plan",
+			"pagetype": "Server Plan",
 			"server_type": document_type,
 			"name": plan_name,
 			"title": title,
@@ -78,30 +78,30 @@ def successful_sync(self: VirtualMachine):
 
 
 def successful_ping_ansible(self: BaseServer):
-	create_test_ansible_play("Ping Server", "ping.yml", self.doctype, self.name)
+	create_test_ansible_play("Ping Server", "ping.yml", self.pagetype, self.name)
 
 
 def successful_upgrade_mariadb(self: DatabaseServer):
-	create_test_ansible_play("Upgrade MariaDB", "upgrade_mariadb.yml", self.doctype, self.name)
+	create_test_ansible_play("Upgrade MariaDB", "upgrade_mariadb.yml", self.pagetype, self.name)
 
 
 def successful_upgrade_mariadb_patched(self: DatabaseServer):
 	create_test_ansible_play(
-		"Upgrade MariaDB Patched", "upgrade_mariadb_patched.yml", self.doctype, self.name
+		"Upgrade MariaDB Patched", "upgrade_mariadb_patched.yml", self.pagetype, self.name
 	)
 
 
 def successful_tls_certificate(self: BaseServer):
-	create_test_ansible_play("Setup TLS Certificates", "tls.yml", self.doctype, self.name)
+	create_test_ansible_play("Setup TLS Certificates", "tls.yml", self.pagetype, self.name)
 
 
 def successful_update_agent_ansible(self: BaseServer):
-	create_test_ansible_play("Update Agent", "update_agent.yml", self.doctype, self.name)
+	create_test_ansible_play("Update Agent", "update_agent.yml", self.pagetype, self.name)
 
 
 def successful_wait_for_cloud_init(self: BaseServer):
 	create_test_ansible_play(
-		"Wait for Cloud Init to finish", "wait_for_cloud_init.yml", self.doctype, self.name
+		"Wait for Cloud Init to finish", "wait_for_cloud_init.yml", self.pagetype, self.name
 	)
 
 
@@ -132,8 +132,8 @@ class TestAPIServer(FrappeTestCase):
 		jingrow.set_user("Administrator")
 		jingrow.db.rollback()
 
-	def _get_pg_count(self, doctype: str, status: str, team: str):
-		return jingrow.db.count(doctype, filters={"status": status, "team": team})
+	def _get_pg_count(self, pagetype: str, status: str, team: str):
+		return jingrow.db.count(pagetype, filters={"status": status, "team": team})
 
 	def test_create_new_server_creates_pending_server_and_db_server(self):
 		create_test_virtual_machine_image(cluster=self.cluster, series="m")
@@ -161,7 +161,7 @@ class TestAPIServer(FrappeTestCase):
 		self.assertEqual(db_servers_before + 1, db_servers_after)
 
 	@patch(
-		"jcloude.jcloude.doctype.jcloude_job.jcloude_job.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.jcloude_job.jcloude_job.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	@patch.object(VirtualMachine, "provision", new=successful_provision)
@@ -192,7 +192,7 @@ class TestAPIServer(FrappeTestCase):
 		self.assertEqual(db_servers_before + 1, db_servers_after)
 
 	@patch(
-		"jcloude.jcloude.doctype.jcloude_job.jcloude_job.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.jcloude_job.jcloude_job.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	@patch.object(VirtualMachine, "provision", new=successful_provision)
@@ -295,11 +295,11 @@ class TestAPIServerList(FrappeTestCase):
 	def setUp(self):
 		super().setUp()
 
-		from jcloude.jcloude.doctype.database_server.test_database_server import (
+		from jcloude.jcloude.pagetype.database_server.test_database_server import (
 			create_test_database_server,
 		)
-		from jcloude.jcloude.doctype.jcloude_tag.test_jcloude_tag import create_and_add_test_tag
-		from jcloude.jcloude.doctype.server.test_server import create_test_server
+		from jcloude.jcloude.pagetype.jcloude_tag.test_jcloude_tag import create_and_add_test_tag
+		from jcloude.jcloude.pagetype.server.test_server import create_test_server
 		from jcloude.utils import get_current_team
 
 		proxy_server = create_test_proxy_server()
diff --git a/press/api/tests/test_site.py b/press/api/tests/test_site.py
index 2e6c9469..7be7bdb2 100644
--- a/press/api/tests/test_site.py
+++ b/press/api/tests/test_site.py
@@ -10,30 +10,30 @@ from jingrow.tests.utils import FrappeTestCase
 
 from jcloude.agent import Agent
 from jcloude.api.site import all
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob, poll_pending_jobs
-from jcloude.jcloude.doctype.agent_job.test_agent_job import fake_agent_job
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.app_release.test_app_release import create_test_app_release
-from jcloude.jcloude.doctype.bench.test_bench import create_test_bench
-from jcloude.jcloude.doctype.cluster.test_cluster import create_test_cluster
-from jcloude.jcloude.doctype.deploy_candidate_difference.test_deploy_candidate_difference import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob, poll_pending_jobs
+from jcloude.jcloude.pagetype.agent_job.test_agent_job import fake_agent_job
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.app_release.test_app_release import create_test_app_release
+from jcloude.jcloude.pagetype.bench.test_bench import create_test_bench
+from jcloude.jcloude.pagetype.cluster.test_cluster import create_test_cluster
+from jcloude.jcloude.pagetype.deploy_candidate_difference.test_deploy_candidate_difference import (
 	create_test_deploy_candidate_differences,
 )
-from jcloude.jcloude.doctype.marketplace_app.test_marketplace_app import (
+from jcloude.jcloude.pagetype.marketplace_app.test_marketplace_app import (
 	create_test_marketplace_app,
 )
-from jcloude.jcloude.doctype.proxy_server.test_proxy_server import create_test_proxy_server
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.proxy_server.test_proxy_server import create_test_proxy_server
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 	mock_image_size,
 )
-from jcloude.jcloude.doctype.remote_file.remote_file import RemoteFile
-from jcloude.jcloude.doctype.remote_file.test_remote_file import create_test_remote_file
-from jcloude.jcloude.doctype.root_domain.test_root_domain import create_test_root_domain
-from jcloude.jcloude.doctype.server.test_server import create_test_server
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.site_plan.test_site_plan import create_test_plan
-from jcloude.jcloude.doctype.team.test_team import create_test_jcloude_admin_team
+from jcloude.jcloude.pagetype.remote_file.remote_file import RemoteFile
+from jcloude.jcloude.pagetype.remote_file.test_remote_file import create_test_remote_file
+from jcloude.jcloude.pagetype.root_domain.test_root_domain import create_test_root_domain
+from jcloude.jcloude.pagetype.server.test_server import create_test_server
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.site_plan.test_site_plan import create_test_plan
+from jcloude.jcloude.pagetype.team.test_team import create_test_jcloude_admin_team
 from jcloude.utils.test import foreground_enqueue, foreground_enqueue_pg
 
 
@@ -381,7 +381,7 @@ class TestAPISite(FrappeTestCase):
 				"site_tags": [{"name": x.tag, "tag": x.tag_name} for x in site.tags],
 				"tags": jingrow.get_all(
 					"Jcloude Tag",
-					{"team": self.team.name, "doctype_name": "Site"},
+					{"team": self.team.name, "pagetype_name": "Site"},
 					["name", "tag"],
 				),
 				"pending_for_long": False,
@@ -392,7 +392,7 @@ class TestAPISite(FrappeTestCase):
 		)
 
 	@patch(
-		"jcloude.jcloude.doctype.app_release_difference.app_release_difference.Github",
+		"jcloude.jcloude.pagetype.app_release_difference.app_release_difference.Github",
 		new=MagicMock(),
 	)
 	@patch.object(AgentJob, "enqueue_http_request", new=Mock())
@@ -619,7 +619,7 @@ insights 0.8.3	    HEAD
 
 	@patch.object(RemoteFile, "exists", new=Mock(return_value=True))
 	@patch.object(RemoteFile, "download_link", new="http://test.com")
-	@patch("jcloude.jcloude.doctype.site.site.marketplace_app_hook")
+	@patch("jcloude.jcloude.pagetype.site.site.marketplace_app_hook")
 	def test_restore_job_runs_marketplace_hooks_for_apps_found_in_backup(
 		self, mock_marketplace_app_hook: Mock
 	):
@@ -726,7 +726,7 @@ erpnext 0.8.3	    HEAD
 
 	def test_change_group_changes_group_and_bench_of_site(self):
 		from jcloude.api.site import change_group, change_group_options
-		from jcloude.jcloude.doctype.site_update.site_update import process_update_site_job_update
+		from jcloude.jcloude.pagetype.site_update.site_update import process_update_site_job_update
 
 		app = create_test_app()
 		server = create_test_server()
@@ -764,13 +764,13 @@ erpnext 0.8.3	    HEAD
 		self.assertEqual(site.bench, bench2.name)
 
 	@patch(
-		"jcloude.jcloude.doctype.agent_job.agent_job.process_site_migration_job_update",
+		"jcloude.jcloude.pagetype.agent_job.agent_job.process_site_migration_job_update",
 		new=Mock(),
 	)
-	@patch("jcloude.jcloude.doctype.site.site.create_dns_record", new=Mock())
-	@patch("jcloude.jcloude.doctype.site_migration.site_migration.jingrow.db.commit", new=MagicMock)
-	@patch("jcloude.jcloude.doctype.agent_job.agent_job.jingrow.enqueue_pg", new=foreground_enqueue_pg)
-	@patch("jcloude.jcloude.doctype.agent_job.agent_job.jingrow.enqueue", new=foreground_enqueue)
+	@patch("jcloude.jcloude.pagetype.site.site.create_dns_record", new=Mock())
+	@patch("jcloude.jcloude.pagetype.site_migration.site_migration.jingrow.db.commit", new=MagicMock)
+	@patch("jcloude.jcloude.pagetype.agent_job.agent_job.jingrow.enqueue_pg", new=foreground_enqueue_pg)
+	@patch("jcloude.jcloude.pagetype.agent_job.agent_job.jingrow.enqueue", new=foreground_enqueue)
 	@patch.object(Agent, "get", mock_image_size(3))
 	def test_site_change_region(self):
 		from jcloude.api.site import change_region, change_region_options
@@ -826,7 +826,7 @@ erpnext 0.8.3	    HEAD
 
 	def test_version_upgrade_api_upgrades_site(self):
 		from jcloude.api.site import get_private_groups_for_upgrade, version_upgrade
-		from jcloude.jcloude.doctype.site_update.site_update import process_update_site_job_update
+		from jcloude.jcloude.pagetype.site_update.site_update import process_update_site_job_update
 
 		app = create_test_app()
 		server = create_test_server()
@@ -883,10 +883,10 @@ erpnext 0.8.3	    HEAD
 		self.assertEqual(site_version, v15_group.version)
 
 	@patch(
-		"jcloude.jcloude.doctype.agent_job.agent_job.process_site_migration_job_update",
+		"jcloude.jcloude.pagetype.agent_job.agent_job.process_site_migration_job_update",
 		new=Mock(),
 	)
-	@patch("jcloude.jcloude.doctype.site_migration.site_migration.jingrow.db.commit", new=MagicMock)
+	@patch("jcloude.jcloude.pagetype.site_migration.site_migration.jingrow.db.commit", new=MagicMock)
 	@patch.object(Agent, "get", mock_image_size(3))
 	def test_site_change_server(self):
 		from jcloude.api.site import (
@@ -956,8 +956,8 @@ erpnext 0.8.3	    HEAD
 
 class TestAPISiteList(FrappeTestCase):
 	def setUp(self):
-		from jcloude.jcloude.doctype.jcloude_tag.test_jcloude_tag import create_and_add_test_tag
-		from jcloude.jcloude.doctype.site.test_site import create_test_site
+		from jcloude.jcloude.pagetype.jcloude_tag.test_jcloude_tag import create_and_add_test_tag
+		from jcloude.jcloude.pagetype.site.test_site import create_test_site
 
 		super().setUp()
 
diff --git a/press/api/webhook.py b/press/api/webhook.py
index 1722bb1b..b0b376a8 100644
--- a/press/api/webhook.py
+++ b/press/api/webhook.py
@@ -53,8 +53,8 @@ def attempts(webhook: str):
 	pg = jingrow.get_pg("Jcloude Webhook", webhook)
 	pg.has_permission("read")
 
-	PressWebhookAttempt = jingrow.qb.DocType("Jcloude Webhook Attempt")
-	PressWebhookLog = jingrow.qb.DocType("Jcloude Webhook Log")
+	PressWebhookAttempt = jingrow.qb.PageType("Jcloude Webhook Attempt")
+	PressWebhookLog = jingrow.qb.PageType("Jcloude Webhook Log")
 	query = (
 		jingrow.qb.from_(PressWebhookAttempt)
 		.select(
diff --git a/press/auth.py b/press/auth.py
index 422bf04c..09e0024f 100644
--- a/press/auth.py
+++ b/press/auth.py
@@ -16,10 +16,10 @@ ALLOWED_PATHS = [
 	"/api/method/create-version-upgrade",
 	"/api/method/migrate-to-private-bench",
 	"/api/method/find-my-sites",
-	"/api/method/jingrow.core.doctype.communication.email.mark_email_as_seen",
+	"/api/method/jingrow.core.pagetype.communication.email.mark_email_as_seen",
 	"/api/method/jingrow.realtime.get_user_info",
 	"/api/method/jingrow.realtime.can_subscribe_pg",
-	"/api/method/jingrow.realtime.can_subscribe_doctype",
+	"/api/method/jingrow.realtime.can_subscribe_pagetype",
 	"/api/method/jingrow.realtime.has_permission",
 	"/api/method/jingrow.www.login.login_via_jingrow",
 	"/api/method/jingrow.integrations.oauth2.authorize",
@@ -27,16 +27,16 @@ ALLOWED_PATHS = [
 	"/api/method/jingrow.integrations.oauth2.get_token",
 	"/api/method/jingrow.integrations.oauth2.openid_profile",
 	"/api/method/jingrow.integrations.oauth2_logins.login_via_jingrow",
-	"/api/method/jingrow.website.doctype.web_page_view.web_page_view.make_view_log",
+	"/api/method/jingrow.website.pagetype.web_page_view.web_page_view.make_view_log",
 	"/api/method/jingrow.desk.form.utils.add_comment",
 	"/api/method/get-user-sites-list-for-new-ticket",
 	"/api/method/ping",
 	"/api/method/login",
 	"/api/method/logout",
-	"/api/method/jcloude.jcloude.doctype.razorpay_webhook_log.razorpay_webhook_log.razorpay_webhook_handler",
-	"/api/method/jcloude.jcloude.doctype.razorpay_webhook_log.razorpay_webhook_log.razorpay_authorized_payment_handler",
-	"/api/method/jcloude.jcloude.doctype.stripe_webhook_log.stripe_webhook_log.stripe_webhook_handler",
-	"/api/method/jcloude.jcloude.doctype.drip_email.drip_email.unsubscribe",
+	"/api/method/jcloude.jcloude.pagetype.razorpay_webhook_log.razorpay_webhook_log.razorpay_webhook_handler",
+	"/api/method/jcloude.jcloude.pagetype.razorpay_webhook_log.razorpay_webhook_log.razorpay_authorized_payment_handler",
+	"/api/method/jcloude.jcloude.pagetype.stripe_webhook_log.stripe_webhook_log.stripe_webhook_handler",
+	"/api/method/jcloude.jcloude.pagetype.drip_email.drip_email.unsubscribe",
 	"/api/method/upload_file",
 	"/api/method/jingrow.search.web_search",
 	"/api/method/jingrow.email.queue.unsubscribe",
@@ -44,9 +44,9 @@ ALLOWED_PATHS = [
 	"/api/method/validate_plan_change",
 	"/api/method/marketplace-apps",
 	"/api/method/jcloude.www.dashboard.get_context_for_dev",
-	"/api/method/jingrow.website.doctype.web_form.web_form.accept",
-	"/api/method/jingrow.core.doctype.user.user.test_password_strength",
-	"/api/method/jingrow.core.doctype.user.user.update_password",
+	"/api/method/jingrow.website.pagetype.web_form.web_form.accept",
+	"/api/method/jingrow.core.pagetype.user.user.test_password_strength",
+	"/api/method/jingrow.core.pagetype.user.user.update_password",
 	"/api/method/get_central_migration_data",
 ]
 
diff --git a/press/bootstrap.py b/press/bootstrap.py
index 1b583100..0f41a992 100644
--- a/press/bootstrap.py
+++ b/press/bootstrap.py
@@ -87,7 +87,7 @@ def setup_root_domain(settings):
 	else:
 		domain = jingrow.get_pg(
 			{
-				"doctype": "Root Domain",
+				"pagetype": "Root Domain",
 				"name": ROOT_DOMAIN,
 				"default_cluster": "Default",
 				"aws_access_key_id": AWS_ACCESS_KEY_ID,
@@ -119,7 +119,7 @@ def setup_stripe(settings):
 def setup_registry(settings):
 	registry = jingrow.get_pg(
 		{
-			"doctype": "Registry Server",
+			"pagetype": "Registry Server",
 			"hostname": "registry",
 			"ip": "10.0.4.101",
 			"private_ip": "10.1.4.101",
@@ -140,7 +140,7 @@ def setup_registry(settings):
 def setup_logging(settings):
 	log = jingrow.get_pg(
 		{
-			"doctype": "Log Server",
+			"pagetype": "Log Server",
 			"hostname": "log",
 			"ip": "10.0.4.102",
 			"private_ip": "10.1.4.102",
@@ -156,7 +156,7 @@ def setup_logging(settings):
 def setup_monitoring(settings):
 	monitor = jingrow.get_pg(
 		{
-			"doctype": "Monitor Server",
+			"pagetype": "Monitor Server",
 			"hostname": "monitor",
 			"ip": "10.0.4.103",
 			"private_ip": "10.1.4.103",
@@ -169,7 +169,7 @@ def setup_monitoring(settings):
 
 	jingrow.get_pg(
 		{
-			"doctype": "Telegram Group",
+			"pagetype": "Telegram Group",
 			"name": "Alerts",
 			"chat_id": TELEGRAM_CHAT_ID,
 		}
@@ -186,7 +186,7 @@ def setup_tracing(settings):
 	redirect_uri = f"https://trace.{ROOT_DOMAIN}/auth/sso/"
 	oauth_client = jingrow.get_pg(
 		{
-			"doctype": "OAuth Client",
+			"pagetype": "OAuth Client",
 			"app_name": "Sentry",
 			"scopes": "all openid email",
 			"default_redirect_uri": redirect_uri,
@@ -197,7 +197,7 @@ def setup_tracing(settings):
 
 	jingrow.get_pg(
 		{
-			"doctype": "Trace Server",
+			"pagetype": "Trace Server",
 			"hostname": "trace",
 			"ip": "10.0.4.105",
 			"private_ip": "10.1.4.105",
@@ -225,7 +225,7 @@ def setup_agent(settings):
 def setup_proxy_server():
 	jingrow.get_pg(
 		{
-			"doctype": "Proxy Server",
+			"pagetype": "Proxy Server",
 			"hostname": "n1",
 			"ip": "10.0.1.101",
 			"private_ip": "10.1.1.101",
@@ -236,7 +236,7 @@ def setup_proxy_server():
 def setup_database_server():
 	jingrow.get_pg(
 		{
-			"doctype": "Database Server",
+			"pagetype": "Database Server",
 			"title": "First - Database",
 			"hostname": "m1",
 			"ip": "10.0.3.101",
@@ -248,7 +248,7 @@ def setup_database_server():
 def setup_server():
 	jingrow.get_pg(
 		{
-			"doctype": "Server",
+			"pagetype": "Server",
 			"title": "First - Application",
 			"hostname": "f1",
 			"ip": "10.0.2.101",
@@ -275,7 +275,7 @@ def setup():
 
 def setup_teams():
 	from jcloude.api.account import signup
-	from jcloude.jcloude.doctype.team.team import Team
+	from jcloude.jcloude.pagetype.team.team import Team
 
 	signup("cloud@erpnext.com")
 	request = jingrow.get_all(
@@ -300,7 +300,7 @@ def setup_plans():
 			continue
 		jingrow.get_pg(
 			{
-				"doctype": "Site Plan",
+				"pagetype": "Site Plan",
 				"name": plan[0],
 				"document_type": "Site",
 				"plan_title": plan[0],
@@ -320,11 +320,11 @@ def setup_plans():
 
 def setup_apps():
 	app = jingrow.get_pg(
-		{"doctype": "App", "name": "jingrow", "title": "Jingrow Framework", "jingrow": True}
+		{"pagetype": "App", "name": "jingrow", "title": "Jingrow Framework", "jingrow": True}
 	).insert()
 	source = jingrow.get_pg(
 		{
-			"doctype": "App Source",
+			"pagetype": "App Source",
 			"app": app.name,
 			"branch": "develop",
 			"repository_url": "http://git.jingrow.com/jingrow/jingrow",
@@ -335,7 +335,7 @@ def setup_apps():
 	).insert()
 	jingrow.get_pg(
 		{
-			"doctype": "Release Group",
+			"pagetype": "Release Group",
 			"title": "Jingrow",
 			"version": "Nightly",
 			"team": "Administrator",
diff --git a/press/commands.py b/press/commands.py
index cd8654f1..f10bba2a 100644
--- a/press/commands.py
+++ b/press/commands.py
@@ -30,7 +30,7 @@ def start_ngrok_and_set_webhook(context):
 	print(f"Inspect logs at {tunnel.api_url}")
 
 	stripe = get_stripe()
-	url = f"{public_url}/api/method/jcloude.jcloude.doctype.stripe_webhook_log.stripe_webhook_log.stripe_webhook_handler"
+	url = f"{public_url}/api/method/jcloude.jcloude.pagetype.stripe_webhook_log.stripe_webhook_log.stripe_webhook_handler"
 	stripe.WebhookEndpoint.modify(
 		jingrow.db.get_single_value("Jcloude Settings", "stripe_webhook_endpoint_id"), url=url
 	)
diff --git a/press/config/press.py b/press/config/press.py
index d8ae4019..2f9687f8 100755
--- a/press/config/press.py
+++ b/press/config/press.py
@@ -6,46 +6,46 @@ def get_data():
 		{
 			"label": _("Components"),
 			"items": [
-				{"type": "doctype", "name": "Proxy Server"},
-				{"type": "doctype", "name": "Server"},
-				{"type": "doctype", "name": "Bench"},
-				{"type": "doctype", "name": "Site"},
-				{"type": "doctype", "name": "Account Request"},
+				{"type": "pagetype", "name": "Proxy Server"},
+				{"type": "pagetype", "name": "Server"},
+				{"type": "pagetype", "name": "Bench"},
+				{"type": "pagetype", "name": "Site"},
+				{"type": "pagetype", "name": "Account Request"},
 			],
 		},
 		{
 			"label": _("Agent"),
 			"items": [
-				{"type": "doctype", "name": "Agent Job"},
-				{"type": "doctype", "name": "Agent Job Step"},
-				{"type": "doctype", "name": "Agent Job Type"},
+				{"type": "pagetype", "name": "Agent Job"},
+				{"type": "pagetype", "name": "Agent Job Step"},
+				{"type": "pagetype", "name": "Agent Job Type"},
 			],
 		},
 		{
 			"label": _("Setup"),
 			"items": [
-				{"type": "doctype", "name": "Site Plan"},
-				{"type": "doctype", "name": "App"},
-				{"type": "doctype", "name": "Release Group"},
-				{"type": "doctype", "name": "App Release"},
-				{"type": "doctype", "name": "Deploy Candidate"},
+				{"type": "pagetype", "name": "Site Plan"},
+				{"type": "pagetype", "name": "App"},
+				{"type": "pagetype", "name": "Release Group"},
+				{"type": "pagetype", "name": "App Release"},
+				{"type": "pagetype", "name": "Deploy Candidate"},
 			],
 		},
-		{"label": _("Domains"), "items": [{"type": "doctype", "name": "Custom Domain"}]},
+		{"label": _("Domains"), "items": [{"type": "pagetype", "name": "Custom Domain"}]},
 		{
 			"label": _("Payments"),
 			"items": [
-				{"type": "doctype", "name": "Credit Ledger Entry"},
-				{"type": "doctype", "name": "Payment"},
-				{"type": "doctype", "name": "Payment Provision"},
-				{"type": "doctype", "name": "Usage Report"},
+				{"type": "pagetype", "name": "Credit Ledger Entry"},
+				{"type": "pagetype", "name": "Payment"},
+				{"type": "pagetype", "name": "Payment Provision"},
+				{"type": "pagetype", "name": "Usage Report"},
 			],
 		},
 		{
 			"label": _("Deploy"),
 			"items": [
-				{"type": "doctype", "name": "Site Deploy"},
-				{"type": "doctype", "name": "Bench Deploy"},
+				{"type": "pagetype", "name": "Site Deploy"},
+				{"type": "pagetype", "name": "Bench Deploy"},
 			],
 		},
 	]
diff --git a/press/experimental/doctype/referral_bonus/referral_bonus.json b/press/experimental/doctype/referral_bonus/referral_bonus.json
index cb164a81..4dbe3b17 100644
--- a/press/experimental/doctype/referral_bonus/referral_bonus.json
+++ b/press/experimental/doctype/referral_bonus/referral_bonus.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2021-11-10 12:24:19.654513",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/fixtures/agent_job_type.json b/press/fixtures/agent_job_type.json
index f2405544..656165d5 100644
--- a/press/fixtures/agent_job_type.json
+++ b/press/fixtures/agent_job_type.json
@@ -2,7 +2,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-10-03 22:47:23.455192",
   "name": "Purge Binlogs By Size Limit",
@@ -20,7 +20,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-09-18 11:29:00.663542",
   "name": "Fetch Performance Report",
@@ -35,7 +35,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-08-20 12:32:56.100866",
   "name": "Update In Place",
@@ -62,7 +62,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:30:45.774660",
   "name": "Add Domain to Upstream",
@@ -80,7 +80,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:31:04.900402",
   "name": "Rename Upstream",
@@ -98,7 +98,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-08-09 10:07:51.319214",
   "name": "Rename Site",
@@ -137,7 +137,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.549528",
   "name": "Recover Failed Site Migration",
@@ -158,7 +158,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.927111",
   "name": "Add Domain",
@@ -179,7 +179,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.946695",
   "name": "Remove Domain",
@@ -200,7 +200,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.762138",
   "name": "Update Site Pull",
@@ -233,7 +233,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.585210",
   "name": "Update Site Migrate",
@@ -284,7 +284,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:31:19.098278",
   "name": "Add Host to Proxy",
@@ -302,7 +302,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:30:58.966717",
   "name": "Add Code Server to Upstream",
@@ -320,7 +320,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:31:02.250356",
   "name": "Remove Code Server from Upstream",
@@ -338,7 +338,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.724970",
   "name": "Setup Code Server",
@@ -362,7 +362,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.707766",
   "name": "Start Code Server",
@@ -377,7 +377,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.743617",
   "name": "Stop Code Server",
@@ -392,7 +392,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.690936",
   "name": "Archive Code Server",
@@ -413,7 +413,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:31:25.211737",
   "name": "Add Upstream to Proxy",
@@ -431,7 +431,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.677444",
   "name": "Install App on Site",
@@ -446,7 +446,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.839292",
   "name": "New Site from Backup",
@@ -491,7 +491,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.690831",
   "name": "Reinstall Site",
@@ -506,7 +506,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:31:16.373344",
   "name": "Update Site Status",
@@ -524,7 +524,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.740351",
   "name": "Uninstall App from Site",
@@ -539,7 +539,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.805097",
   "name": "Recover Failed Site Pull",
@@ -566,7 +566,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.786058",
   "name": "Recover Failed Site Update",
@@ -581,7 +581,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.625189",
   "name": "Recover Failed Site Migrate",
@@ -614,7 +614,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.911153",
   "name": "Migrate Site",
@@ -629,7 +629,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.963183",
   "name": "Fetch Sites Info",
@@ -644,7 +644,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:31:13.199172",
   "name": "Setup Redirects on Hosts",
@@ -665,7 +665,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:32:08.070490",
   "name": "Remove Redirects on Hosts",
@@ -680,7 +680,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:31:37.960124",
   "name": "Rename Site on Upstream",
@@ -704,7 +704,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:31:08.101647",
   "name": "Add Wildcard Hosts to Proxy",
@@ -722,7 +722,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.180358",
   "name": "Setup ERPNext",
@@ -740,7 +740,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.157390",
   "name": "Clear Cache",
@@ -758,7 +758,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.203468",
   "name": "Restore Site Tables",
@@ -776,7 +776,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.283667",
   "name": "Add User to Proxy",
@@ -797,7 +797,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.308026",
   "name": "Remove User from Proxy",
@@ -815,7 +815,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.327716",
   "name": "Add User to ProxySQL",
@@ -830,7 +830,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.345276",
   "name": "Remove User from ProxySQL",
@@ -845,7 +845,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.362722",
   "name": "Create Minio User",
@@ -866,7 +866,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.379874",
   "name": "Remove Minio User",
@@ -881,7 +881,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.392780",
   "name": "Enable Minio User",
@@ -896,7 +896,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.405690",
   "name": "Disable Minio User",
@@ -911,7 +911,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.256524",
   "name": "Cleanup Unused Files",
@@ -932,7 +932,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.446023",
   "name": "Add Backend to ProxySQL",
@@ -947,7 +947,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.419313",
   "name": "Update Saas Plan",
@@ -962,7 +962,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.502147",
   "name": "Run After Migrate Steps",
@@ -989,7 +989,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.531987",
   "name": "Move Site to Bench",
@@ -1025,7 +1025,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.556954",
   "name": "Reset Site Usage",
@@ -1040,7 +1040,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:30:48.708856",
   "name": "Reload NGINX Job",
@@ -1055,7 +1055,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.725087",
   "name": "Backup Site",
@@ -1073,7 +1073,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.432717",
   "name": "Bench Restart",
@@ -1088,7 +1088,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.568610",
   "name": "Archive Bench",
@@ -1106,7 +1106,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.023648",
   "name": "New Bench",
@@ -1130,7 +1130,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.845251",
   "name": "Force Update Bench Limits",
@@ -1151,7 +1151,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.822202",
   "name": "Update Bench Configuration",
@@ -1178,7 +1178,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.803361",
   "name": "Rebuild Bench Assets",
@@ -1193,7 +1193,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:19.861985",
   "name": "Optimize Tables",
@@ -1208,7 +1208,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-02-22 20:01:05.606166",
   "name": "Docker Image Build",
@@ -1223,7 +1223,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-02-27 13:51:17.142316",
   "name": "Patch App",
@@ -1244,7 +1244,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-03-19 11:40:26.237476",
   "name": "Call Bench Supervisorctl",
@@ -1259,7 +1259,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-03-26 10:28:39.750285",
   "name": "Run Remote Builder",
@@ -1280,7 +1280,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-07-11 12:04:37.550558",
   "name": "Add Database Index",
@@ -1295,7 +1295,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-06-30 07:28:18.839292",
   "name": "Restore Site",
@@ -1340,7 +1340,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-07-18 17:49:54.294402",
   "name": "Column Statistics",
@@ -1355,7 +1355,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-08-09 12:03:58.145567",
   "name": "Complete Setup Wizard",
@@ -1370,7 +1370,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-06-11 19:43:45.877056",
   "name": "Create User",
@@ -1385,7 +1385,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2024-08-09 10:10:41.301700",
   "name": "New Site",
@@ -1418,7 +1418,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:31:21.921498",
   "name": "Add Site to Upstream",
@@ -1436,7 +1436,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.663533",
   "name": "Update Site Configuration",
@@ -1451,7 +1451,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:31:59.636070",
   "name": "Remove Site from Upstream",
@@ -1466,7 +1466,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2023-11-06 07:28:18.510770",
   "name": "Archive Site",
@@ -1487,7 +1487,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-09-10 12:11:38.844112",
   "name": "Recover Update In Place",
@@ -1511,7 +1511,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-09-11 13:28:32.120581",
   "name": "Ping Job",
@@ -1526,7 +1526,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-08-20 12:51:05.293373",
   "name": "Update Bench In Place",
@@ -1553,7 +1553,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 1,
   "modified": "2024-11-04 14:49:18.592247",
   "name": "Create Database User",
@@ -1568,7 +1568,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 1,
   "modified": "2024-11-04 14:49:18.592247",
   "name": "Remove Database User",
@@ -1583,7 +1583,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 1,
   "modified": "2024-11-04 14:49:18.592247",
   "name": "Modify Database User Permissions",
@@ -1598,7 +1598,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 1,
   "modified": "2024-10-28 14:49:19.894247",
   "name": "Fetch Database Table Schema",
@@ -1613,7 +1613,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2024-12-19 17:21:14.136650",
   "name": "Analyze Slow Queries",
@@ -1628,7 +1628,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-05-02 15:31:19.602466",
   "name": "Physical Backup Database",
@@ -1664,7 +1664,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-03-17 17:57:23.072792",
   "name": "Physical Restore Database",
@@ -1718,7 +1718,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-05-02 15:31:19.602466",
   "name": "Activate Site",
@@ -1733,7 +1733,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-05-02 15:31:19.602466",
   "name": "Deactivate Site",
@@ -1751,7 +1751,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-05-19 15:37:53.073108",
   "name": "Upload Binlogs To S3",
@@ -1766,7 +1766,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-05-08 15:21:19.528916",
   "name": "Add Binlogs To Indexer",
@@ -1781,7 +1781,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-05-08 15:22:23.850136",
   "name": "Remove Binlogs From Indexer",
@@ -1796,7 +1796,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-08-05 14:07:23.501949",
   "name": "Backup Files From Snapshot",
@@ -1814,7 +1814,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-08-05 14:07:58.293257",
   "name": "Backup Database From Snapshot",
@@ -1832,7 +1832,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-08-05 20:16:42.601645",
   "name": "Search Sites In Snapshot",
@@ -1847,7 +1847,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-10-03 18:02:49.847351",
   "name": "Change Bench Directory",
@@ -1874,7 +1874,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-10-03 18:02:49.847351",
   "name": "Stop Bench Workers",
@@ -1889,7 +1889,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-10-03 18:02:49.847351",
   "name": "Add Servers to ACL",
@@ -1904,7 +1904,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-10-03 18:02:49.847351",
   "name": "Remove Servers from ACL",
@@ -1919,7 +1919,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-10-03 18:02:49.847351",
   "name": "Start Bench Workers",
@@ -1934,7 +1934,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-10-03 18:02:49.847351",
   "name": "Force Remove All Benches",
@@ -1949,7 +1949,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 6,
   "modified": "2025-05-22 18:31:51.223187",
   "name": "Remove Host from Proxy",
@@ -1964,7 +1964,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-02-05 19:21:12.508888",
   "name": "Run SQL Queries",
@@ -1979,7 +1979,7 @@
  {
   "disabled_auto_retry": 0,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-08-18 11:45:06.868487",
   "name": "Update Database Host",
@@ -1994,7 +1994,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-11-24 16:48:21.908330",
   "name": "Update Database Schema Sizes",
@@ -2012,7 +2012,7 @@
  {
   "disabled_auto_retry": 1,
   "docstatus": 0,
-  "doctype": "Agent Job Type",
+  "pagetype": "Agent Job Type",
   "max_retry_count": 3,
   "modified": "2025-11-28 22:48:21.908330",
   "name": "Add Auto Scale Site to Upstream",
@@ -2030,7 +2030,7 @@
 {
  "disabled_auto_retry": 1,
  "docstatus": 0,
- "doctype": "Agent Job Type",
+ "pagetype": "Agent Job Type",
  "max_retry_count": 3,
  "modified": "2025-11-28 22:48:21.908330",
  "name": "Remove Auto Scale Site from Upstream",
@@ -2048,7 +2048,7 @@
 {
  "disabled_auto_retry": 1,
  "docstatus": 0,
- "doctype": "Agent Job Type",
+ "pagetype": "Agent Job Type",
  "max_retry_count": 3,
  "modified": "2025-12-09 22:48:21.908330",
  "name": "Push Images to Registry",
@@ -2063,7 +2063,7 @@
 {
  "disabled_auto_retry": 1,
  "docstatus": 0,
- "doctype": "Agent Job Type",
+ "pagetype": "Agent Job Type",
  "max_retry_count": 3,
  "modified": "2025-12-09 22:48:21.908330",
  "name": "Remove Redis Localhost Bind",
diff --git a/press/fixtures/bench_dependency.json b/press/fixtures/bench_dependency.json
index 9a2c6f4c..5a482f45 100644
--- a/press/fixtures/bench_dependency.json
+++ b/press/fixtures/bench_dependency.json
@@ -1,7 +1,7 @@
 [
 	{
 		"docstatus": 0,
-		"doctype": "Bench Dependency",
+		"pagetype": "Bench Dependency",
 		"internal": 0,
 		"modified": "2023-09-26 19:45:32.017532",
 		"name": "PYTHON_VERSION",
@@ -47,7 +47,7 @@
 	},
 	{
 		"docstatus": 0,
-		"doctype": "Bench Dependency",
+		"pagetype": "Bench Dependency",
 		"internal": 0,
 		"modified": "2023-10-06 15:45:18.593014",
 		"name": "NODE_VERSION",
@@ -81,7 +81,7 @@
 	},
 	{
 		"docstatus": 0,
-		"doctype": "Bench Dependency",
+		"pagetype": "Bench Dependency",
 		"internal": 0,
 		"modified": "2023-09-27 09:37:02.358511",
 		"name": "WKHTMLTOPDF_VERSION",
@@ -131,7 +131,7 @@
 	},
 	{
 		"docstatus": 0,
-		"doctype": "Bench Dependency",
+		"pagetype": "Bench Dependency",
 		"internal": 0,
 		"modified": "2023-10-28 22:08:23.853052",
 		"name": "BENCH_VERSION",
@@ -205,7 +205,7 @@
 	},
 	{
 		"docstatus": 0,
-		"doctype": "Bench Dependency",
+		"pagetype": "Bench Dependency",
 		"internal": 1,
 		"modified": "2023-09-26 15:46:26.816012",
 		"name": "NVM_VERSION",
@@ -235,7 +235,7 @@
 	},
 	{
 		"docstatus": 0,
-		"doctype": "Bench Dependency",
+		"pagetype": "Bench Dependency",
 		"internal": 0,
 		"modified": "2025-10-28 13:41:43.998929",
 		"name": "PIP_VERSION",
diff --git a/press/fixtures/cloud_region.json b/press/fixtures/cloud_region.json
index 162f4a6a..09b207fb 100644
--- a/press/fixtures/cloud_region.json
+++ b/press/fixtures/cloud_region.json
@@ -1,7 +1,7 @@
 [
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:33:57.631284",
   "name": "ap-south-1",
   "provider": "AWS EC2",
@@ -9,7 +9,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:06.958325",
   "name": "eu-west-2",
   "provider": "AWS EC2",
@@ -17,7 +17,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:15.834702",
   "name": "eu-central-2",
   "provider": "AWS EC2",
@@ -25,7 +25,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:23.204769",
   "name": "ap-southeast-1",
   "provider": "AWS EC2",
@@ -33,7 +33,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:40.385001",
   "name": "me-south-1",
   "provider": "AWS EC2",
@@ -41,7 +41,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:53.773228",
   "name": "af-south-1",
   "provider": "AWS EC2",
@@ -49,7 +49,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:59.528123",
   "name": "us-east-1",
   "provider": "AWS EC2",
@@ -57,7 +57,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2025-07-12 12:34:59.528123",
   "name": "us-west-1",
   "provider": "AWS EC2",
@@ -65,7 +65,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2023-08-08 12:34:33.152010",
   "name": "eu-central-1",
   "provider": "AWS EC2",
@@ -73,7 +73,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2024-09-23 10:47:04.247556",
   "name": "fsn1",
   "provider": "Hetzner",
@@ -81,7 +81,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2024-09-23 10:48:01.851504",
   "name": "sin",
   "provider": "Hetzner",
@@ -89,7 +89,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2024-09-23 10:47:41.953263",
   "name": "ash",
   "provider": "Hetzner",
@@ -97,7 +97,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Cloud Region",
+  "pagetype": "Cloud Region",
   "modified": "2024-09-23 10:48:48.686461",
   "name": "nbg1",
   "provider": "Hetzner",
diff --git a/press/fixtures/frappe_version.json b/press/fixtures/frappe_version.json
index 8a477818..f8b73e1c 100644
--- a/press/fixtures/frappe_version.json
+++ b/press/fixtures/frappe_version.json
@@ -46,7 +46,7 @@
    }
   ],
   "docstatus": 0,
-  "doctype": "Jingrow Version",
+  "pagetype": "Jingrow Version",
   "modified": "2024-06-27 14:45:44.660933",
   "name": "Version 12",
   "number": 12,
@@ -100,7 +100,7 @@
    }
   ],
   "docstatus": 0,
-  "doctype": "Jingrow Version",
+  "pagetype": "Jingrow Version",
   "modified": "2025-05-23 11:09:57.983138",
   "name": "Version 13",
   "number": 13,
@@ -154,7 +154,7 @@
    }
   ],
   "docstatus": 0,
-  "doctype": "Jingrow Version",
+  "pagetype": "Jingrow Version",
   "modified": "2025-05-23 11:09:57.983138",
   "name": "Nightly",
   "number": 15,
@@ -208,7 +208,7 @@
    }
   ],
   "docstatus": 0,
-  "doctype": "Jingrow Version",
+  "pagetype": "Jingrow Version",
   "modified": "2025-05-23 11:09:57.983138",
   "name": "Version 14",
   "number": 14,
@@ -262,7 +262,7 @@
    }
   ],
   "docstatus": 0,
-  "doctype": "Jingrow Version",
+  "pagetype": "Jingrow Version",
   "modified": "2025-05-23 11:09:57.983138",
   "name": "Version 15",
   "number": 15,
@@ -316,7 +316,7 @@
      }
     ],
     "docstatus": 0,
-    "doctype": "Jingrow Version",
+    "pagetype": "Jingrow Version",
     "modified": "2025-05-23 11:09:57.983138",
     "name": "Version 16 Beta",
     "number": 16,
diff --git a/press/fixtures/mariadb_variable.json b/press/fixtures/mariadb_variable.json
index b9d331d9..ab0a6f14 100644
--- a/press/fixtures/mariadb_variable.json
+++ b/press/fixtures/mariadb_variable.json
@@ -5,7 +5,7 @@
   "default_value": "",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2025-06-19 12:04:20.157326",
   "name": "connect_timeout",
@@ -19,7 +19,7 @@
   "default_value": "5120",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:51:29.101315",
   "name": "tmp_disk_table_size",
@@ -33,7 +33,7 @@
   "default_value": "5",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:52:00.473677",
   "name": "extra_max_connections",
@@ -47,7 +47,7 @@
   "default_value": null,
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-01-12 14:21:03.949888",
   "name": "max_user_connections",
@@ -61,7 +61,7 @@
   "default_value": null,
   "pg_section": "replication-and-binary-log",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-03-05 12:59:31.069472",
   "name": "binlog_expire_logs_seconds",
@@ -75,7 +75,7 @@
   "default_value": "32",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-06-12 10:30:47.403256",
   "name": "max_heap_table_size",
@@ -89,7 +89,7 @@
   "default_value": "",
   "pg_section": "replication-and-binary-log",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2023-08-03 14:20:47.702196",
   "name": "expire_logs_days",
@@ -103,7 +103,7 @@
   "default_value": "37",
   "pg_section": "innodb",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2023-09-15 15:21:13.086214",
   "name": "innodb_old_blocks_pct",
@@ -117,7 +117,7 @@
   "default_value": "/var/lib/mysql/mysql-bin",
   "pg_section": "replication-and-binary-log",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-06-15 14:41:09.156699",
   "name": "log_bin",
@@ -131,7 +131,7 @@
   "default_value": "5000",
   "pg_section": "innodb",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:50:46.547631",
   "name": "innodb_old_blocks_time",
@@ -145,7 +145,7 @@
   "default_value": "512",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:51:34.994866",
   "name": "max_allowed_packet",
@@ -159,7 +159,7 @@
   "default_value": "3600",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:50:58.514076",
   "name": "max_statement_time",
@@ -173,7 +173,7 @@
   "default_value": "ON",
   "pg_section": "innodb",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-12-04 16:30:16.720727",
   "name": "innodb_print_all_deadlocks",
@@ -187,7 +187,7 @@
   "default_value": null,
   "pg_section": "innodb",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-08-31 13:53:59.926965",
   "name": "innodb_strict_mode",
@@ -201,7 +201,7 @@
   "default_value": "50",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-08-14 15:54:38.037523",
   "name": "innodb_lock_wait_timeout",
@@ -215,7 +215,7 @@
   "default_value": "600",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2025-04-09 15:51:36.032112",
   "name": "wait_timeout",
@@ -229,7 +229,7 @@
   "default_value": null,
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-10-09 09:00:46.202412",
   "name": "net_buffer_length",
@@ -243,7 +243,7 @@
   "default_value": null,
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-10-21 13:02:20.343316",
   "name": "net_read_timeout",
@@ -257,7 +257,7 @@
   "default_value": null,
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-10-21 13:03:05.958798",
   "name": "net_write_timeout",
@@ -271,7 +271,7 @@
   "default_value": "FORCE",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2024-11-22 12:31:31.593757",
   "name": "myisam_recover_options",
@@ -285,7 +285,7 @@
   "default_value": "3307",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2024-11-22 12:52:35.958089",
   "name": "extra_port",
@@ -299,7 +299,7 @@
   "default_value": "MIXED",
   "pg_section": "replication-and-binary-log",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2024-12-12 12:59:33.579411",
   "name": "binlog_format",
@@ -313,7 +313,7 @@
   "default_value": null,
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2025-01-13 12:24:41.969815",
   "name": "long_query_time",
@@ -327,7 +327,7 @@
   "default_value": null,
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2025-01-24 15:40:01.244238",
   "name": "tmpdir",
@@ -341,7 +341,7 @@
   "default_value": "ON",
   "pg_section": "innodb",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2025-03-04 16:43:33.176673",
   "name": "innodb_status_output_locks",
@@ -355,7 +355,7 @@
   "default_value": "OFF",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.851892",
   "name": "performance-schema-consumer-events-statements-history",
@@ -369,7 +369,7 @@
   "default_value": "OFF",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.784028",
   "name": "performance-schema-consumer-events-stages-history",
@@ -383,7 +383,7 @@
   "default_value": "OFF",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.766945",
   "name": "performance-schema-consumer-events-stages-current",
@@ -397,7 +397,7 @@
   "default_value": "0",
   "pg_section": "innodb",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2025-08-04 14:05:52.103303",
   "name": "innodb_force_recovery",
@@ -411,7 +411,7 @@
   "default_value": "200",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2024-11-22 12:50:54.084797",
   "name": "max_connections",
@@ -425,7 +425,7 @@
   "default_value": null,
   "pg_section": "innodb",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2025-03-25 18:23:56.552855",
   "name": "innodb_buffer_pool_size",
@@ -439,7 +439,7 @@
   "default_value": "32",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2025-03-25 18:23:37.525777",
   "name": "key_buffer_size",
@@ -453,7 +453,7 @@
   "default_value": "256",
   "pg_section": "innodb",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2025-04-14 16:31:30.382561",
   "name": "innodb_stats_persistent_sample_pages",
@@ -467,7 +467,7 @@
   "default_value": null,
   "pg_section": "innodb",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2025-05-15 18:00:12.351782",
   "name": "innodb_log_file_size",
@@ -481,7 +481,7 @@
   "default_value": "OFF",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2025-08-07 18:07:57.776120",
   "name": "read_only",
@@ -495,7 +495,7 @@
   "default_value": "OFF",
   "pg_section": "replication-and-binary-log",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2025-11-07 17:00:51.114771",
   "name": "log_slave_updates",
@@ -509,7 +509,7 @@
   "default_value": null,
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 1,
   "modified": "2025-12-10 19:16:12.127930",
   "name": "tmp_table_size",
@@ -523,7 +523,7 @@
   "default_value": "OFF",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.987419",
   "name": "performance-schema-consumer-events-waits-history-long",
@@ -537,7 +537,7 @@
   "default_value": "OFF",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.971205",
   "name": "performance-schema-consumer-events-waits-history",
@@ -551,7 +551,7 @@
   "default_value": "OFF",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.951921",
   "name": "performance-schema-consumer-events-waits-current",
@@ -565,7 +565,7 @@
   "default_value": "OFF",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.870716",
   "name": "performance-schema-consumer-events-statements-history-long",
@@ -579,7 +579,7 @@
   "default_value": "OFF",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.833060",
   "name": "performance-schema-consumer-events-statements-current",
@@ -593,7 +593,7 @@
   "default_value": "OFF",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.809367",
   "name": "performance-schema-consumer-events-stages-history-long",
@@ -607,7 +607,7 @@
   "default_value": "\"\"",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 17:55:19.751992",
   "name": "performance-schema-instrument",
@@ -621,7 +621,7 @@
   "default_value": "0",
   "pg_section": "server",
   "docstatus": 0,
-  "doctype": "MariaDB Variable",
+  "pagetype": "MariaDB Variable",
   "dynamic": 0,
   "modified": "2023-07-27 18:21:51.984252",
   "name": "performance_schema",
diff --git a/press/fixtures/press_job_type.json b/press/fixtures/press_job_type.json
index 2c552f88..70efadbb 100644
--- a/press/fixtures/press_job_type.json
+++ b/press/fixtures/press_job_type.json
@@ -3,7 +3,7 @@
   "callback_max_retry": 5,
   "callback_script": "snapshot = jingrow.get_pg(\"Server Snapshot\", arguments.get(\"server_snapshot\"))\nif pg.server_type == \"Server\":\n\tsnapshot.resume_app_server_services()\nelif pg.server_type == \"Database Server\":\n\tsnapshot.resume_database_server_services()\n\nif pg.status == \"Failure\":\n    jingrow.db.set_value(\"Server Snapshot\", snapshot.name, \"status\", \"Failure\", update_modified=False)\n    for s in snapshot.snapshots:\n        try:\n            jingrow.get_pg(\"Virtual Disk Snapshot\", s).delete_snapshot()\n        except:\n            pass\n        \nelse:\n    snapshot.sync(now=False)",
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-09-24 16:33:10.530624",
   "name": "Snapshot Disk",
   "steps": [
@@ -38,7 +38,7 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-08-12 16:24:10.555919",
   "name": "Attach Volume",
   "steps": [
@@ -53,7 +53,7 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-01-02 15:33:27.252601",
   "name": "Resize Server",
   "steps": [
@@ -103,7 +103,7 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2024-02-05 17:08:00.514456",
   "name": "Create Server Snapshot",
   "steps": [
@@ -143,7 +143,7 @@
   "callback_max_retry": 0,
   "callback_script": "server = jingrow.get_pg(pg.server_type, pg.server)\n\nif pg.server_type in [\"Server\", \"Database Server\"] and server.is_for_recovery:\n    filter_field = \"app_server\" if pg.server_type == \"Server\" else \"database_server\"\n    recovery_record_name = jingrow.db.get_value(\"Server Snapshot Recovery\", {filter_field: pg.server}, \"name\")\n    if recovery_record_name:\n        recovery_record = jingrow.get_pg(\"Server Snapshot Recovery\", recovery_record_name, for_update=True)\n    \n        if pg.status == \"Success\":\n            if pg.server_type == \"Server\":\n                recovery_record.app_server_archived = True\n            else:\n                recovery_record.database_server_archived = True\n            recovery_record.save()",
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-09-08 11:42:40.490054",
   "name": "Archive Server",
   "steps": [
@@ -168,7 +168,7 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2024-01-05 13:40:21.038901",
   "name": "Upgrade MariaDB",
   "steps": [
@@ -203,7 +203,7 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-02-14 14:30:00.676187",
   "name": "Increase Disk Size",
   "steps": [
@@ -243,12 +243,12 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-11-12 09:35:41.121169",
   "name": "Prune Docker system",
   "steps": [
    {
-    "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Jcloude Settings\").telegram_message\ntelegram_message.enqueue(f\"Pruning docker cache on [{server.name}]({jingrow.utils.get_url_to_form(server.doctype, server.name)})\", \"Information\")\nserver.prune_docker_system()",
+    "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Jcloude Settings\").telegram_message\ntelegram_message.enqueue(f\"Pruning docker cache on [{server.name}]({jingrow.utils.get_url_to_form(server.pagetype, server.name)})\", \"Information\")\nserver.prune_docker_system()",
     "step_name": "Prune Docker system",
     "wait_until_true": 0
    },
@@ -263,12 +263,12 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-11-12 09:35:21.819679",
   "name": "Increase Swap",
   "steps": [
    {
-    "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Jcloude Settings\").telegram_message\ntelegram_message.enqueue(f\"Increasing swap on [{server.name}]({jingrow.utils.get_url_to_form(server.doctype, server.name)})\", \"Information\")\nserver.increase_swap(4)",
+    "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Jcloude Settings\").telegram_message\ntelegram_message.enqueue(f\"Increasing swap on [{server.name}]({jingrow.utils.get_url_to_form(server.pagetype, server.name)})\", \"Information\")\nserver.increase_swap(4)",
     "step_name": "Add swap on server",
     "wait_until_true": 0
    },
@@ -283,7 +283,7 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2024-12-06 10:59:08.032149",
   "name": "Stop and Start Server",
   "steps": [
@@ -318,12 +318,12 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-11-12 09:34:59.467479",
   "name": "Reset Swap",
   "steps": [
    {
-    "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Jcloude Settings\").telegram_message\ntelegram_message.enqueue(f\"Resetting swap on [{server.name}]({jingrow.utils.get_url_to_form(server.doctype, server.name)})\", \"Information\")\nserver.reset_swap()",
+    "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Jcloude Settings\").telegram_message\ntelegram_message.enqueue(f\"Resetting swap on [{server.name}]({jingrow.utils.get_url_to_form(server.pagetype, server.name)})\", \"Information\")\nserver.reset_swap()",
     "step_name": "Reset swap on server",
     "wait_until_true": 0
    },
@@ -338,7 +338,7 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-07-11 15:20:56.780290",
   "name": "Warn disk at 80%",
   "steps": [
@@ -353,7 +353,7 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-07-25 21:43:11.895128",
   "name": "Trigger Build Server Cleanup",
   "steps": [
@@ -368,7 +368,7 @@
   "callback_max_retry": 0,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-08-31 20:54:46.857348",
   "name": "Create Server (old)",
   "steps": [
@@ -408,7 +408,7 @@
     "wait_until_true": 1
    },
    {
-    "script": "server = jingrow.get_pg(pg.server_type, pg.server)\nif server.provider == \"Hetzner\" :\n    if server.doctype == \"Server\":\n        server.setup_docker()\n    elif server.doctype == \"Database Server\":\n        server.set_mariadb_mount_dependency()\n        ",
+    "script": "server = jingrow.get_pg(pg.server_type, pg.server)\nif server.provider == \"Hetzner\" :\n    if server.pagetype == \"Server\":\n        server.setup_docker()\n    elif server.pagetype == \"Database Server\":\n        server.set_mariadb_mount_dependency()\n        ",
     "step_name": "Configure apps for mounts",
     "wait_until_true": 0
    },
@@ -453,7 +453,7 @@
   "callback_max_retry": 0,
   "callback_script": "",
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-09-08 11:36:55.450275",
   "name": "Resume Services After Snapshot",
   "steps": [
@@ -473,7 +473,7 @@
   "callback_max_retry": 1,
   "callback_script": "server = jingrow.get_pg(pg.server_type, pg.server)\n\nif pg.server_type in [\"Server\", \"Database Server\"] and server.is_for_recovery:\n    filter_field = \"app_server\" if pg.server_type == \"Server\" else \"database_server\"\n    recovery_record_name = jingrow.db.get_value(\"Server Snapshot Recovery\", {filter_field: pg.server}, \"name\")\n    if recovery_record_name:\n        recovery_record = jingrow.get_pg(\"Server Snapshot Recovery\", recovery_record_name, for_update=True)\n    \n        if pg.status == \"Success\":\n            if pg.server_type == \"Server\":\n                recovery_record.is_app_server_ready = True\n            else:\n                recovery_record.is_database_server_ready = True\n            recovery_record.save()\n        else:\n            recovery_record.mark_server_provisioning_as_failed()\n            \nif pg.server_type in [\"Server\", \"Database Server\"] and \"logical_replication_backup\" in arguments:\n    if pg.status == \"Success\":\n        jingrow.get_pg(\"Logical Replication Backup\", arguments.get(\"logical_replication_backup\")).next()\n    if pg.status == \"Failure\":\n        jingrow.get_pg(\"Logical Replication Backup\", arguments.get(\"logical_replication_backup\")).fail()",
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-10-18 20:59:59.413236",
   "name": "Create Server",
   "steps": [
@@ -548,7 +548,7 @@
     "wait_until_true": 1
    },
    {
-    "script": "server = jingrow.get_pg(pg.server_type, pg.server)\nif server.provider == \"Hetzner\" :\n    if server.doctype == \"Server\":\n        server.setup_docker()\n    elif server.doctype == \"Database Server\":\n        server.set_mariadb_mount_dependency()",
+    "script": "server = jingrow.get_pg(pg.server_type, pg.server)\nif server.provider == \"Hetzner\" :\n    if server.pagetype == \"Server\":\n        server.setup_docker()\n    elif server.pagetype == \"Database Server\":\n        server.set_mariadb_mount_dependency()",
     "step_name": "Configure apps for mounts (Hetzner)",
     "wait_until_true": 0
    },
@@ -613,7 +613,7 @@
     "wait_until_true": 0
    },
    {
-    "script": "if pg.server.startswith(\"fs\") and pg.server_type == \"Server\":\n    primary_server = jingrow.db.get_value(\"Server\", pg.server, \"primary\")\n    nfs_volume_attachment = jingrow.get_pg(\n\t    {\"doctype\": \"NFS Volume Attachment\", \"primary_server\": primary_server}\n    )\n    nfs_volume_attachment.insert(ignore_permissions=True)\n    jingrow.db.commit()",
+    "script": "if pg.server.startswith(\"fs\") and pg.server_type == \"Server\":\n    primary_server = jingrow.db.get_value(\"Server\", pg.server, \"primary\")\n    nfs_volume_attachment = jingrow.get_pg(\n\t    {\"pagetype\": \"NFS Volume Attachment\", \"primary_server\": primary_server}\n    )\n    nfs_volume_attachment.insert(ignore_permissions=True)\n    jingrow.db.commit()",
     "step_name": "Share benches over NFS",
     "wait_until_true": 0
    }
@@ -623,7 +623,7 @@
   "callback_max_retry": 1,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-11-12 11:06:08.243873",
   "name": "Prune Mirror Registry",
   "steps": [
@@ -638,7 +638,7 @@
   "callback_max_retry": 1,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-12-18 15:28:08.243873",
   "name": "Auto Scale Up Application Server",
   "steps": [
@@ -653,7 +653,7 @@
   "callback_max_retry": 1,
   "callback_script": null,
   "docstatus": 0,
-  "doctype": "Jcloude Job Type",
+  "pagetype": "Jcloude Job Type",
   "modified": "2025-12-18 15:28:08.243873",
   "name": "Auto Scale Down Application Server",
   "steps": [
diff --git a/press/fixtures/press_method_permission.json b/press/fixtures/press_method_permission.json
index 2497fd5d..1f938741 100644
--- a/press/fixtures/press_method_permission.json
+++ b/press/fixtures/press_method_permission.json
@@ -2,7 +2,7 @@
  {
   "checkbox_label": "View",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Server",
   "method": "jcloude.api.server.overview",
   "modified": "2023-10-30 00:06:29.049045",
@@ -11,7 +11,7 @@
  {
   "checkbox_label": "Reboot",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Server",
   "method": "jcloude.api.server.reboot",
   "modified": "2023-10-28 20:24:00.088011",
@@ -20,7 +20,7 @@
  {
   "checkbox_label": "Login as Admin",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.login",
   "modified": "2023-09-04 21:22:19.952471",
@@ -29,7 +29,7 @@
  {
   "checkbox_label": "Database Access",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.enable_database_access",
   "modified": "2023-09-04 22:20:23.131654",
@@ -38,7 +38,7 @@
  {
   "checkbox_label": "Update",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Release Group",
   "method": "jcloude.api.bench.update",
   "modified": "2023-08-09 23:22:21.493409",
@@ -47,7 +47,7 @@
  {
   "checkbox_label": "Update",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.update",
   "modified": "2023-08-09 23:22:16.445271",
@@ -56,7 +56,7 @@
  {
   "checkbox_label": "View",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.overview",
   "modified": "2023-10-30 00:28:47.065270",
@@ -65,7 +65,7 @@
  {
   "checkbox_label": "Restore",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.restore",
   "modified": "2023-08-10 23:21:37.969947",
@@ -74,7 +74,7 @@
  {
   "checkbox_label": "Migrate",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.migrate",
   "modified": "2023-09-25 11:41:46.915505",
@@ -83,7 +83,7 @@
  {
   "checkbox_label": "View",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Release Group",
   "method": "jcloude.api.bench.get",
   "modified": "2023-08-11 11:08:02.298748",
@@ -92,7 +92,7 @@
  {
   "checkbox_label": "Update",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.update",
   "modified": "2023-08-11 11:14:41.597516",
@@ -101,7 +101,7 @@
  {
   "checkbox_label": "Deploy",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Release Group",
   "method": "jcloude.api.bench.deploy_and_update",
   "modified": "2023-08-16 00:02:26.396406",
@@ -110,7 +110,7 @@
  {
   "checkbox_label": "Archive",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.archive",
   "modified": "2023-09-25 21:34:34.964150",
@@ -119,7 +119,7 @@
  {
   "checkbox_label": "Reset",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.reset",
   "modified": "2023-09-25 21:36:30.485983",
@@ -128,7 +128,7 @@
  {
   "checkbox_label": "Deactivate",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.deactivate",
   "modified": "2023-09-25 21:36:56.303022",
@@ -137,7 +137,7 @@
  {
   "checkbox_label": "SSH Access",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Release Group",
   "method": "jcloude.api.bench.generate_certificate",
   "modified": "2023-09-25 21:40:01.706266",
@@ -146,7 +146,7 @@
  {
   "checkbox_label": "Restart",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Release Group",
   "method": "jcloude.api.bench.restart",
   "modified": "2023-09-25 21:40:40.280318",
@@ -155,7 +155,7 @@
  {
   "checkbox_label": "Change Plan",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.change_plan",
   "modified": "2023-09-25 21:42:47.001379",
@@ -164,7 +164,7 @@
  {
   "checkbox_label": "Download Backups",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Site",
   "method": "jcloude.api.site.get_backup_link",
   "modified": "2023-09-25 21:46:24.621413",
@@ -173,7 +173,7 @@
  {
   "checkbox_label": "View",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Database Server",
   "method": "jcloude.api.server.overview",
   "modified": "2023-10-30 00:06:13.793641",
@@ -182,7 +182,7 @@
  {
   "checkbox_label": "Drop",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Server",
   "method": "jcloude.api.server.archive",
   "modified": "2023-10-30 00:04:57.685127",
@@ -191,7 +191,7 @@
  {
   "checkbox_label": "Drop",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Database Server",
   "method": "jcloude.api.server.archive",
   "modified": "2023-10-30 00:05:06.341786",
@@ -200,7 +200,7 @@
  {
   "checkbox_label": "Reboot",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Database Server",
   "method": "jcloude.api.server.reboot",
   "modified": "2023-10-30 00:05:29.046083",
@@ -209,7 +209,7 @@
  {
   "checkbox_label": "View",
   "docstatus": 0,
-  "doctype": "Jcloude Method Permission",
+  "pagetype": "Jcloude Method Permission",
   "document_type": "Marketplace App",
   "method": "jcloude.api.marketplace.get_app",
   "modified": "2023-10-30 00:15:04.814190",
diff --git a/press/fixtures/press_webhook_event.json b/press/fixtures/press_webhook_event.json
index 35fa8423..500f2f4b 100644
--- a/press/fixtures/press_webhook_event.json
+++ b/press/fixtures/press_webhook_event.json
@@ -2,7 +2,7 @@
  {
   "description": "Get notified for changes in the site's subscription plan",
   "docstatus": 0,
-  "doctype": "Jcloude Webhook Event",
+  "pagetype": "Jcloude Webhook Event",
   "enabled": 1,
   "modified": "2024-09-23 12:06:21.293809",
   "name": "Site Plan Change",
@@ -11,7 +11,7 @@
  {
   "description": "Pending, Installing, Updating, Active, Inactive, Broken, Archived, Suspended",
   "docstatus": 0,
-  "doctype": "Jcloude Webhook Event",
+  "pagetype": "Jcloude Webhook Event",
   "enabled": 1,
   "modified": "2024-09-23 11:47:30.206054",
   "name": "Site Status Update",
@@ -20,7 +20,7 @@
  {
   "description": "Draft, Scheduled, Pending, Preparing, Running, Success, Failure",
   "docstatus": 0,
-  "doctype": "Jcloude Webhook Event",
+  "pagetype": "Jcloude Webhook Event",
   "enabled": 1,
   "modified": "2025-04-09 12:16:17.266946",
   "name": "Bench Deploy Status Update",
@@ -29,7 +29,7 @@
  {
   "description": "Pending, Installing, Updating, Active, Broken, Archived",
   "docstatus": 0,
-  "doctype": "Jcloude Webhook Event",
+  "pagetype": "Jcloude Webhook Event",
   "enabled": 1,
   "modified": "2024-09-23 12:16:32.881258",
   "name": "Bench Status Update",
diff --git a/press/fixtures/print_format.json b/press/fixtures/print_format.json
index c7839cdc..d70bc1ab 100644
--- a/press/fixtures/print_format.json
+++ b/press/fixtures/print_format.json
@@ -7,7 +7,7 @@
   "disabled": 0,
   "pg_type": "Invoice",
   "docstatus": 0,
-  "doctype": "Print Format",
+  "pagetype": "Print Format",
   "font": "Default",
   "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"Custom HTML\", \"options\": \"{% set months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] %}\\n\\n<div style=\\\"margin-bottom: 30px; margin-top: 12px; font-size: 16px;\\\">\\n    Invoice for {{ months[pg.month - 1] }} {{ pg.year}} billing period\\n</div>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<div>\\n    <label>From</label>\\n    <div>\\n        Jingrow Technologies Pvt. Ltd.<br>\\n        D/324, Neelkanth Business Park,<br>\\n        Vidyavihar (W), Mumbai 4000 86, India.\\n    </div>\\n</div>\\n\\n<div style=\\\"margin-top: 15px;\\\">\\n    <label>Bill To</label>\\n    <div>\\n        {% set address = jingrow.db.get_value('Team', pg.team, 'billing_address') %}\\n        {{ jingrow.get_pg('Address', address).get_display() if address else '' }}\\n    </div>\\n</div>\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"{% set details = {\\n    'Invoice': pg.name,\\n    'Payment due on': jingrow.utils.global_date_format(pg.due_date)\\n} %}\\n{% for d in details %}\\n<div class=\\\"row\\\">\\n    <div class=\\\"col-xs-6\\\">\\n        <label>{{ d }}</label>\\n    </div>\\n    <div class=\\\"col-xs-6 text-right\\\">\\n        {{ details[d] }}\\n    </div>\\n</div>\\n{% endfor %}\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<h2 style=\\\"margin: 30px 0;\\\">\\n  Total due {{ pg.get_formatted('amount_due') }} on {{\\n  jingrow.utils.global_date_format(pg.due_date) }}\\n</h2>\\n\\n<h4>Usage Charges</h4>\\n\\n<table class=\\\"table\\\" style=\\\"width: 100%; margin-top: 0;\\\">\\n  <thead>\\n    <tr>\\n      <th>Site</th>\\n      <th>Plan</th>\\n      <th class=\\\"text-right\\\">Days</th>\\n      <th class=\\\"text-right\\\">Amount</th>\\n    </tr>\\n  </thead>\\n  <tbody>\\n    {% for row in pg.site_usage %} {% set lineitem = pg.items[loop.index - 1]\\n    %}\\n    <tr>\\n      <td>{{ row.site }}</td>\\n      <td>{{ jingrow.db.get_value('Plan', row.plan, 'plan_title') }}</td>\\n      <td class=\\\"text-right\\\">{{ jingrow.utils.cint(row.days_active) }}</td>\\n      <td class=\\\"text-right\\\">{{ lineitem.get_formatted('amount') }}</td>\\n    </tr>\\n    {% endfor %}\\n  </tbody>\\n  <tr>\\n    <td colspan=\\\"4\\\"></td>\\n  </tr>\\n  <tr>\\n    <td colspan=\\\"3\\\" class=\\\"text-right\\\" style=\\\"font-weight: bold;\\\">\\n      Total\\n    </td>\\n    <td class=\\\"text-right\\\">{{ pg.get_formatted('total') }}</td>\\n  </tr>\\n  {% if pg.amount_due > 0 %}\\n  <tr>\\n    <td colspan=\\\"3\\\" class=\\\"text-right\\\" style=\\\"font-weight: bold;\\\">\\n      Applied Credit Balance\\n    </td>\\n    <td class=\\\"text-right\\\">{{ pg.get_formatted('starting_balance') }}</td>\\n  </tr>\\n  <tr>\\n    <td colspan=\\\"3\\\" class=\\\"text-right\\\" style=\\\"font-weight: bold;\\\">\\n      Amount Due\\n    </td>\\n    <td class=\\\"text-right\\\">{{ pg.get_formatted('amount_due') }}</td>\\n  </tr>\\n  {% endif %}\\n</table>\\n\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Stripe Billing\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<div style=\\\"margin-top: 50px;\\\">\\n    If you have added a card on file, then it will automatically be charged.<br> If not, pay using the following link: {{ pg.stripe_invoice_url }}\\n</div>\"}]",
   "html": null,
diff --git a/press/fixtures/role.json b/press/fixtures/role.json
index 0de6224a..d51dec5f 100644
--- a/press/fixtures/role.json
+++ b/press/fixtures/role.json
@@ -5,7 +5,7 @@
   "desk_access": 0,
   "disabled": 0,
   "docstatus": 0,
-  "doctype": "Role",
+  "pagetype": "Role",
   "form_sidebar": 0,
   "home_page": null,
   "is_custom": 0,
@@ -26,7 +26,7 @@
   "desk_access": 0,
   "disabled": 0,
   "docstatus": 0,
-  "doctype": "Role",
+  "pagetype": "Role",
   "form_sidebar": 0,
   "home_page": null,
   "is_custom": 0,
@@ -47,7 +47,7 @@
   "desk_access": 0,
   "disabled": 0,
   "docstatus": 0,
-  "doctype": "Role",
+  "pagetype": "Role",
   "form_sidebar": 0,
   "home_page": null,
   "is_custom": 0,
@@ -66,7 +66,7 @@
   "desk_access": 1,
   "disabled": 0,
   "docstatus": 0,
-  "doctype": "Role",
+  "pagetype": "Role",
   "home_page": null,
   "is_custom": 0,
   "modified": "2025-08-20 19:55:50.325493",
diff --git a/press/fixtures/server_snapshot_plan.json b/press/fixtures/server_snapshot_plan.json
index 396df4a2..15598420 100644
--- a/press/fixtures/server_snapshot_plan.json
+++ b/press/fixtures/server_snapshot_plan.json
@@ -1,7 +1,7 @@
 [
  {
   "docstatus": 0,
-  "doctype": "Server Snapshot Plan",
+  "pagetype": "Server Snapshot Plan",
   "enabled": 1,
   "modified": "2025-08-02 03:22:41.159681",
   "name": "EBS Snapshot Plan",
diff --git a/press/fixtures/server_storage_plan.json b/press/fixtures/server_storage_plan.json
index 76dcdb17..44f72056 100644
--- a/press/fixtures/server_storage_plan.json
+++ b/press/fixtures/server_storage_plan.json
@@ -1,7 +1,7 @@
 [
  {
   "docstatus": 0,
-  "doctype": "Server Storage Plan",
+  "pagetype": "Server Storage Plan",
   "enabled": 1,
   "modified": "2024-06-27 12:34:02.292945",
   "name": "Add-on Storage plan",
diff --git a/press/fixtures/site_config_key.json b/press/fixtures/site_config_key.json
index 4b62bd7c..5099691d 100644
--- a/press/fixtures/site_config_key.json
+++ b/press/fixtures/site_config_key.json
@@ -2,7 +2,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "dropbox_secret_key",
   "modified": "2020-09-15 14:08:54.908669",
@@ -16,7 +16,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "google_analytics_id",
   "modified": "2020-09-23 13:20:06.853336",
@@ -30,7 +30,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "server_script_enabled",
   "modified": "2020-09-23 13:19:31.392060",
@@ -44,7 +44,7 @@
  {
   "description": "For MixPanel analytics on desk",
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mixpanel_id",
   "modified": "2020-09-23 13:20:06.665519",
@@ -58,7 +58,7 @@
  {
   "description": "Utilise jingrow.debug_log via jingrow.log to enable different levels of logging. At level 2, shows queries and results run at every action.",
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "logging",
   "modified": "2020-09-15 15:04:51.652890",
@@ -72,7 +72,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "paypal_password",
   "modified": "2020-09-15 14:08:54.811020",
@@ -86,7 +86,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_scheduler",
   "modified": "2020-09-23 13:19:29.813690",
@@ -100,7 +100,7 @@
  {
   "description": "Skips socket.IO setup on frontend",
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_async",
   "modified": "2020-09-23 13:19:29.424739",
@@ -114,7 +114,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mail_server",
   "modified": "2020-09-23 13:20:09.314591",
@@ -128,7 +128,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "pause_scheduler",
   "modified": "2020-09-23 13:19:31.595626",
@@ -142,7 +142,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "email_sender_name",
   "modified": "2020-09-23 13:20:09.161227",
@@ -156,7 +156,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_api_secret",
   "modified": "2020-09-15 14:08:01.105018",
@@ -170,7 +170,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "error_report_email",
   "modified": "2020-09-23 13:20:09.049932",
@@ -184,7 +184,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mail_login",
   "modified": "2020-09-23 13:20:08.959200",
@@ -198,7 +198,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_api_key",
   "modified": "2020-09-23 13:20:08.873969",
@@ -212,7 +212,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "dropbox_broker_site",
   "modified": "2020-09-23 13:20:06.896234",
@@ -226,7 +226,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "dropbox_access_key",
   "modified": "2020-09-23 13:20:08.191030",
@@ -240,7 +240,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mail_password",
   "modified": "2020-09-15 16:24:58.138559",
@@ -254,7 +254,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_publishable_key",
   "modified": "2020-09-23 13:20:08.046283",
@@ -268,7 +268,7 @@
  {
   "description": "Load Data from local infile for mysql",
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "local_infile",
   "modified": "2020-09-23 13:20:07.338841",
@@ -282,7 +282,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "paypal_username",
   "modified": "2020-09-23 13:20:07.720966",
@@ -296,7 +296,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_session_cache",
   "modified": "2020-09-23 13:19:30.483940",
@@ -310,7 +310,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_api_password",
   "modified": "2020-09-15 14:08:54.867414",
@@ -324,7 +324,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "always_use_account_email_id_as_sender",
   "modified": "2020-09-23 13:19:31.704114",
@@ -338,7 +338,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mail_port",
   "modified": "2020-09-23 13:20:07.292141",
@@ -352,7 +352,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "use_tls",
   "modified": "2020-09-23 13:19:31.190810",
@@ -366,7 +366,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "skip_setup_wizard",
   "modified": "2020-09-23 13:19:30.992492",
@@ -380,7 +380,7 @@
  {
   "description": "",
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "ignore_csrf",
   "modified": "2020-09-23 13:19:29.953144",
@@ -394,7 +394,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_global_search",
   "modified": "2020-09-23 13:19:30.364289",
@@ -408,7 +408,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_error_snapshot",
   "modified": "2020-09-23 13:19:30.291418",
@@ -422,7 +422,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_api_username",
   "modified": "2020-09-23 13:20:06.789882",
@@ -436,7 +436,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "deny_multiple_sessions",
   "modified": "2020-09-23 13:19:30.124051",
@@ -450,7 +450,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "use_ssl",
   "modified": "2020-09-23 13:19:30.603957",
@@ -464,7 +464,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "sandbox_signature",
   "modified": "2020-09-23 13:20:07.221238",
@@ -478,7 +478,7 @@
  {
   "description": "for RazorPay Settings",
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "converted_rupee_to_paisa",
   "modified": "2020-09-23 13:19:29.608942",
@@ -492,7 +492,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "auto_email_id",
   "modified": "2020-09-23 13:20:08.539873",
@@ -506,7 +506,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 1,
   "key": "host_name",
   "modified": "2020-09-23 13:20:07.065755",
@@ -520,7 +520,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "always_use_account_name_as_sender_name",
   "modified": "2020-09-23 13:19:30.881690",
@@ -534,7 +534,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "paypal_signature",
   "modified": "2020-09-23 13:20:06.930263",
@@ -548,7 +548,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "disable_website_cache",
   "modified": "2020-09-23 13:19:30.743853",
@@ -562,7 +562,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "pop_timeout",
   "modified": "2020-09-15 13:39:59.489299",
@@ -576,7 +576,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "data_import_batch_size",
   "modified": "2020-09-15 13:39:45.559768",
@@ -590,7 +590,7 @@
  {
   "description": "Key used to encrypt Passwords",
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "encryption_key",
   "modified": "2020-09-15 14:54:18.042444",
@@ -604,7 +604,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "mute_emails",
   "modified": "2020-09-23 13:19:29.237748",
@@ -618,7 +618,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0,
   "key": "max_file_size",
   "modified": "2020-09-15 14:56:18.188966",
@@ -632,7 +632,7 @@
  {
   "description": "At FC, we use this to manage site usages.",
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 1,
   "key": "rate_limit",
   "modified": "2020-09-18 15:06:55.725912",
@@ -646,7 +646,7 @@
  {
   "description": "We use this to suspend or deactivate sites in FC.",
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 1,
   "key": "maintenance_mode",
   "modified": "2020-09-23 13:19:29.122411",
@@ -660,7 +660,7 @@
  {
   "description": "Maintains a list of domains for site",
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 1,
   "key": "domains",
   "modified": "2020-09-30 11:04:28.883458",
@@ -674,7 +674,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 1,
   "key": "db_name",
   "modified": "2023-04-10 15:09:26.815014",
@@ -688,7 +688,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 1,
   "key": "db_host",
   "modified": "2023-04-10 15:09:26.815014",
@@ -702,7 +702,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 1,
   "key": "db_password",
   "modified": "2023-04-10 15:09:26.815014",
@@ -716,7 +716,7 @@
  {
   "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 1,
   "key": "db_type",
   "modified": "2023-04-10 15:09:26.815014",
@@ -730,7 +730,7 @@
  {
  "description": null,
   "docstatus": 0,
-  "doctype": "Site Config Key",
+  "pagetype": "Site Config Key",
   "internal": 0 ,
   "key": "workers",
   "modified": "2025-07-13 11:31:26.815014",
diff --git a/press/fixtures/site_config_key_blacklist.json b/press/fixtures/site_config_key_blacklist.json
index 415be5e8..58889cfd 100644
--- a/press/fixtures/site_config_key_blacklist.json
+++ b/press/fixtures/site_config_key_blacklist.json
@@ -1,7 +1,7 @@
 [
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "ssl_certificate",
   "modified": "2020-10-01 21:10:07.925888",
   "name": "ssl_certificate",
@@ -9,7 +9,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "ssl_certificate_key",
   "modified": "2020-10-01 21:10:31.635305",
   "name": "ssl_certificate_key",
@@ -17,7 +17,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "frappecloud_url",
   "modified": "2020-09-15 13:02:11.917220",
   "name": "frappecloud_url",
@@ -25,7 +25,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "db_ssl_key",
   "modified": "2020-09-15 13:02:12.019502",
   "name": "db_ssl_key",
@@ -33,7 +33,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "db_password",
   "modified": "2020-09-15 13:02:12.032911",
   "name": "db_password",
@@ -41,7 +41,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "monitor",
   "modified": "2020-09-15 13:02:12.044695",
   "name": "monitor",
@@ -49,7 +49,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "root_login",
   "modified": "2020-09-15 14:47:30.453481",
   "name": "root_login",
@@ -57,7 +57,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "db_port",
   "modified": "2020-09-15 13:02:12.066262",
   "name": "db_port",
@@ -65,7 +65,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "webserver_port",
   "modified": "2020-09-15 13:02:12.078783",
   "name": "webserver_port",
@@ -73,7 +73,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "restart_systemd_on_update",
   "modified": "2020-09-15 13:02:12.088768",
   "name": "restart_systemd_on_update",
@@ -81,7 +81,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "db_name",
   "modified": "2020-09-15 13:02:12.098600",
   "name": "db_name",
@@ -89,7 +89,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "db_ssl_cert",
   "modified": "2020-09-15 13:02:12.111550",
   "name": "db_ssl_cert",
@@ -97,7 +97,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "db_ssl_ca",
   "modified": "2020-09-15 13:02:12.121237",
   "name": "db_ssl_ca",
@@ -105,7 +105,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "keep_backups_for_hours",
   "modified": "2020-09-15 14:48:35.698767",
   "name": "keep_backups_for_hours",
@@ -113,7 +113,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "socketio_port",
   "modified": "2020-09-15 13:02:12.142390",
   "name": "socketio_port",
@@ -121,7 +121,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "db_type",
   "modified": "2020-09-15 13:02:12.164240",
   "name": "db_type",
@@ -129,7 +129,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "db_host",
   "modified": "2020-09-15 13:02:12.173858",
   "name": "db_host",
@@ -137,7 +137,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "http_port",
   "modified": "2020-09-15 13:02:12.183172",
   "name": "http_port",
@@ -145,7 +145,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "developer_mode",
   "modified": "2020-09-15 13:02:12.202427",
   "name": "developer_mode",
@@ -153,7 +153,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "root_password",
   "modified": "2020-09-15 14:47:48.878756",
   "name": "root_password",
@@ -161,7 +161,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "allow_tests",
   "modified": "2020-09-15 13:02:12.228708",
   "name": "allow_tests",
@@ -169,7 +169,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "install_apps",
   "modified": "2020-09-15 14:48:13.132821",
   "name": "install_apps",
@@ -177,7 +177,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "admin_password",
   "modified": "2020-09-15 13:02:12.250826",
   "name": "admin_password",
@@ -185,7 +185,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "restart_supervisor_on_update",
   "modified": "2020-09-15 13:02:12.259476",
   "name": "restart_supervisor_on_update",
@@ -193,7 +193,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "rds_db",
   "modified": "2020-09-15 14:47:00.852841",
   "name": "rds_db",
@@ -201,7 +201,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "rate_limit",
   "modified": "2020-09-18 11:54:37.058867",
   "name": "rate_limit",
@@ -209,7 +209,7 @@
  },
  {
   "docstatus": 0,
-  "doctype": "Site Config Key Blacklist",
+  "pagetype": "Site Config Key Blacklist",
   "key": "extra_config",
   "modified": "2025-03-29 19:28:15.431026",
   "name": "extra_config",
diff --git a/press/guards/role_guard/__init__.py b/press/guards/role_guard/__init__.py
index ccb79cd9..031ee17b 100644
--- a/press/guards/role_guard/__init__.py
+++ b/press/guards/role_guard/__init__.py
@@ -11,7 +11,7 @@ from jingrow.query_builder.functions import Count
 from jingrow.query_builder.terms import QueryBuilder
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.team.team import Team
+	from jcloude.jcloude.pagetype.team.team import Team
 
 from jcloude.utils import get_current_team
 from jcloude.utils import user as utils_user
@@ -37,8 +37,8 @@ def api(scope: Literal["billing", "partner"]):
 			team: Team = get_current_team(get_pg=True)
 			if team.is_team_owner() or team.is_admin_user():
 				return fn(*args, **kwargs)
-			PressRole = jingrow.qb.DocType("Jcloude Role")
-			PressRoleUser = jingrow.qb.DocType("Jcloude Role User")
+			PressRole = jingrow.qb.PageType("Jcloude Role")
+			PressRoleUser = jingrow.qb.PageType("Jcloude Role User")
 			has_permission = (
 				jingrow.qb.from_(PressRole)
 				.inner_join(PressRoleUser)
@@ -74,8 +74,8 @@ def action():
 			team: Team = get_current_team(get_pg=True)
 			if team.is_team_owner() or team.is_admin_user():
 				return fn(self, *args, **kwargs)
-			PressRole = jingrow.qb.DocType("Jcloude Role")
-			PressRoleUser = jingrow.qb.DocType("Jcloude Role User")
+			PressRole = jingrow.qb.PageType("Jcloude Role")
+			PressRoleUser = jingrow.qb.PageType("Jcloude Role User")
 			has_permission = (
 				jingrow.qb.from_(PressRole)
 				.inner_join(PressRoleUser)
@@ -159,8 +159,8 @@ def base_query() -> QueryBuilder:
 	"""
 	Get a base query for Jcloude Role documents based on the current team context.
 	"""
-	PressRole = jingrow.qb.DocType("Jcloude Role")
-	PressRoleUser = jingrow.qb.DocType("Jcloude Role User")
+	PressRole = jingrow.qb.PageType("Jcloude Role")
+	PressRoleUser = jingrow.qb.PageType("Jcloude Role User")
 	return (
 		jingrow.qb.from_(PressRole)
 		.select(PressRole.name)
@@ -210,7 +210,7 @@ def roles_enabled() -> bool:
 	return bool(
 		jingrow.db.exists(
 			{
-				"doctype": "Jcloude Role",
+				"pagetype": "Jcloude Role",
 				"team": get_current_team(),
 			}
 		)
diff --git a/press/guards/role_guard/action.py b/press/guards/role_guard/action.py
index 8e8b1f8e..9d5ae0d5 100644
--- a/press/guards/role_guard/action.py
+++ b/press/guards/role_guard/action.py
@@ -2,12 +2,12 @@ from jingrow.model.document import Document
 
 
 def action_key(document: Document) -> str:
-	if document.doctype == "Site" and document.is_new():
+	if document.pagetype == "Site" and document.is_new():
 		return "allow_site_creation"
-	if document.doctype == "Server" and document.is_new():
+	if document.pagetype == "Server" and document.is_new():
 		return "allow_server_creation"
-	if document.doctype == "Release Group" and document.is_new():
+	if document.pagetype == "Release Group" and document.is_new():
 		return "allow_bench_creation"
-	if document.doctype == "Jcloude Webhook":
+	if document.pagetype == "Jcloude Webhook":
 		return "allow_webhook_configuration"
 	return ""
diff --git a/press/guards/role_guard/document.py b/press/guards/role_guard/document.py
index 81c3fc3c..d4334838 100644
--- a/press/guards/role_guard/document.py
+++ b/press/guards/role_guard/document.py
@@ -11,8 +11,8 @@ def check(base_query: QueryBuilder, document_type: str, document_name: str) -> b
 
 
 def documents(base_query: QueryBuilder, document_type: str) -> list[str]:
-	PressRole = jingrow.qb.DocType("Jcloude Role")
-	PressRoleResource = jingrow.qb.DocType("Jcloude Role Resource")
+	PressRole = jingrow.qb.PageType("Jcloude Role")
+	PressRoleResource = jingrow.qb.PageType("Jcloude Role Resource")
 	return [
 		pg.document_name
 		for pg in base_query.inner_join(PressRoleResource)
@@ -28,8 +28,8 @@ def documents(base_query: QueryBuilder, document_type: str) -> list[str]:
 
 
 def document(base_query: QueryBuilder, document_type: str, document_name: str) -> bool:
-	PressRole = jingrow.qb.DocType("Jcloude Role")
-	PressRoleResource = jingrow.qb.DocType("Jcloude Role Resource")
+	PressRole = jingrow.qb.PageType("Jcloude Role")
+	PressRoleResource = jingrow.qb.PageType("Jcloude Role Resource")
 	return (
 		base_query.inner_join(PressRoleResource)
 		.on(
diff --git a/press/guards/role_guard/marketplace.py b/press/guards/role_guard/marketplace.py
index 7710b950..2d8fdc72 100644
--- a/press/guards/role_guard/marketplace.py
+++ b/press/guards/role_guard/marketplace.py
@@ -4,7 +4,7 @@ from jingrow.query_builder.terms import QueryBuilder
 
 
 def check(base_query: QueryBuilder) -> bool:
-	PressRole = jingrow.qb.DocType("Jcloude Role")
+	PressRole = jingrow.qb.PageType("Jcloude Role")
 	return (
 		base_query.where(PressRole.allow_apps == 1)
 		.select(Count(PressRole.name).as_("count"))
diff --git a/press/guards/role_guard/server_snapshot.py b/press/guards/role_guard/server_snapshot.py
index 8e74d029..1aad861d 100644
--- a/press/guards/role_guard/server_snapshot.py
+++ b/press/guards/role_guard/server_snapshot.py
@@ -4,9 +4,9 @@ from jingrow.query_builder.terms import QueryBuilder
 
 
 def check(base_query: QueryBuilder, document_name: str) -> bool:
-	PressRole = jingrow.qb.DocType("Jcloude Role")
-	PressRoleResource = jingrow.qb.DocType("Jcloude Role Resource")
-	ServerSnapshot = jingrow.qb.DocType("Server Snapshot")
+	PressRole = jingrow.qb.PageType("Jcloude Role")
+	PressRoleResource = jingrow.qb.PageType("Jcloude Role Resource")
+	ServerSnapshot = jingrow.qb.PageType("Server Snapshot")
 	return (
 		base_query.left_join(PressRoleResource)
 		.on(PressRoleResource.parent == PressRole.name)
diff --git a/press/guards/role_guard/site_backup.py b/press/guards/role_guard/site_backup.py
index c7ea8d67..4d8b2c92 100644
--- a/press/guards/role_guard/site_backup.py
+++ b/press/guards/role_guard/site_backup.py
@@ -4,9 +4,9 @@ from jingrow.query_builder.terms import QueryBuilder
 
 
 def check(base_query: QueryBuilder, document_name: str) -> bool:
-	PressRole = jingrow.qb.DocType("Jcloude Role")
-	PressRoleResource = jingrow.qb.DocType("Jcloude Role Resource")
-	SiteBackup = jingrow.qb.DocType("Site Backup")
+	PressRole = jingrow.qb.PageType("Jcloude Role")
+	PressRoleResource = jingrow.qb.PageType("Jcloude Role Resource")
+	SiteBackup = jingrow.qb.PageType("Site Backup")
 	return (
 		base_query.left_join(PressRoleResource)
 		.on(PressRoleResource.parent == PressRole.name)
diff --git a/press/guards/role_guard/webhook.py b/press/guards/role_guard/webhook.py
index 9bcb77c2..efa51cff 100644
--- a/press/guards/role_guard/webhook.py
+++ b/press/guards/role_guard/webhook.py
@@ -4,7 +4,7 @@ from jingrow.query_builder.terms import QueryBuilder
 
 
 def check(base_query: QueryBuilder) -> bool:
-	PressRole = jingrow.qb.DocType("Jcloude Role")
+	PressRole = jingrow.qb.PageType("Jcloude Role")
 	return (
 		base_query.where(PressRole.allow_webhook_configuration == 1)
 		.select(Count(PressRole.name).as_("document_count"))
diff --git a/press/guards/team_guard.py b/press/guards/team_guard.py
index 56aee972..75208c6a 100644
--- a/press/guards/team_guard.py
+++ b/press/guards/team_guard.py
@@ -10,7 +10,7 @@ from jingrow.model.document import Document
 from jcloude.utils import user as utils_user
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.team.team import Team
+	from jcloude.jcloude.pagetype.team.team import Team
 
 
 def only_owner(team: Callable[[Document, OrderedDict], str] = lambda document, _: str(document.team)):
@@ -87,7 +87,7 @@ def only_member(
 			bound_args.apply_defaults()
 			t = team(self, bound_args.arguments)
 			u = user(self, bound_args.arguments)
-			if not bool(jingrow.db.exists({"doctype": "Team Member", "parent": t, "user": u})):
+			if not bool(jingrow.db.exists({"pagetype": "Team Member", "parent": t, "user": u})):
 				message = error_message or _("Only team member can perform this action.")
 				jingrow.throw(message, jingrow.PermissionError)
 			return fn(self, *args, **kwargs)
diff --git a/press/hooks.py b/press/hooks.py
index 0a0b94ad..d4615897 100644
--- a/press/hooks.py
+++ b/press/hooks.py
@@ -29,11 +29,11 @@ app_include_js = [
 # include js in page
 # page_js = {"page" : "public/js/file.js"}
 
-# include js in doctype views
-# doctype_js = {"doctype" : "public/js/doctype.js"}
-# doctype_list_js = {"doctype" : "public/js/doctype_list.js"}
-# doctype_tree_js = {"doctype" : "public/js/doctype_tree.js"}
-# doctype_calendar_js = {"doctype" : "public/js/doctype_calendar.js"}
+# include js in pagetype views
+# pagetype_js = {"pagetype" : "public/js/pagetype.js"}
+# pagetype_list_js = {"pagetype" : "public/js/pagetype_list.js"}
+# pagetype_tree_js = {"pagetype" : "public/js/pagetype_tree.js"}
+# pagetype_calendar_js = {"pagetype" : "public/js/pagetype_calendar.js"}
 
 # Home Pages
 # ----------
@@ -52,7 +52,7 @@ app_include_js = [
 # Generators
 # ----------
 
-# automatically create page for each record of this doctype
+# automatically create page for each record of this pagetype
 # website_generators = ["Web Page"]
 
 look_for_sidebar_json = True
@@ -81,7 +81,7 @@ website_redirects = [
 email_css = ["/assets/jcloude/css/email.css"]
 
 jinja = {
-	"filters": ["jcloude.jcloude.doctype.marketplace_app.utils.number_k_format"],
+	"filters": ["jcloude.jcloude.pagetype.marketplace_app.utils.number_k_format"],
 	"methods": ["jcloude.utils.get_country_info"],
 }
 
@@ -103,44 +103,44 @@ notification_config = "jcloude.notifications.get_notification_config"
 # Permissions evaluated in scripted ways
 
 permission_query_conditions = {
-	"Site": "jcloude.jcloude.doctype.site.site.get_permission_query_conditions",
-	"Site Backup": "jcloude.jcloude.doctype.site_backup.site_backup.get_permission_query_conditions",
-	"Site Domain": ("jcloude.jcloude.doctype.site_domain.site_domain.get_permission_query_conditions"),
-	"TLS Certificate": "jcloude.jcloude.doctype.tls_certificate.tls_certificate.get_permission_query_conditions",
-	"Team": "jcloude.jcloude.doctype.team.team.get_permission_query_conditions",
-	"Subscription": ("jcloude.jcloude.doctype.subscription.subscription.get_permission_query_conditions"),
-	"Stripe Payment Method": "jcloude.jcloude.doctype.stripe_payment_method.stripe_payment_method.get_permission_query_conditions",
-	"Balance Transaction": "jcloude.jcloude.doctype.balance_transaction.balance_transaction.get_permission_query_conditions",
-	"Invoice": "jcloude.jcloude.doctype.invoice.invoice.get_permission_query_conditions",
-	"App Source": ("jcloude.jcloude.doctype.app_source.app_source.get_permission_query_conditions"),
-	"App Release": ("jcloude.jcloude.doctype.app_release.app_release.get_permission_query_conditions"),
-	"Release Group": "jcloude.jcloude.doctype.release_group.release_group.get_permission_query_conditions",
-	"Deploy Candidate": "jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.get_permission_query_conditions",
-	"Deploy Candidate Difference": "jcloude.jcloude.doctype.deploy_candidate_difference.deploy_candidate_difference.get_permission_query_conditions",
-	"Deploy": "jcloude.jcloude.doctype.deploy.deploy.get_permission_query_conditions",
-	"Bench": "jcloude.jcloude.doctype.bench.bench.get_permission_query_conditions",
-	"Server": "jcloude.jcloude.doctype.server.server.get_permission_query_conditions",
-	"Database Server": "jcloude.jcloude.doctype.database_server.database_server.get_permission_query_conditions",
-	"Virtual Machine": "jcloude.jcloude.doctype.virtual_machine.virtual_machine.get_permission_query_conditions",
-	"Jcloude Webhook": "jcloude.jcloude.doctype.jcloude_webhook.jcloude_webhook.get_permission_query_conditions",
-	"Jcloude Webhook Log": "jcloude.jcloude.doctype.jcloude_webhook_log.jcloude_webhook_log.get_permission_query_conditions",
-	"SQL Playground Log": "jcloude.jcloude.doctype.sql_playground_log.sql_playground_log.get_permission_query_conditions",
-	"Site Database User": "jcloude.jcloude.doctype.site_database_user.site_database_user.get_permission_query_conditions",
-	"Server Snapshot": "jcloude.jcloude.doctype.server_snapshot.server_snapshot.get_permission_query_conditions",
-	"Server Snapshot Recovery": "jcloude.jcloude.doctype.server_snapshot_recovery.server_snapshot_recovery.get_permission_query_conditions",
+	"Site": "jcloude.jcloude.pagetype.site.site.get_permission_query_conditions",
+	"Site Backup": "jcloude.jcloude.pagetype.site_backup.site_backup.get_permission_query_conditions",
+	"Site Domain": ("jcloude.jcloude.pagetype.site_domain.site_domain.get_permission_query_conditions"),
+	"TLS Certificate": "jcloude.jcloude.pagetype.tls_certificate.tls_certificate.get_permission_query_conditions",
+	"Team": "jcloude.jcloude.pagetype.team.team.get_permission_query_conditions",
+	"Subscription": ("jcloude.jcloude.pagetype.subscription.subscription.get_permission_query_conditions"),
+	"Stripe Payment Method": "jcloude.jcloude.pagetype.stripe_payment_method.stripe_payment_method.get_permission_query_conditions",
+	"Balance Transaction": "jcloude.jcloude.pagetype.balance_transaction.balance_transaction.get_permission_query_conditions",
+	"Invoice": "jcloude.jcloude.pagetype.invoice.invoice.get_permission_query_conditions",
+	"App Source": ("jcloude.jcloude.pagetype.app_source.app_source.get_permission_query_conditions"),
+	"App Release": ("jcloude.jcloude.pagetype.app_release.app_release.get_permission_query_conditions"),
+	"Release Group": "jcloude.jcloude.pagetype.release_group.release_group.get_permission_query_conditions",
+	"Deploy Candidate": "jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.get_permission_query_conditions",
+	"Deploy Candidate Difference": "jcloude.jcloude.pagetype.deploy_candidate_difference.deploy_candidate_difference.get_permission_query_conditions",
+	"Deploy": "jcloude.jcloude.pagetype.deploy.deploy.get_permission_query_conditions",
+	"Bench": "jcloude.jcloude.pagetype.bench.bench.get_permission_query_conditions",
+	"Server": "jcloude.jcloude.pagetype.server.server.get_permission_query_conditions",
+	"Database Server": "jcloude.jcloude.pagetype.database_server.database_server.get_permission_query_conditions",
+	"Virtual Machine": "jcloude.jcloude.pagetype.virtual_machine.virtual_machine.get_permission_query_conditions",
+	"Jcloude Webhook": "jcloude.jcloude.pagetype.jcloude_webhook.jcloude_webhook.get_permission_query_conditions",
+	"Jcloude Webhook Log": "jcloude.jcloude.pagetype.jcloude_webhook_log.jcloude_webhook_log.get_permission_query_conditions",
+	"SQL Playground Log": "jcloude.jcloude.pagetype.sql_playground_log.sql_playground_log.get_permission_query_conditions",
+	"Site Database User": "jcloude.jcloude.pagetype.site_database_user.site_database_user.get_permission_query_conditions",
+	"Server Snapshot": "jcloude.jcloude.pagetype.server_snapshot.server_snapshot.get_permission_query_conditions",
+	"Server Snapshot Recovery": "jcloude.jcloude.pagetype.server_snapshot_recovery.server_snapshot_recovery.get_permission_query_conditions",
 }
 has_permission = {
 	"Site": "jcloude.overrides.has_permission",
 	"Site Backup": "jcloude.overrides.has_permission",
 	"Site Domain": "jcloude.overrides.has_permission",
 	"TLS Certificate": "jcloude.overrides.has_permission",
-	"Team": "jcloude.jcloude.doctype.team.team.has_permission",
+	"Team": "jcloude.jcloude.pagetype.team.team.has_permission",
 	"Subscription": "jcloude.overrides.has_permission",
 	"Stripe Payment Method": "jcloude.overrides.has_permission",
 	"Balance Transaction": "jcloude.overrides.has_permission",
-	"Invoice": "jcloude.jcloude.doctype.invoice.invoice.has_permission",
+	"Invoice": "jcloude.jcloude.pagetype.invoice.invoice.has_permission",
 	"App Source": "jcloude.overrides.has_permission",
-	"App Release": "jcloude.jcloude.doctype.app_release.app_release.has_permission",
+	"App Release": "jcloude.jcloude.pagetype.app_release.app_release.has_permission",
 	"Release Group": "jcloude.overrides.has_permission",
 	"Deploy Candidate": "jcloude.overrides.has_permission",
 	"Deploy Candidate Difference": "jcloude.overrides.has_permission",
@@ -150,7 +150,7 @@ has_permission = {
 	"Database Server": "jcloude.overrides.has_permission",
 	"Jcloude Webhook": "jcloude.overrides.has_permission",
 	"Jcloude Webhook Log": "jcloude.overrides.has_permission",
-	"Jcloude Webhook Attempt": "jcloude.jcloude.doctype.jcloude_webhook_attempt.jcloude_webhook_attempt.has_permission",
+	"Jcloude Webhook Attempt": "jcloude.jcloude.pagetype.jcloude_webhook_attempt.jcloude_webhook_attempt.has_permission",
 	"SQL Playground Log": "jcloude.overrides.has_permission",
 	"Site Database User": "jcloude.overrides.has_permission",
 	"Server Snapshot": "jcloude.overrides.has_permission",
@@ -164,23 +164,23 @@ has_permission = {
 pg_events = {
 	"Stripe Webhook Log": {
 		"after_insert": [
-			"jcloude.jcloude.doctype.invoice.stripe_webhook_handler.handle_stripe_webhook_events",
-			"jcloude.jcloude.doctype.team.team.process_stripe_webhook",
+			"jcloude.jcloude.pagetype.invoice.stripe_webhook_handler.handle_stripe_webhook_events",
+			"jcloude.jcloude.pagetype.team.team.process_stripe_webhook",
 		],
 	},
 	"Address": {"validate": "jcloude.api.billing.validate_gst"},
 	"Site": {
-		"before_insert": "jcloude.jcloude.doctype.team.team.validate_site_creation",
-		"after_insert": "jcloude.jcloude.doctype.jcloude_role.jcloude_role.create_user_resource",
+		"before_insert": "jcloude.jcloude.pagetype.team.team.validate_site_creation",
+		"after_insert": "jcloude.jcloude.pagetype.jcloude_role.jcloude_role.create_user_resource",
 	},
 	"Marketplace App Subscription": {
-		"on_update": "jcloude.jcloude.doctype.storage_integration_subscription.storage_integration_subscription.create_after_insert",
+		"on_update": "jcloude.jcloude.pagetype.storage_integration_subscription.storage_integration_subscription.create_after_insert",
 	},
 	"Release Group": {
-		"after_insert": "jcloude.jcloude.doctype.jcloude_role.jcloude_role.create_user_resource",
+		"after_insert": "jcloude.jcloude.pagetype.jcloude_role.jcloude_role.create_user_resource",
 	},
 	"Server": {
-		"after_insert": "jcloude.jcloude.doctype.jcloude_role.jcloude_role.create_user_resource",
+		"after_insert": "jcloude.jcloude.pagetype.jcloude_role.jcloude_role.create_user_resource",
 	},
 }
 
@@ -188,97 +188,97 @@ pg_events = {
 # ---------------
 
 scheduler_events = {
-	"weekly_long": ["jcloude.jcloude.doctype.marketplace_app.events.auto_review_for_missing_steps"],
+	"weekly_long": ["jcloude.jcloude.pagetype.marketplace_app.events.auto_review_for_missing_steps"],
 	"daily": [
-		"jcloude.experimental.doctype.referral_bonus.referral_bonus.credit_referral_bonuses",
-		"jcloude.jcloude.doctype.log_counter.log_counter.record_counts",
-		"jcloude.jcloude.doctype.incident.incident.notify_ignored_servers",
-		"jcloude.jcloude.doctype.database_server.database_server.unindex_mariadb_binlogs",
-		"jcloude.jcloude.doctype.database_server.database_server.remove_uploaded_binlogs_from_disk",
-		"jcloude.jcloude.doctype.database_server.database_server.remove_uploaded_binlogs_from_s3",
-		"jcloude.jcloude.doctype.mariadb_binlog.mariadb_binlog.cleanup_old_records",
-		"jcloude.jcloude.doctype.database_server.database_server.delete_mariadb_binlog_for_archived_servers",
-		"jcloude.jcloude.doctype.team.team.check_budget_alerts",
+		"jcloude.experimental.pagetype.referral_bonus.referral_bonus.credit_referral_bonuses",
+		"jcloude.jcloude.pagetype.log_counter.log_counter.record_counts",
+		"jcloude.jcloude.pagetype.incident.incident.notify_ignored_servers",
+		"jcloude.jcloude.pagetype.database_server.database_server.unindex_mariadb_binlogs",
+		"jcloude.jcloude.pagetype.database_server.database_server.remove_uploaded_binlogs_from_disk",
+		"jcloude.jcloude.pagetype.database_server.database_server.remove_uploaded_binlogs_from_s3",
+		"jcloude.jcloude.pagetype.mariadb_binlog.mariadb_binlog.cleanup_old_records",
+		"jcloude.jcloude.pagetype.database_server.database_server.delete_mariadb_binlog_for_archived_servers",
+		"jcloude.jcloude.pagetype.team.team.check_budget_alerts",
 	],
 	"daily_long": [
 		"jcloude.jcloude.audit.check_bench_fields",
 		"jcloude.jcloude.audit.check_offsite_backups",
 		"jcloude.jcloude.audit.plan_audit",
 		"jcloude.jcloude.audit.check_app_server_replica_benches",
-		"jcloude.jcloude.doctype.invoice.invoice.finalize_unpaid_prepaid_credit_invoices",
-		"jcloude.jcloude.doctype.bench.bench.sync_analytics",
-		"jcloude.saas.doctype.saas_app_subscription.saas_app_subscription.suspend_prepaid_subscriptions",
-		"jcloude.jcloude.doctype.backup_restoration_test.backup_test.archive_backup_test_sites",
-		"jcloude.jcloude.doctype.payout_order.payout_order.create_marketplace_payout_orders",
-		"jcloude.jcloude.doctype.root_domain.root_domain.cleanup_cname_records",
-		"jcloude.jcloude.doctype.remote_file.remote_file.poll_file_statuses",
-		"jcloude.jcloude.doctype.site_domain.site_domain.update_dns_type",
-		"jcloude.jcloude.doctype.jcloude_webhook_log.jcloude_webhook_log.clean_logs_older_than_24_hours",
-		"jcloude.jcloude.doctype.payment_due_extension.payment_due_extension.remove_payment_due_extension",
-		"jcloude.jcloude.doctype.tls_certificate.tls_certificate.notify_custom_tls_renewal",
-		"jcloude.jcloude.doctype.site.site.suspend_sites_exceeding_disk_usage_for_last_14_days",
-		"jcloude.jcloude.doctype.user_2fa.user_2fa.yearly_2fa_recovery_code_reminder",
-		"jcloude.jcloude.doctype.registry_server.registry_server.delete_old_images_from_registry",
-		"jcloude.saas.doctype.product_trial_request.product_trial_request.gather_daily_stats",
-		"jcloude.jcloude.doctype.agent_job.agent_job.agent_poll_count_stats_daily",
+		"jcloude.jcloude.pagetype.invoice.invoice.finalize_unpaid_prepaid_credit_invoices",
+		"jcloude.jcloude.pagetype.bench.bench.sync_analytics",
+		"jcloude.saas.pagetype.saas_app_subscription.saas_app_subscription.suspend_prepaid_subscriptions",
+		"jcloude.jcloude.pagetype.backup_restoration_test.backup_test.archive_backup_test_sites",
+		"jcloude.jcloude.pagetype.payout_order.payout_order.create_marketplace_payout_orders",
+		"jcloude.jcloude.pagetype.root_domain.root_domain.cleanup_cname_records",
+		"jcloude.jcloude.pagetype.remote_file.remote_file.poll_file_statuses",
+		"jcloude.jcloude.pagetype.site_domain.site_domain.update_dns_type",
+		"jcloude.jcloude.pagetype.jcloude_webhook_log.jcloude_webhook_log.clean_logs_older_than_24_hours",
+		"jcloude.jcloude.pagetype.payment_due_extension.payment_due_extension.remove_payment_due_extension",
+		"jcloude.jcloude.pagetype.tls_certificate.tls_certificate.notify_custom_tls_renewal",
+		"jcloude.jcloude.pagetype.site.site.suspend_sites_exceeding_disk_usage_for_last_14_days",
+		"jcloude.jcloude.pagetype.user_2fa.user_2fa.yearly_2fa_recovery_code_reminder",
+		"jcloude.jcloude.pagetype.registry_server.registry_server.delete_old_images_from_registry",
+		"jcloude.saas.pagetype.product_trial_request.product_trial_request.gather_daily_stats",
+		"jcloude.jcloude.pagetype.agent_job.agent_job.agent_poll_count_stats_daily",
 	],
 	"hourly": [
-		"jcloude.jcloude.doctype.site.backups.cleanup_local",
-		"jcloude.jcloude.doctype.agent_job.agent_job.update_job_step_status",
-		"jcloude.jcloude.doctype.bench.bench.archive_obsolete_benches",
-		"jcloude.jcloude.doctype.site.backups.schedule_logical_backups_for_sites_with_backup_time",
-		"jcloude.jcloude.doctype.site.backups.schedule_physical_backups_for_sites_with_backup_time",
-		"jcloude.jcloude.doctype.tls_certificate.tls_certificate.renew_tls_certificates",
-		"jcloude.saas.doctype.product_trial_request.product_trial_request.expire_long_pending_trial_requests",
+		"jcloude.jcloude.pagetype.site.backups.cleanup_local",
+		"jcloude.jcloude.pagetype.agent_job.agent_job.update_job_step_status",
+		"jcloude.jcloude.pagetype.bench.bench.archive_obsolete_benches",
+		"jcloude.jcloude.pagetype.site.backups.schedule_logical_backups_for_sites_with_backup_time",
+		"jcloude.jcloude.pagetype.site.backups.schedule_physical_backups_for_sites_with_backup_time",
+		"jcloude.jcloude.pagetype.tls_certificate.tls_certificate.renew_tls_certificates",
+		"jcloude.saas.pagetype.product_trial_request.product_trial_request.expire_long_pending_trial_requests",
 		"jcloude.overrides.cleanup_ansible_tmp_files",
-		"jcloude.jcloude.doctype.site.site.archive_suspended_sites",
-		"jcloude.jcloude.doctype.site.site.send_warning_mail_regarding_sites_exceeding_disk_usage",
-		"jcloude.jcloude.doctype.add_on_storage_log.add_on_storage_log.send_disk_extention_notification",
-		"jcloude.jcloude.doctype.server_snapshot_recovery.server_snapshot_recovery.expire_backups",
-		"jcloude.jcloude.doctype.server_snapshot.server_snapshot.expire_snapshots",
-		"jcloude.saas.doctype.product_trial.product_trial.sync_product_site_users",
-		"jcloude.jcloude.doctype.database_server.database_server.sync_binlogs_info",
+		"jcloude.jcloude.pagetype.site.site.archive_suspended_sites",
+		"jcloude.jcloude.pagetype.site.site.send_warning_mail_regarding_sites_exceeding_disk_usage",
+		"jcloude.jcloude.pagetype.add_on_storage_log.add_on_storage_log.send_disk_extention_notification",
+		"jcloude.jcloude.pagetype.server_snapshot_recovery.server_snapshot_recovery.expire_backups",
+		"jcloude.jcloude.pagetype.server_snapshot.server_snapshot.expire_snapshots",
+		"jcloude.saas.pagetype.product_trial.product_trial.sync_product_site_users",
+		"jcloude.jcloude.pagetype.database_server.database_server.sync_binlogs_info",
 	],
 	"hourly_long": [
-		"jcloude.jcloude.doctype.release_group.release_group.prune_servers_without_sites",
-		"jcloude.jcloude.doctype.release_group.release_group.add_public_servers_to_public_groups",
-		"jcloude.jcloude.doctype.server.server.scale_workers",
-		"jcloude.jcloude.doctype.usage_record.usage_record.link_unlinked_usage_records",
-		"jcloude.jcloude.doctype.bench.bench.sync_benches",
-		"jcloude.jcloude.doctype.invoice.invoice.finalize_draft_invoices",
-		"jcloude.jcloude.doctype.agent_job.agent_job.fail_old_jobs",
-		"jcloude.jcloude.doctype.jcloude_job.jcloude_job.fail_stuck_jcloude_jobs",
-		"jcloude.jcloude.doctype.site_update.site_update.mark_stuck_updates_as_fatal",
-		"jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build.cleanup_build_directories",
-		"jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build.check_builds_status",
-		"jcloude.jcloude.doctype.virtual_machine.virtual_machine.snapshot_oci_virtual_machines",
-		"jcloude.jcloude.doctype.virtual_machine.virtual_machine.snapshot_aws_internal_virtual_machines",
-		"jcloude.jcloude.doctype.virtual_disk_snapshot.virtual_disk_snapshot.delete_old_snapshots",
-		"jcloude.jcloude.doctype.virtual_disk_snapshot.virtual_disk_snapshot.delete_expired_snapshots",
-		"jcloude.jcloude.doctype.app_release.app_release.cleanup_unused_releases",
-		"jcloude.jcloude.doctype.jcloude_webhook.jcloude_webhook.auto_disable_high_delivery_failure_webhooks",
-		"jcloude.saas.doctype.product_trial_request.product_trial_request.gather_hourly_stats",
-		"jcloude.jcloude.doctype.agent_job.agent_job.agent_poll_count_stats_hourly",
+		"jcloude.jcloude.pagetype.release_group.release_group.prune_servers_without_sites",
+		"jcloude.jcloude.pagetype.release_group.release_group.add_public_servers_to_public_groups",
+		"jcloude.jcloude.pagetype.server.server.scale_workers",
+		"jcloude.jcloude.pagetype.usage_record.usage_record.link_unlinked_usage_records",
+		"jcloude.jcloude.pagetype.bench.bench.sync_benches",
+		"jcloude.jcloude.pagetype.invoice.invoice.finalize_draft_invoices",
+		"jcloude.jcloude.pagetype.agent_job.agent_job.fail_old_jobs",
+		"jcloude.jcloude.pagetype.jcloude_job.jcloude_job.fail_stuck_jcloude_jobs",
+		"jcloude.jcloude.pagetype.site_update.site_update.mark_stuck_updates_as_fatal",
+		"jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build.cleanup_build_directories",
+		"jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build.check_builds_status",
+		"jcloude.jcloude.pagetype.virtual_machine.virtual_machine.snapshot_oci_virtual_machines",
+		"jcloude.jcloude.pagetype.virtual_machine.virtual_machine.snapshot_aws_internal_virtual_machines",
+		"jcloude.jcloude.pagetype.virtual_disk_snapshot.virtual_disk_snapshot.delete_old_snapshots",
+		"jcloude.jcloude.pagetype.virtual_disk_snapshot.virtual_disk_snapshot.delete_expired_snapshots",
+		"jcloude.jcloude.pagetype.app_release.app_release.cleanup_unused_releases",
+		"jcloude.jcloude.pagetype.jcloude_webhook.jcloude_webhook.auto_disable_high_delivery_failure_webhooks",
+		"jcloude.saas.pagetype.product_trial_request.product_trial_request.gather_hourly_stats",
+		"jcloude.jcloude.pagetype.agent_job.agent_job.agent_poll_count_stats_hourly",
 	],
 	"all": [
 		"jcloude.auth.flush",
-		"jcloude.jcloude.doctype.site.sync.sync_setup_wizard_status",
-		"jcloude.jcloude.doctype.site.archive.archive_suspended_trial_sites",
-		"jcloude.jcloude.doctype.agent_job.agent_job.flush",
+		"jcloude.jcloude.pagetype.site.sync.sync_setup_wizard_status",
+		"jcloude.jcloude.pagetype.site.archive.archive_suspended_trial_sites",
+		"jcloude.jcloude.pagetype.agent_job.agent_job.flush",
 	],
 	"cron": {
 		"1-59/2 * * * *": [
-			"jcloude.jcloude.doctype.incident.incident.validate_incidents",
+			"jcloude.jcloude.pagetype.incident.incident.validate_incidents",
 		],
 		"*/2 * * * *": [
-			"jcloude.jcloude.doctype.incident.incident.resolve_incidents",
+			"jcloude.jcloude.pagetype.incident.incident.resolve_incidents",
 		],
 		"45 * * * *": [
-			"jcloude.jcloude.doctype.database_server.database_server.update_database_schema_sizes",
+			"jcloude.jcloude.pagetype.database_server.database_server.update_database_schema_sizes",
 		],
 		"0 4 * * *": [
-			"jcloude.jcloude.doctype.site.backups.cleanup_offsite",
-			"jcloude.jcloude.doctype.site.backups.expire_physical",
+			"jcloude.jcloude.pagetype.site.backups.cleanup_offsite",
+			"jcloude.jcloude.pagetype.site.backups.expire_physical",
 			"jcloude.jcloude.cleanup.unlink_remote_files_from_site",
 		],
 		"10 0 * * *": [
@@ -286,82 +286,82 @@ scheduler_events = {
 			"jcloude.jcloude.audit.billing_audit",
 		],
 		"0 3 * * *": [
-			"jcloude.jcloude.doctype.drip_email.drip_email.send_drip_emails",
-			"jcloude.jcloude.doctype.virtual_disk_snapshot.virtual_disk_snapshot.sync_all_snapshots_from_aws",
+			"jcloude.jcloude.pagetype.drip_email.drip_email.send_drip_emails",
+			"jcloude.jcloude.pagetype.virtual_disk_snapshot.virtual_disk_snapshot.sync_all_snapshots_from_aws",
 		],
 		"* * * * * 0/5": [
-			"jcloude.jcloude.doctype.agent_job.agent_job.poll_pending_jobs",
-			"jcloude.jcloude.doctype.jcloude_webhook_log.jcloude_webhook_log.process",
-			"jcloude.jcloude.doctype.telegram_message.telegram_message.send_telegram_message",
-			"jcloude.jcloude.doctype.agent_update.agent_update.process_bulk_agent_update",
-			"jcloude.jcloude.doctype.jcloude_job.jcloude_job.process_failed_callbacks",
-			"jcloude.jcloude.doctype.server_snapshot_recovery.server_snapshot_recovery.resume_warmed_up_restorations",
-			"jcloude.jcloude.doctype.server_snapshot.server_snapshot.move_pending_snapshots_to_processing",
+			"jcloude.jcloude.pagetype.agent_job.agent_job.poll_pending_jobs",
+			"jcloude.jcloude.pagetype.jcloude_webhook_log.jcloude_webhook_log.process",
+			"jcloude.jcloude.pagetype.telegram_message.telegram_message.send_telegram_message",
+			"jcloude.jcloude.pagetype.agent_update.agent_update.process_bulk_agent_update",
+			"jcloude.jcloude.pagetype.jcloude_job.jcloude_job.process_failed_callbacks",
+			"jcloude.jcloude.pagetype.server_snapshot_recovery.server_snapshot_recovery.resume_warmed_up_restorations",
+			"jcloude.jcloude.pagetype.server_snapshot.server_snapshot.move_pending_snapshots_to_processing",
 		],
 		"* * * * * 0/30": [
-			"jcloude.jcloude.doctype.account_request.account_request.expire_request_key",
-			"jcloude.jcloude.doctype.physical_backup_restoration.physical_backup_restoration.process_scheduled_restorations",
+			"jcloude.jcloude.pagetype.account_request.account_request.expire_request_key",
+			"jcloude.jcloude.pagetype.physical_backup_restoration.physical_backup_restoration.process_scheduled_restorations",
 		],
 		"0 */2 * * *": [
 			"jcloude.signup_e2e.run_signup_e2e",
 		],
 		"0 */6 * * *": [
-			"jcloude.jcloude.doctype.server.server.cleanup_unused_files",
-			"jcloude.jcloude.doctype.razorpay_payment_record.razorpay_payment_record.fetch_pending_payment_orders",
+			"jcloude.jcloude.pagetype.server.server.cleanup_unused_files",
+			"jcloude.jcloude.pagetype.razorpay_payment_record.razorpay_payment_record.fetch_pending_payment_orders",
 		],
 		"*/15 * * * *": [
-			"jcloude.jcloude.doctype.site_update.site_update.schedule_updates",
-			"jcloude.jcloude.doctype.site.backups.schedule_logical_backups",
-			"jcloude.jcloude.doctype.site.backups.schedule_physical_backups",
-			"jcloude.jcloude.doctype.site_migration.site_migration.run_scheduled_migrations",
-			"jcloude.jcloude.doctype.version_upgrade.version_upgrade.run_scheduled_upgrades",
-			"jcloude.jcloude.doctype.subscription.subscription.create_usage_records",
-			"jcloude.jcloude.doctype.virtual_machine.virtual_machine.sync_virtual_machines",
-			"jcloude.jcloude.doctype.mariadb_stalk.mariadb_stalk.fetch_stalks",
-			"jcloude.jcloude.doctype.virtual_machine.virtual_machine.rolling_snapshot_database_server_virtual_machines",
-			"jcloude.infrastructure.doctype.virtual_disk_resize.virtual_disk_resize.run_scheduled_resizes",
+			"jcloude.jcloude.pagetype.site_update.site_update.schedule_updates",
+			"jcloude.jcloude.pagetype.site.backups.schedule_logical_backups",
+			"jcloude.jcloude.pagetype.site.backups.schedule_physical_backups",
+			"jcloude.jcloude.pagetype.site_migration.site_migration.run_scheduled_migrations",
+			"jcloude.jcloude.pagetype.version_upgrade.version_upgrade.run_scheduled_upgrades",
+			"jcloude.jcloude.pagetype.subscription.subscription.create_usage_records",
+			"jcloude.jcloude.pagetype.virtual_machine.virtual_machine.sync_virtual_machines",
+			"jcloude.jcloude.pagetype.mariadb_stalk.mariadb_stalk.fetch_stalks",
+			"jcloude.jcloude.pagetype.virtual_machine.virtual_machine.rolling_snapshot_database_server_virtual_machines",
+			"jcloude.infrastructure.pagetype.virtual_disk_resize.virtual_disk_resize.run_scheduled_resizes",
 		],
 		"*/5 * * * *": [
-			"jcloude.jcloude.doctype.version_upgrade.version_upgrade.update_from_site_update",
-			"jcloude.jcloude.doctype.site_replication.site_replication.update_from_site",
-			"jcloude.jcloude.doctype.virtual_disk_snapshot.virtual_disk_snapshot.sync_snapshots",
-			"jcloude.jcloude.doctype.site.site.sync_sites_setup_wizard_complete_status",
-			"jcloude.jcloude.doctype.drip_email.drip_email.send_welcome_email",
-			"jcloude.jcloude.doctype.site_update.site_update.run_scheduled_updates",
-			"jcloude.jcloude.doctype.virtual_machine.virtual_machine.snapshot_aws_servers",
-			"jcloude.jcloude.doctype.app.app.poll_new_releases",
+			"jcloude.jcloude.pagetype.version_upgrade.version_upgrade.update_from_site_update",
+			"jcloude.jcloude.pagetype.site_replication.site_replication.update_from_site",
+			"jcloude.jcloude.pagetype.virtual_disk_snapshot.virtual_disk_snapshot.sync_snapshots",
+			"jcloude.jcloude.pagetype.site.site.sync_sites_setup_wizard_complete_status",
+			"jcloude.jcloude.pagetype.drip_email.drip_email.send_welcome_email",
+			"jcloude.jcloude.pagetype.site_update.site_update.run_scheduled_updates",
+			"jcloude.jcloude.pagetype.virtual_machine.virtual_machine.snapshot_aws_servers",
+			"jcloude.jcloude.pagetype.app.app.poll_new_releases",
 			"jcloude.utils.jobs.alert_on_zombie_rq_jobs",
-			"jcloude.saas.doctype.product_trial.product_trial.replenish_standby_sites",
+			"jcloude.saas.pagetype.product_trial.product_trial.replenish_standby_sites",
 		],
 		"* * * * *": [
-			"jcloude.jcloude.doctype.virtual_disk_snapshot.virtual_disk_snapshot.sync_physical_backup_snapshots",
-			"jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build.run_scheduled_builds",
-			"jcloude.jcloude.doctype.agent_request_failure.agent_request_failure.remove_old_failures",
-			"jcloude.saas.doctype.site_access_token.site_access_token.cleanup_expired_access_tokens",
-			"jcloude.jcloude.doctype.server_snapshot.server_snapshot.sync_ongoing_server_snapshots",
-			"jcloude.jcloude.doctype.site.site.create_subscription_for_trial_sites",
-			"jcloude.jcloude.doctype.monitor_server.monitor_server.check_monitoring_servers_rate_limit_key",
-			"jcloude.jcloude.doctype.auto_scale_record.auto_scale_record.run_scheduled_scale_records",
+			"jcloude.jcloude.pagetype.virtual_disk_snapshot.virtual_disk_snapshot.sync_physical_backup_snapshots",
+			"jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build.run_scheduled_builds",
+			"jcloude.jcloude.pagetype.agent_request_failure.agent_request_failure.remove_old_failures",
+			"jcloude.saas.pagetype.site_access_token.site_access_token.cleanup_expired_access_tokens",
+			"jcloude.jcloude.pagetype.server_snapshot.server_snapshot.sync_ongoing_server_snapshots",
+			"jcloude.jcloude.pagetype.site.site.create_subscription_for_trial_sites",
+			"jcloude.jcloude.pagetype.monitor_server.monitor_server.check_monitoring_servers_rate_limit_key",
+			"jcloude.jcloude.pagetype.auto_scale_record.auto_scale_record.run_scheduled_scale_records",
 		],
 		"*/10 * * * *": [
-			"jcloude.jcloude.doctype.site.saas_pool.create",
-			"jcloude.jcloude.doctype.virtual_disk_snapshot.virtual_disk_snapshot.sync_rolling_snapshots",
-			"jcloude.jcloude.doctype.database_server.database_server.auto_purge_binlogs_by_size_limit",
+			"jcloude.jcloude.pagetype.site.saas_pool.create",
+			"jcloude.jcloude.pagetype.virtual_disk_snapshot.virtual_disk_snapshot.sync_rolling_snapshots",
+			"jcloude.jcloude.pagetype.database_server.database_server.auto_purge_binlogs_by_size_limit",
 		],
 		"*/30 * * * *": [
-			"jcloude.jcloude.doctype.site_update.scheduled_auto_updates.trigger",
-			"jcloude.jcloude.doctype.team.suspend_sites.execute",
+			"jcloude.jcloude.pagetype.site_update.scheduled_auto_updates.trigger",
+			"jcloude.jcloude.pagetype.team.suspend_sites.execute",
 		],
 		"15,45 * * * *": [
-			"jcloude.jcloude.doctype.site.site_usages.update_cpu_usages",
-			"jcloude.jcloude.doctype.site.site_usages.update_disk_usages",
+			"jcloude.jcloude.pagetype.site.site_usages.update_cpu_usages",
+			"jcloude.jcloude.pagetype.site.site_usages.update_disk_usages",
 		],
 		"15 2,4 * * *": [
-			"jcloude.jcloude.doctype.team_deletion_request.team_deletion_request.process_team_deletion_requests",
+			"jcloude.jcloude.pagetype.team_deletion_request.team_deletion_request.process_team_deletion_requests",
 		],
-		"0 0 1 */3 *": ["jcloude.jcloude.doctype.backup_restoration_test.backup_test.run_backup_restore_test"],
+		"0 0 1 */3 *": ["jcloude.jcloude.pagetype.backup_restoration_test.backup_test.run_backup_restore_test"],
 		"0 8 * * *": [
-			"jcloude.jcloude.doctype.aws_savings_plan_recommendation.aws_savings_plan_recommendation.create",
+			"jcloude.jcloude.pagetype.aws_savings_plan_recommendation.aws_savings_plan_recommendation.create",
 			"jcloude.jcloude.cleanup.reset_large_output_fields_from_ansible_tasks",
 		],
 		"0 21 * * *": [
@@ -369,13 +369,13 @@ scheduler_events = {
 		],
 		"0 6 * * *": [
 			"jcloude.jcloude.audit.suspend_sites_with_disabled_team",
-			"jcloude.jcloude.doctype.tls_certificate.tls_certificate.retrigger_failed_wildcard_tls_callbacks",
-			"jcloude.jcloude.doctype.aws_savings_plan_recommendation.aws_savings_plan_recommendation.refresh",
-			"jcloude.infrastructure.doctype.ssh_access_audit.ssh_access_audit.run",
+			"jcloude.jcloude.pagetype.tls_certificate.tls_certificate.retrigger_failed_wildcard_tls_callbacks",
+			"jcloude.jcloude.pagetype.aws_savings_plan_recommendation.aws_savings_plan_recommendation.refresh",
+			"jcloude.infrastructure.pagetype.ssh_access_audit.ssh_access_audit.run",
 		],
 		"0 9 * * 2": [
-			"jcloude.jcloude.doctype.build_metric.build_metric.create_build_metric",
-			"jcloude.saas.doctype.product_trial_request.product_trial_request.gather_weekly_stats",
+			"jcloude.jcloude.pagetype.build_metric.build_metric.create_build_metric",
+			"jcloude.saas.pagetype.product_trial_request.product_trial_request.gather_weekly_stats",
 		],
 	},
 }
@@ -407,13 +407,13 @@ before_tests = "jcloude.tests.before_test.execute"
 override_whitelisted_methods = {"upload_file": "jcloude.overrides.upload_file"}
 #
 # each overriding function accepts a `data` argument;
-# generated from the base implementation of the doctype dashboard,
+# generated from the base implementation of the pagetype dashboard,
 # along with any modifications made in other Jingrow apps
-# override_doctype_dashboards = {
+# override_pagetype_dashboards = {
 # 	"Task": "jcloude.task.get_dashboard_data"
 # }
 
-override_doctype_class = {"User": "jcloude.overrides.CustomUser"}
+override_pagetype_class = {"User": "jcloude.overrides.CustomUser"}
 
 on_session_creation = "jcloude.overrides.on_session_creation"
 # on_logout = "jcloude.overrides.on_logout"
@@ -426,7 +426,7 @@ before_job = "jcloude.overrides.before_job"
 # Data Deletion Privacy Docs
 
 user_data_fields = [
-	{"doctype": "Team", "strict": True},
+	{"pagetype": "Team", "strict": True},
 ]
 
 auth_hooks = ["jcloude.auth.hook"]
@@ -468,8 +468,8 @@ persistent_cache_keys = [
 	"builder.builder*",  # path resolution, it has its own cache eviction.
 	"db_tables",
 	"defaults",
-	"doctype_form_meta",
-	"doctype_meta",
+	"pagetype_form_meta",
+	"pagetype_meta",
 	"doctypes_with_web_view",
 	"document_cache::*",
 	"document_naming_rule_map",
diff --git a/press/incident_management/doctype/action_step/action_step.json b/press/incident_management/doctype/action_step/action_step.json
index 287ede87..12ef9318 100644
--- a/press/incident_management/doctype/action_step/action_step.json
+++ b/press/incident_management/doctype/action_step/action_step.json
@@ -2,11 +2,11 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-08-20 14:37:54.787070",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "reference_doctype",
+  "reference_pagetype",
   "reference_name",
   "method",
   "output",
@@ -21,18 +21,18 @@
    "read_only": 1
   },
   {
-   "fieldname": "reference_doctype",
+   "fieldname": "reference_pagetype",
    "fieldtype": "Link",
    "in_list_view": 1,
-   "label": "Reference DocType",
-   "options": "DocType"
+   "label": "Reference PageType",
+   "options": "PageType"
   },
   {
    "fieldname": "reference_name",
    "fieldtype": "Dynamic Link",
    "in_list_view": 1,
    "label": "Reference Name",
-   "options": "reference_doctype"
+   "options": "reference_pagetype"
   },
   {
    "fieldname": "output",
diff --git a/press/incident_management/doctype/action_step/action_step.py b/press/incident_management/doctype/action_step/action_step.py
index d55280d4..a4c40259 100644
--- a/press/incident_management/doctype/action_step/action_step.py
+++ b/press/incident_management/doctype/action_step/action_step.py
@@ -19,17 +19,17 @@ class ActionStep(Document):
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data
-		reference_doctype: DF.Link | None
+		reference_pagetype: DF.Link | None
 		reference_name: DF.DynamicLink | None
 		wait: DF.Check
 	# end: auto-generated types
 
 	def before_save(self):
 		try:
-			target_pg = jingrow.get_pg(self.reference_doctype, self.reference_name)
+			target_pg = jingrow.get_pg(self.reference_pagetype, self.reference_name)
 		except jingrow.DoesNotExistError:
 			jingrow.throw(
-				f"Invalid reference: {self.reference_doctype} {self.reference_name}",
+				f"Invalid reference: {self.reference_pagetype} {self.reference_name}",
 				jingrow.DoesNotExistError,
 			)
 
diff --git a/press/incident_management/doctype/incident_investigator/incident_investigator.json b/press/incident_management/doctype/incident_investigator/incident_investigator.json
index 8d2cbcb3..28205763 100644
--- a/press/incident_management/doctype/incident_investigator/incident_investigator.json
+++ b/press/incident_management/doctype/incident_investigator/incident_investigator.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-08-11 13:15:53.610517",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "configurations_section",
diff --git a/press/incident_management/doctype/incident_investigator/incident_investigator.py b/press/incident_management/doctype/incident_investigator/incident_investigator.py
index 408f3963..964bf99c 100644
--- a/press/incident_management/doctype/incident_investigator/incident_investigator.py
+++ b/press/incident_management/doctype/incident_investigator/incident_investigator.py
@@ -19,10 +19,10 @@ if typing.TYPE_CHECKING:
 	import datetime
 	from collections.abc import Callable
 
-	from jcloude.jcloude.incident_management.doctype.action_step.action_step import (
+	from jcloude.jcloude.incident_management.pagetype.action_step.action_step import (
 		ActionStep,
 	)
-	from jcloude.jcloude.incident_management.doctype.investigation_step.investigation_step import (
+	from jcloude.jcloude.incident_management.pagetype.investigation_step.investigation_step import (
 		InvestigationStep,
 	)
 
@@ -52,8 +52,8 @@ class IncidentInvestigator(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.incident_management.doctype.action_step.action_step import ActionStep
-		from jcloude.incident_management.doctype.investigation_step.investigation_step import InvestigationStep
+		from jcloude.incident_management.pagetype.action_step.action_step import ActionStep
+		from jcloude.incident_management.pagetype.investigation_step.investigation_step import InvestigationStep
 
 		action_steps: DF.Table[ActionStep]
 		cool_off_period: DF.Float
@@ -195,8 +195,8 @@ class IncidentInvestigator(Document):
 			except Exception:
 				return 502
 
-		Site = jingrow.qb.DocType("Site")
-		Server = jingrow.qb.DocType("Server")
+		Site = jingrow.qb.PageType("Site")
+		Server = jingrow.qb.PageType("Server")
 
 		sites = (
 			jingrow.qb.from_(Site)
@@ -274,8 +274,8 @@ class IncidentInvestigator(Document):
 
 	def is_cluster_spam(self) -> bool:
 		"""Check if another server in the same cluster has been effected"""
-		Server = jingrow.qb.DocType("Server")
-		Investigator = jingrow.qb.DocType("Incident Investigator")
+		Server = jingrow.qb.PageType("Server")
+		Investigator = jingrow.qb.PageType("Incident Investigator")
 		incident_cluster = jingrow.db.get_value("Server", self.server, "cluster")
 
 		# Getting the last reported incident on the cluster created in the last minute
@@ -325,7 +325,7 @@ class IncidentInvestigator(Document):
 		self.set_prerequisites()
 		self.add_investigation_steps()
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"investigate",
 			queue="long",
@@ -335,7 +335,7 @@ class IncidentInvestigator(Document):
 	@jingrow.whitelist()
 	def start_investigation(self):
 		if self.status == "Pending":
-			jingrow.enqueue_pg(self.doctype, self.name, "investigate", queue="long")
+			jingrow.enqueue_pg(self.pagetype, self.name, "investigate", queue="long")
 
 	def set_status(self, status: Status):
 		"Set/Update investigation status"
@@ -385,7 +385,7 @@ class IncidentInvestigator(Document):
 
 	def add_action(
 		self,
-		reference_doctype: str,
+		reference_pagetype: str,
 		reference_name: str,
 		method: str,
 		wait: bool = False,
@@ -394,7 +394,7 @@ class IncidentInvestigator(Document):
 		action_step: ActionStep = self.append(
 			"action_steps",
 			{
-				"reference_doctype": reference_doctype,
+				"reference_pagetype": reference_pagetype,
 				"reference_name": reference_name,
 				"method": method,
 				"is_taken": False,
@@ -474,14 +474,14 @@ class IncidentInvestigator(Document):
 			"Jcloude Settings", "execute_incident_action", cache=True
 		)
 		if self.action_steps and execute_action_steps:
-			jingrow.enqueue_pg(self.doctype, self.name, "execute_action_steps", queue="long")
+			jingrow.enqueue_pg(self.pagetype, self.name, "execute_action_steps", queue="long")
 
 	def execute_action_steps(self, max_retries: int = 60):
 		"""
 		Execute all action steps sequentially max retries of 60 with interval 5 (5 minutes)
 		"""
 		for step in self.action_steps:
-			target_pg = jingrow.get_pg(step.reference_doctype, step.reference_name)
+			target_pg = jingrow.get_pg(step.reference_pagetype, step.reference_name)
 
 			method = getattr(target_pg, step.method)
 			if not step.wait:
diff --git a/press/incident_management/doctype/incident_investigator/test_incident_investigator.py b/press/incident_management/doctype/incident_investigator/test_incident_investigator.py
index bc898eef..c708e91a 100644
--- a/press/incident_management/doctype/incident_investigator/test_incident_investigator.py
+++ b/press/incident_management/doctype/incident_investigator/test_incident_investigator.py
@@ -10,16 +10,16 @@ import jingrow
 from jingrow.tests.utils import FrappeTestCase
 from prometheus_api_client import PrometheusConnect
 
-from jcloude.incident_management.doctype.incident_investigator.incident_investigator import (
+from jcloude.incident_management.pagetype.incident_investigator.incident_investigator import (
 	IncidentInvestigator,
 )
-from jcloude.jcloude.doctype.incident.incident import Incident
-from jcloude.jcloude.doctype.server.test_server import (
+from jcloude.jcloude.pagetype.incident.incident import Incident
+from jcloude.jcloude.pagetype.server.test_server import (
 	create_test_database_server,
 	create_test_proxy_server,
 	create_test_server,
 )
-from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 from jcloude.utils.test import foreground_enqueue_pg
 
 if typing.TYPE_CHECKING:
@@ -27,7 +27,7 @@ if typing.TYPE_CHECKING:
 
 
 def create_test_incident(server: str = "f1-mumbai.jingrow.cloud") -> Incident:
-	return jingrow.get_pg({"doctype": "Incident", "alertname": "Test Alert", "server": server}).insert()
+	return jingrow.get_pg({"pagetype": "Incident", "alertname": "Test Alert", "server": server}).insert()
 
 
 def get_mock_prometheus_client() -> PrometheusConnect:
@@ -187,7 +187,7 @@ def make_custom_query_range_side_effect(
 
 
 @patch(
-	"jcloude.incident_management.doctype.incident_investigator.incident_investigator.get_prometheus_client",
+	"jcloude.incident_management.pagetype.incident_investigator.incident_investigator.get_prometheus_client",
 	get_mock_prometheus_client,
 )
 @patch.object(PrometheusConnect, "__init__", new=mock_prometheus_connection)
@@ -214,7 +214,7 @@ class TestIncidentInvestigator(FrappeTestCase):
 	@patch.object(PrometheusConnect, "custom_query_range", make_custom_query_range_side_effect(is_high=True))
 	@patch.object(PrometheusConnect, "get_metric_range_data", mock_system_load(is_high=True))
 	@patch(
-		"jcloude.incident_management.doctype.incident_investigator.incident_investigator.jingrow.enqueue_pg",
+		"jcloude.incident_management.pagetype.incident_investigator.incident_investigator.jingrow.enqueue_pg",
 		foreground_enqueue_pg,
 	)
 	@patch.object(
@@ -239,7 +239,7 @@ class TestIncidentInvestigator(FrappeTestCase):
 	@patch.object(PrometheusConnect, "custom_query_range", make_custom_query_range_side_effect(is_high=True))
 	@patch.object(PrometheusConnect, "get_metric_range_data", mock_system_load(is_high=False))
 	@patch(
-		"jcloude.incident_management.doctype.incident_investigator.incident_investigator.jingrow.enqueue_pg",
+		"jcloude.incident_management.pagetype.incident_investigator.incident_investigator.jingrow.enqueue_pg",
 		foreground_enqueue_pg,
 	)
 	@patch.object(
@@ -260,15 +260,15 @@ class TestIncidentInvestigator(FrappeTestCase):
 		self.assertEqual(len(investigator.action_steps), 3)
 		first_step, wait_step, second_step = investigator.action_steps
 		self.assertListEqual(
-			[wait_step.reference_doctype, wait_step.reference_name, wait_step.method],
+			[wait_step.reference_pagetype, wait_step.reference_name, wait_step.method],
 			["Incident Investigator", investigator.name, "_check_process_list_capture"],
 		)
 		self.assertListEqual(
-			[first_step.reference_doctype, first_step.reference_name, first_step.method],
+			[first_step.reference_pagetype, first_step.reference_name, first_step.method],
 			["Database Server", self.database_server.name, "capture_process_list"],
 		)
 		self.assertListEqual(
-			[second_step.reference_doctype, second_step.reference_name, second_step.method],
+			[second_step.reference_pagetype, second_step.reference_name, second_step.method],
 			["Database Server", self.database_server.name, "restart_mariadb"],
 		)
 
@@ -276,7 +276,7 @@ class TestIncidentInvestigator(FrappeTestCase):
 	@patch.object(PrometheusConnect, "custom_query_range", unreachable_metrics())
 	@patch.object(PrometheusConnect, "get_metric_range_data", mock_system_load(is_high=False))
 	@patch(
-		"jcloude.incident_management.doctype.incident_investigator.incident_investigator.jingrow.enqueue_pg",
+		"jcloude.incident_management.pagetype.incident_investigator.incident_investigator.jingrow.enqueue_pg",
 		foreground_enqueue_pg,
 	)
 	@patch.object(
@@ -293,7 +293,7 @@ class TestIncidentInvestigator(FrappeTestCase):
 		self.assertEqual(len(investigator.action_steps), 1)
 		step = investigator.action_steps[0]
 		self.assertListEqual(
-			[step.reference_doctype, step.reference_name],
+			[step.reference_pagetype, step.reference_name],
 			["Virtual Machine", self.database_server.virtual_machine],
 		)
 		self.assertIn(step.method, ["reboot", "reboot_with_serial_console"])
@@ -304,7 +304,7 @@ class TestIncidentInvestigator(FrappeTestCase):
 	@patch.object(PrometheusConnect, "custom_query_range", make_custom_query_range_side_effect(is_high=False))
 	@patch.object(PrometheusConnect, "get_metric_range_data", mock_system_load(is_high=False))
 	@patch(
-		"jcloude.incident_management.doctype.incident_investigator.incident_investigator.jingrow.enqueue_pg",
+		"jcloude.incident_management.pagetype.incident_investigator.incident_investigator.jingrow.enqueue_pg",
 		foreground_enqueue_pg,
 	)
 	@patch.object(
diff --git a/press/incident_management/doctype/investigation_step/investigation_step.json b/press/incident_management/doctype/investigation_step/investigation_step.json
index 6cd35e3f..cfda0b91 100644
--- a/press/incident_management/doctype/investigation_step/investigation_step.json
+++ b/press/incident_management/doctype/investigation_step/investigation_step.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-08-11 13:35:40.818642",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/infrastructure/doctype/arm_build_record/arm_build_record.json b/press/infrastructure/doctype/arm_build_record/arm_build_record.json
index 717c16a9..5773644a 100644
--- a/press/infrastructure/doctype/arm_build_record/arm_build_record.json
+++ b/press/infrastructure/doctype/arm_build_record/arm_build_record.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-05-19 15:10:21.448402",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "server",
@@ -37,7 +37,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Agent Job",
+   "link_pagetype": "Agent Job",
    "link_fieldname": "reference_name"
   }
  ],
diff --git a/press/infrastructure/doctype/arm_build_record/arm_build_record.py b/press/infrastructure/doctype/arm_build_record/arm_build_record.py
index 2c16a587..8aaa81cf 100644
--- a/press/infrastructure/doctype/arm_build_record/arm_build_record.py
+++ b/press/infrastructure/doctype/arm_build_record/arm_build_record.py
@@ -10,12 +10,12 @@ import jingrow
 from jingrow.model.document import Document
 
 from jcloude.agent import Agent
-from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import Status
+from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import Status
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.bench.bench import Bench
-	from jcloude.jcloude.doctype.server.server import Server
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.bench.bench import Bench
+	from jcloude.jcloude.pagetype.server.server import Server
 
 
 class ARMBuildRecord(Document):
@@ -27,7 +27,7 @@ class ARMBuildRecord(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.infrastructure.doctype.arm_docker_image.arm_docker_image import ARMDockerImage
+		from jcloude.infrastructure.pagetype.arm_docker_image.arm_docker_image import ARMDockerImage
 
 		arm_images: DF.Table[ARMDockerImage]
 		server: DF.Link
@@ -38,7 +38,7 @@ class ARMBuildRecord(Document):
 		server: Server = jingrow.get_pg("Server", self.server)
 		server._update_agent_ansible()
 		return Agent(self.server).pull_docker_images(
-			image_tags, reference_doctype=self.doctype, reference_name=self.name
+			image_tags, reference_pagetype=self.pagetype, reference_name=self.name
 		)
 
 	def _update_redis_conf(self, bench: Bench) -> None:
@@ -72,7 +72,7 @@ class ARMBuildRecord(Document):
 	def _check_images_pulled(self) -> bool:
 		try:
 			agent_job: AgentJob = jingrow.get_last_pg(
-				"Agent Job", {"reference_doctype": self.doctype, "reference_name": self.name}
+				"Agent Job", {"reference_pagetype": self.pagetype, "reference_name": self.name}
 			)
 		except jingrow.DoesNotExistError:
 			return False
@@ -103,7 +103,7 @@ class ARMBuildRecord(Document):
 			if arm_image.status == "Running":
 				agent_job: "AgentJob" = jingrow.get_pg(
 					"Agent Job",
-					{"reference_doctype": "Deploy Candidate Build", "reference_name": arm_image.build},
+					{"reference_pagetype": "Deploy Candidate Build", "reference_name": arm_image.build},
 				)
 				agent_job.cancel_job()
 
diff --git a/press/infrastructure/doctype/arm_build_record/test_arm_build_record.py b/press/infrastructure/doctype/arm_build_record/test_arm_build_record.py
index 9a2879ec..f82b6104 100644
--- a/press/infrastructure/doctype/arm_build_record/test_arm_build_record.py
+++ b/press/infrastructure/doctype/arm_build_record/test_arm_build_record.py
@@ -6,20 +6,20 @@ from unittest.mock import MagicMock, Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.bench.test_bench import create_test_bench
-from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.bench.test_bench import create_test_bench
+from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.virtual_machine.test_virtual_machine import create_test_virtual_machine
+from jcloude.jcloude.pagetype.virtual_machine.test_virtual_machine import create_test_virtual_machine
 
 if typing.TYPE_CHECKING:
-	from jcloude.infrastructure.doctype.arm_build_record.arm_build_record import ARMBuildRecord
+	from jcloude.infrastructure.pagetype.arm_build_record.arm_build_record import ARMBuildRecord
 
 
-@patch("jcloude.jcloude.doctype.bench.bench.jingrow.db.commit", new=MagicMock)
-@patch("jcloude.jcloude.doctype.server.server.jingrow.db.commit", new=MagicMock)
+@patch("jcloude.jcloude.pagetype.bench.bench.jingrow.db.commit", new=MagicMock)
+@patch("jcloude.jcloude.pagetype.server.server.jingrow.db.commit", new=MagicMock)
 @patch("jcloude.api.bench.jingrow.db.commit", new=MagicMock)
 class TestARMBuildRecord(FrappeTestCase):
 	def setUp(self):
diff --git a/press/infrastructure/doctype/arm_docker_image/arm_docker_image.json b/press/infrastructure/doctype/arm_docker_image/arm_docker_image.json
index ad594669..e403720b 100644
--- a/press/infrastructure/doctype/arm_docker_image/arm_docker_image.json
+++ b/press/infrastructure/doctype/arm_docker_image/arm_docker_image.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-05-23 17:22:32.814089",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.json b/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.json
index 214e9b99..e97f8f30 100644
--- a/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.json
+++ b/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2025-01-29 15:13:17.999712",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "status",
diff --git a/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.py b/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.py
index 40079794..f290b03c 100644
--- a/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.py
+++ b/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.py
@@ -40,10 +40,10 @@ class SSHAccessAudit(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.infrastructure.doctype.ssh_access_audit_host.ssh_access_audit_host import (
+		from jcloude.infrastructure.pagetype.ssh_access_audit_host.ssh_access_audit_host import (
 			SSHAccessAuditHost,
 		)
-		from jcloude.infrastructure.doctype.ssh_access_audit_violation.ssh_access_audit_violation import (
+		from jcloude.infrastructure.pagetype.ssh_access_audit_violation.ssh_access_audit_violation import (
 			SSHAccessAuditViolation,
 		)
 
@@ -70,7 +70,7 @@ class SSHAccessAudit(Document):
 		self.status = "Running"
 		self.save()
 		jingrow.enqueue_pg(
-			self.doctype, self.name, "_run", queue="long", timeout=3600, enqueue_after_commit=True
+			self.pagetype, self.name, "_run", queue="long", timeout=3600, enqueue_after_commit=True
 		)
 
 	def _run(self):
@@ -140,26 +140,26 @@ class SSHAccessAudit(Document):
 		keys = {}
 		domain = jingrow.db.get_value("Jcloude Settings", None, "domain")
 		fields = self.get_acceptable_key_fields()
-		for doctype, field in fields:
+		for pagetype, field in fields:
 			filters = {}
-			if doctype.endswith("Server"):  # Skip self-hosted servers
+			if pagetype.endswith("Server"):  # Skip self-hosted servers
 				filters = {"status": "Active", "domain": domain}
 
-				meta = jingrow.get_meta(doctype)
+				meta = jingrow.get_meta(pagetype)
 				if meta.has_field("cluster"):
 					filters["cluster"] = ("!=", "Hybrid")
 
 				if meta.has_field("is_self_hosted"):
 					filters["is_self_hosted"] = False
 
-			documents = jingrow.get_all(doctype, filters=filters, fields=["name", field])
+			documents = jingrow.get_all(pagetype, filters=filters, fields=["name", field])
 			for document in documents:
 				key_string = document.get(field)
 				if not key_string:
 					continue
 				key = _extract_key_from_key_string(key_string)
 				keys[key] = {
-					"key_doctype": doctype,
+					"key_pagetype": pagetype,
 					"key_document": document.name,
 					"key_field": field,
 				}
@@ -169,15 +169,15 @@ class SSHAccessAudit(Document):
 	def known_keys(self):
 		keys = {}
 		fields = self.get_known_key_fields()
-		for doctype, field in fields:
-			documents = jingrow.get_all(doctype, fields=["name", field])
+		for pagetype, field in fields:
+			documents = jingrow.get_all(pagetype, fields=["name", field])
 			for document in documents:
 				key_string = document.get(field)
 				if not key_string:
 					continue
 				key = _extract_key_from_key_string(key_string)
 				keys[key] = {
-					"key_doctype": doctype,
+					"key_pagetype": pagetype,
 					"key_document": document.name,
 					"key_field": field,
 				}
@@ -190,11 +190,11 @@ class SSHAccessAudit(Document):
 
 	def is_system_manager_key(self, key) -> bool:
 		key_info = self.known_keys.get(key, {})
-		key_doctype = key_info.get("key_doctype")
+		key_pagetype = key_info.get("key_pagetype")
 		key_document = key_info.get("key_document")
-		if not (key_doctype and key_document):
+		if not (key_pagetype and key_document):
 			return False
-		document = jingrow.get_pg(key_doctype, key_document)
+		document = jingrow.get_pg(key_pagetype, key_document)
 		if not hasattr(document, "user"):
 			return False
 		if "System Manager" in jingrow.get_roles(document.user):
diff --git a/press/infrastructure/doctype/ssh_access_audit_host/ssh_access_audit_host.json b/press/infrastructure/doctype/ssh_access_audit_host/ssh_access_audit_host.json
index af20ae22..e3b0adb4 100644
--- a/press/infrastructure/doctype/ssh_access_audit_host/ssh_access_audit_host.json
+++ b/press/infrastructure/doctype/ssh_access_audit_host/ssh_access_audit_host.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2025-01-29 17:22:44.021043",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "host",
diff --git a/press/infrastructure/doctype/ssh_access_audit_violation/ssh_access_audit_violation.json b/press/infrastructure/doctype/ssh_access_audit_violation/ssh_access_audit_violation.json
index bd6d6ee1..bea35694 100644
--- a/press/infrastructure/doctype/ssh_access_audit_violation/ssh_access_audit_violation.json
+++ b/press/infrastructure/doctype/ssh_access_audit_violation/ssh_access_audit_violation.json
@@ -2,14 +2,14 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2025-01-29 15:54:00.575633",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "host",
   "user",
   "key",
   "column_break_sigr",
-  "key_doctype",
+  "key_pagetype",
   "key_document",
   "key_field"
  ],
@@ -44,11 +44,11 @@
   },
   {
    "columns": 2,
-   "fieldname": "key_doctype",
+   "fieldname": "key_pagetype",
    "fieldtype": "Link",
    "in_list_view": 1,
-   "label": "Key DocType",
-   "options": "DocType",
+   "label": "Key PageType",
+   "options": "PageType",
    "read_only": 1
   },
   {
@@ -57,7 +57,7 @@
    "fieldtype": "Dynamic Link",
    "in_list_view": 1,
    "label": "Key Document",
-   "options": "key_doctype",
+   "options": "key_pagetype",
    "read_only": 1
   },
   {
diff --git a/press/infrastructure/doctype/ssh_access_audit_violation/ssh_access_audit_violation.py b/press/infrastructure/doctype/ssh_access_audit_violation/ssh_access_audit_violation.py
index 64875018..9aba5d20 100644
--- a/press/infrastructure/doctype/ssh_access_audit_violation/ssh_access_audit_violation.py
+++ b/press/infrastructure/doctype/ssh_access_audit_violation/ssh_access_audit_violation.py
@@ -18,7 +18,7 @@ class SSHAccessAuditViolation(Document):
 
 		host: DF.Data | None
 		key: DF.Code | None
-		key_doctype: DF.Link | None
+		key_pagetype: DF.Link | None
 		key_document: DF.DynamicLink | None
 		key_field: DF.Data | None
 		name: DF.Int | None
diff --git a/press/infrastructure/doctype/virtual_disk_resize/virtual_disk_resize.json b/press/infrastructure/doctype/virtual_disk_resize/virtual_disk_resize.json
index 76b77e37..55c81b69 100644
--- a/press/infrastructure/doctype/virtual_disk_resize/virtual_disk_resize.json
+++ b/press/infrastructure/doctype/virtual_disk_resize/virtual_disk_resize.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2025-01-21 14:22:10.675196",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "virtual_machine",
diff --git a/press/infrastructure/doctype/virtual_disk_resize/virtual_disk_resize.py b/press/infrastructure/doctype/virtual_disk_resize/virtual_disk_resize.py
index e25c8f1e..4dd828bd 100644
--- a/press/infrastructure/doctype/virtual_disk_resize/virtual_disk_resize.py
+++ b/press/infrastructure/doctype/virtual_disk_resize/virtual_disk_resize.py
@@ -13,10 +13,10 @@ import jingrow
 from jingrow.core.utils import find, find_all
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.ansible_console.ansible_console import AnsibleAdHoc
+from jcloude.jcloude.pagetype.ansible_console.ansible_console import AnsibleAdHoc
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+	from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 
 SUPPORTED_FILESYSTEMS = ["ext4"]
 
@@ -30,7 +30,7 @@ class VirtualDiskResize(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.infrastructure.doctype.virtual_machine_migration_step.virtual_machine_migration_step import (
+		from jcloude.infrastructure.pagetype.virtual_machine_migration_step.virtual_machine_migration_step import (
 			VirtualMachineMigrationStep,
 		)
 
@@ -135,7 +135,7 @@ class VirtualDiskResize(Document):
 
 	def validate_existing_migration(self):
 		if existing := jingrow.get_all(
-			self.doctype,
+			self.pagetype,
 			{
 				"status": ("in", [Status.Pending, Status.Running]),
 				"virtual_machine": self.virtual_machine,
@@ -617,7 +617,7 @@ class VirtualDiskResize(Document):
 			return
 
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"execute_step",
 			step_name=next_step.name,
diff --git a/press/infrastructure/doctype/virtual_machine_migration/virtual_machine_migration.json b/press/infrastructure/doctype/virtual_machine_migration/virtual_machine_migration.json
index 8ef43936..cbca63a8 100644
--- a/press/infrastructure/doctype/virtual_machine_migration/virtual_machine_migration.json
+++ b/press/infrastructure/doctype/virtual_machine_migration/virtual_machine_migration.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2024-09-19 15:30:52.341880",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "virtual_machine",
diff --git a/press/infrastructure/doctype/virtual_machine_migration/virtual_machine_migration.py b/press/infrastructure/doctype/virtual_machine_migration/virtual_machine_migration.py
index 63b01569..9bf4d29d 100644
--- a/press/infrastructure/doctype/virtual_machine_migration/virtual_machine_migration.py
+++ b/press/infrastructure/doctype/virtual_machine_migration/virtual_machine_migration.py
@@ -13,14 +13,14 @@ import jingrow
 from jingrow.core.utils import find
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.ansible_console.ansible_console import AnsibleAdHoc
+from jcloude.jcloude.pagetype.ansible_console.ansible_console import AnsibleAdHoc
 
 if TYPE_CHECKING:
-	from jcloude.infrastructure.doctype.virtual_machine_migration_step.virtual_machine_migration_step import (
+	from jcloude.infrastructure.pagetype.virtual_machine_migration_step.virtual_machine_migration_step import (
 		VirtualMachineMigrationStep,
 	)
-	from jcloude.jcloude.doctype.server.server import Server
-	from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+	from jcloude.jcloude.pagetype.server.server import Server
+	from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 
 
 StepStatus = Enum("StepStatus", ["Pending", "Running", "Success", "Failure"])
@@ -35,16 +35,16 @@ class VirtualMachineMigration(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.infrastructure.doctype.virtual_machine_migration_bind_mount.virtual_machine_migration_bind_mount import (
+		from jcloude.infrastructure.pagetype.virtual_machine_migration_bind_mount.virtual_machine_migration_bind_mount import (
 			VirtualMachineMigrationBindMount,
 		)
-		from jcloude.infrastructure.doctype.virtual_machine_migration_mount.virtual_machine_migration_mount import (
+		from jcloude.infrastructure.pagetype.virtual_machine_migration_mount.virtual_machine_migration_mount import (
 			VirtualMachineMigrationMount,
 		)
-		from jcloude.infrastructure.doctype.virtual_machine_migration_step.virtual_machine_migration_step import (
+		from jcloude.infrastructure.pagetype.virtual_machine_migration_step.virtual_machine_migration_step import (
 			VirtualMachineMigrationStep,
 		)
-		from jcloude.infrastructure.doctype.virtual_machine_migration_volume.virtual_machine_migration_volume import (
+		from jcloude.infrastructure.pagetype.virtual_machine_migration_volume.virtual_machine_migration_volume import (
 			VirtualMachineMigrationVolume,
 		)
 
@@ -67,7 +67,7 @@ class VirtualMachineMigration(Document):
 	# end: auto-generated types
 
 	def before_insert(self):
-		self.server_type: Literal["Database Server", "Server"] = self.machine.get_server().doctype
+		self.server_type: Literal["Database Server", "Server"] = self.machine.get_server().pagetype
 		self.validate_aws_only()
 		self.validate_existing_migration()
 		self.add_steps()
@@ -257,7 +257,7 @@ class VirtualMachineMigration(Document):
 
 	def validate_existing_migration(self):
 		if existing := jingrow.get_all(
-			self.doctype,
+			self.pagetype,
 			{
 				"status": ("in", ["Pending", "Running"]),
 				"virtual_machine": self.virtual_machine,
@@ -610,7 +610,7 @@ class VirtualMachineMigration(Document):
 			return
 
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"execute_step",
 			step_name=next_step.name,
diff --git a/press/infrastructure/doctype/virtual_machine_migration_bind_mount/virtual_machine_migration_bind_mount.json b/press/infrastructure/doctype/virtual_machine_migration_bind_mount/virtual_machine_migration_bind_mount.json
index 03b94983..959f182b 100644
--- a/press/infrastructure/doctype/virtual_machine_migration_bind_mount/virtual_machine_migration_bind_mount.json
+++ b/press/infrastructure/doctype/virtual_machine_migration_bind_mount/virtual_machine_migration_bind_mount.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2024-12-10 10:47:58.739108",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/infrastructure/doctype/virtual_machine_migration_mount/virtual_machine_migration_mount.json b/press/infrastructure/doctype/virtual_machine_migration_mount/virtual_machine_migration_mount.json
index 50188bc1..607bc1e9 100644
--- a/press/infrastructure/doctype/virtual_machine_migration_mount/virtual_machine_migration_mount.json
+++ b/press/infrastructure/doctype/virtual_machine_migration_mount/virtual_machine_migration_mount.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-11-26 15:14:54.328130",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/infrastructure/doctype/virtual_machine_migration_step/virtual_machine_migration_step.json b/press/infrastructure/doctype/virtual_machine_migration_step/virtual_machine_migration_step.json
index b2ce42fb..c3e11d99 100644
--- a/press/infrastructure/doctype/virtual_machine_migration_step/virtual_machine_migration_step.json
+++ b/press/infrastructure/doctype/virtual_machine_migration_step/virtual_machine_migration_step.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-09-19 16:13:15.738853",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/infrastructure/doctype/virtual_machine_migration_volume/virtual_machine_migration_volume.json b/press/infrastructure/doctype/virtual_machine_migration_volume/virtual_machine_migration_volume.json
index eab53e6f..71b659c1 100644
--- a/press/infrastructure/doctype/virtual_machine_migration_volume/virtual_machine_migration_volume.json
+++ b/press/infrastructure/doctype/virtual_machine_migration_volume/virtual_machine_migration_volume.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-09-19 16:14:46.399111",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/infrastructure/doctype/virtual_machine_replacement/virtual_machine_replacement.json b/press/infrastructure/doctype/virtual_machine_replacement/virtual_machine_replacement.json
index 94f0e048..0de40797 100644
--- a/press/infrastructure/doctype/virtual_machine_replacement/virtual_machine_replacement.json
+++ b/press/infrastructure/doctype/virtual_machine_replacement/virtual_machine_replacement.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2024-12-15 14:26:26.029692",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "virtual_machine",
diff --git a/press/infrastructure/doctype/virtual_machine_replacement/virtual_machine_replacement.py b/press/infrastructure/doctype/virtual_machine_replacement/virtual_machine_replacement.py
index 56bc9df0..1f5cdfd8 100644
--- a/press/infrastructure/doctype/virtual_machine_replacement/virtual_machine_replacement.py
+++ b/press/infrastructure/doctype/virtual_machine_replacement/virtual_machine_replacement.py
@@ -12,7 +12,7 @@ import jingrow
 from jingrow.model.document import Document
 
 if TYPE_CHECKING:
-	from jcloude.infrastructure.doctype.virtual_machine_migration_step.virtual_machine_migration_step import (
+	from jcloude.infrastructure.pagetype.virtual_machine_migration_step.virtual_machine_migration_step import (
 		VirtualMachineMigrationStep,
 	)
 
@@ -28,7 +28,7 @@ class VirtualMachineReplacement(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.infrastructure.doctype.virtual_machine_migration_step.virtual_machine_migration_step import (
+		from jcloude.infrastructure.pagetype.virtual_machine_migration_step.virtual_machine_migration_step import (
 			VirtualMachineMigrationStep,
 		)
 
@@ -71,7 +71,7 @@ class VirtualMachineReplacement(Document):
 
 	def validate_existing_replacement(self):
 		if existing := jingrow.get_all(
-			self.doctype,
+			self.pagetype,
 			{
 				"status": ("in", ["Pending", "Running"]),
 				"virtual_machine": self.virtual_machine,
@@ -269,7 +269,7 @@ class VirtualMachineReplacement(Document):
 			return
 
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"execute_step",
 			step_name=next_step.name,
diff --git a/press/install.py b/press/install.py
index 976548b8..776557c3 100644
--- a/press/install.py
+++ b/press/install.py
@@ -14,7 +14,7 @@ def after_install():
 def create_administrator_team():
 	administrator_team = jingrow.get_pg(
 		{
-			"doctype": "Team",
+			"pagetype": "Team",
 			"name": "Administrator",
 			"user": "Administrator",
 			"enabled": 1,
@@ -26,5 +26,5 @@ def create_administrator_team():
 
 
 def create_default_cluster():
-	default_cluster = jingrow.get_pg({"doctype": "Cluster", "name": "Default"})
+	default_cluster = jingrow.get_pg({"pagetype": "Cluster", "name": "Default"})
 	default_cluster.insert()
diff --git a/press/marketplace/doctype/app_plan_version/app_plan_version.json b/press/marketplace/doctype/app_plan_version/app_plan_version.json
index d8cde8ca..cf2ac125 100644
--- a/press/marketplace/doctype/app_plan_version/app_plan_version.json
+++ b/press/marketplace/doctype/app_plan_version/app_plan_version.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-01-27 02:04:09.352870",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.json b/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.json
index 9cee24bc..ec2fd24b 100644
--- a/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.json
+++ b/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-08-20 14:44:43.708918",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/app_user_review/app_user_review.json b/press/marketplace/doctype/app_user_review/app_user_review.json
index 30792745..57356ff0 100644
--- a/press/marketplace/doctype/app_user_review/app_user_review.json
+++ b/press/marketplace/doctype/app_user_review/app_user_review.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format:{app}-review-{####}",
  "creation": "2022-01-02 00:04:50.287198",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -53,7 +53,7 @@
  "links": [
   {
    "group": "General",
-   "link_doctype": "Developer Review Reply",
+   "link_pagetype": "Developer Review Reply",
    "link_fieldname": "review"
   }
  ],
diff --git a/press/marketplace/doctype/auto_release_team/auto_release_team.json b/press/marketplace/doctype/auto_release_team/auto_release_team.json
index c891ea9d..6bcc9f66 100644
--- a/press/marketplace/doctype/auto_release_team/auto_release_team.json
+++ b/press/marketplace/doctype/auto_release_team/auto_release_team.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-03-23 19:06:56.123030",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/developer_review_reply/developer_review_reply.json b/press/marketplace/doctype/developer_review_reply/developer_review_reply.json
index 8ca67103..a3875506 100644
--- a/press/marketplace/doctype/developer_review_reply/developer_review_reply.json
+++ b/press/marketplace/doctype/developer_review_reply/developer_review_reply.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-01-02 00:12:06.191929",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/featured_app/featured_app.json b/press/marketplace/doctype/featured_app/featured_app.json
index 2f16660b..8fdddded 100644
--- a/press/marketplace/doctype/featured_app/featured_app.json
+++ b/press/marketplace/doctype/featured_app/featured_app.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-03-24 22:50:57.189870",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/marketplace_add_on/marketplace_add_on.json b/press/marketplace/doctype/marketplace_add_on/marketplace_add_on.json
index a432fc32..7ffa87a4 100644
--- a/press/marketplace/doctype/marketplace_add_on/marketplace_add_on.json
+++ b/press/marketplace/doctype/marketplace_add_on/marketplace_add_on.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-09-07 18:18:28.399736",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.json b/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.json
index ec47d3c0..1fa6c0c0 100644
--- a/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.json
+++ b/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-03-20 18:20:02.321021",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "marketplace_app",
diff --git a/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.py b/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.py
index 7c8006f6..f2021aab 100644
--- a/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.py
+++ b/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.py
@@ -48,7 +48,7 @@ def collect_app_uninstall_feedback(app: str, feedback: str, site: str) -> None:
 
 	jingrow.get_pg(
 		{
-			"doctype": "Marketplace App Feedback",
+			"pagetype": "Marketplace App Feedback",
 			"marketplace_app": marketplace_app,
 			"feedback": feedback,
 			"site": site,
diff --git a/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.json b/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.json
index 45f38b26..8772e786 100644
--- a/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.json
+++ b/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.json
@@ -4,7 +4,7 @@
  "autoname": "field:app",
  "creation": "2023-04-19 12:03:55.402147",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.json b/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.json
index 75ad38c4..aebf8a27 100644
--- a/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.json
+++ b/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format:MARKETPLACE-PLAN-{app}-{###}",
  "creation": "2021-12-27 14:19:48.420915",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.py b/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.py
index b8b9cd5f..1797e032 100644
--- a/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.py
+++ b/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.py
@@ -6,7 +6,7 @@ from typing import List
 import jingrow
 from jingrow import cint
 
-from jcloude.jcloude.doctype.site_plan.plan import Plan
+from jcloude.jcloude.pagetype.site_plan.plan import Plan
 
 
 class MarketplaceAppPlan(Plan):
@@ -66,7 +66,7 @@ class MarketplaceAppPlan(Plan):
 
 		return jingrow.get_pg(
 			{
-				"doctype": "Subscription",
+				"pagetype": "Subscription",
 				"document_type": "Marketplace App",
 				"document_name": app_name,
 				"plan_type": "Marketplace App Plan",
diff --git a/press/marketplace/doctype/marketplace_app_plan/test_marketplace_app_plan.py b/press/marketplace/doctype/marketplace_app_plan/test_marketplace_app_plan.py
index 1a583e0a..ac795e0b 100644
--- a/press/marketplace/doctype/marketplace_app_plan/test_marketplace_app_plan.py
+++ b/press/marketplace/doctype/marketplace_app_plan/test_marketplace_app_plan.py
@@ -4,8 +4,8 @@
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.marketplace_app.test_marketplace_app import (
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.marketplace_app.test_marketplace_app import (
 	create_test_marketplace_app,
 )
 
@@ -18,7 +18,7 @@ def create_test_marketplace_app_plan(app: str = "jingrow"):
 
 	return jingrow.get_pg(
 		{
-			"doctype": "Marketplace App Plan",
+			"pagetype": "Marketplace App Plan",
 			"title": "Test Plan",
 			"price_inr": 1000,
 			"price_usd": 12,
diff --git a/press/marketplace/doctype/marketplace_app_plans/marketplace_app_plans.json b/press/marketplace/doctype/marketplace_app_plans/marketplace_app_plans.json
index f603f0ba..fb45cd4b 100644
--- a/press/marketplace/doctype/marketplace_app_plans/marketplace_app_plans.json
+++ b/press/marketplace/doctype/marketplace_app_plans/marketplace_app_plans.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2021-11-16 20:06:51.033404",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.json b/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.json
index cf26bee6..ce1af5a8 100644
--- a/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.json
+++ b/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "format:app-subscription-{app}-{#####}",
  "creation": "2022-03-06 20:52:51.924858",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.py b/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.py
index 93ea5531..04a90814 100644
--- a/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.py
+++ b/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.py
@@ -5,7 +5,7 @@ import jingrow
 import requests
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.site.site import Site
+from jcloude.jcloude.pagetype.site.site import Site
 
 
 class MarketplaceAppSubscription(Document):
@@ -22,7 +22,7 @@ class MarketplaceAppSubscription(Document):
 	def create_site_config_key(self):
 		if not jingrow.db.exists("Site Config Key", {"key": f"sk_{self.app}"}):
 			jingrow.get_pg(
-				doctype="Site Config Key", internal=True, key=f"sk_{self.app}"
+				pagetype="Site Config Key", internal=True, key=f"sk_{self.app}"
 			).insert(ignore_permissions=True)
 
 	def validate_marketplace_app_plan(self):
@@ -78,7 +78,7 @@ class MarketplaceAppSubscription(Document):
 
 		subscription = jingrow.get_pg(
 			{
-				"doctype": "Subscription",
+				"pagetype": "Subscription",
 				"team": self.team,
 				"document_type": "Marketplace App",
 				"document_name": self.app,
diff --git a/press/marketplace/doctype/marketplace_app_subscription/test_marketplace_app_subscription.py b/press/marketplace/doctype/marketplace_app_subscription/test_marketplace_app_subscription.py
index da4fd170..e157bb50 100644
--- a/press/marketplace/doctype/marketplace_app_subscription/test_marketplace_app_subscription.py
+++ b/press/marketplace/doctype/marketplace_app_subscription/test_marketplace_app_subscription.py
@@ -3,15 +3,15 @@
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.marketplace.doctype.marketplace_app_plan.test_marketplace_app_plan import (
+from jcloude.marketplace.pagetype.marketplace_app_plan.test_marketplace_app_plan import (
 	create_test_marketplace_app_plan,
 )
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.marketplace_app.test_marketplace_app import (
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.marketplace_app.test_marketplace_app import (
 	create_test_marketplace_app,
 )
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 
 def create_test_marketplace_app_subscription(
@@ -24,7 +24,7 @@ def create_test_marketplace_app_subscription(
 	site = site if site else create_test_site(team=team).name
 	return jingrow.get_pg(
 		{
-			"doctype": "Subscription",
+			"pagetype": "Subscription",
 			"document_type": "Marketplace App",
 			"document_name": app,
 			"plan_type": "Marketplace App Plan",
diff --git a/press/marketplace/doctype/marketplace_promotional_banner/marketplace_promotional_banner.json b/press/marketplace/doctype/marketplace_promotional_banner/marketplace_promotional_banner.json
index 30a8edcd..fdbe56fd 100644
--- a/press/marketplace/doctype/marketplace_promotional_banner/marketplace_promotional_banner.json
+++ b/press/marketplace/doctype/marketplace_promotional_banner/marketplace_promotional_banner.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format:{marketplace_app}-marketplace-promotion-{##}",
  "creation": "2022-07-05 13:26:19.810839",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/marketplace_publisher_profile/marketplace_publisher_profile.json b/press/marketplace/doctype/marketplace_publisher_profile/marketplace_publisher_profile.json
index d644160d..97fd25af 100644
--- a/press/marketplace/doctype/marketplace_publisher_profile/marketplace_publisher_profile.json
+++ b/press/marketplace/doctype/marketplace_publisher_profile/marketplace_publisher_profile.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2021-10-14 19:06:47.319840",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/marketplace/doctype/marketplace_settings/marketplace_settings.json b/press/marketplace/doctype/marketplace_settings/marketplace_settings.json
index a14b582e..f2e62de0 100644
--- a/press/marketplace/doctype/marketplace_settings/marketplace_settings.json
+++ b/press/marketplace/doctype/marketplace_settings/marketplace_settings.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-03-24 22:49:45.741578",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/metrics.py b/press/metrics.py
index 515f5f3c..2e2d6d96 100644
--- a/press/metrics.py
+++ b/press/metrics.py
@@ -16,12 +16,12 @@ class MetricsRenderer:
 		self.path = path
 		self.registry = CollectorRegistry(auto_describe=True)
 
-	def get_status(self, metric, doctype, status_field="status", filters=None):
+	def get_status(self, metric, pagetype, status_field="status", filters=None):
 		if filters is None:
 			filters = {}
 		c = Gauge(metric, "", [status_field], registry=self.registry)
 		rows = jingrow.get_all(
-			doctype,
+			pagetype,
 			fields=[status_field, "count(*) as count"],
 			filters=filters,
 			group_by=status_field,
diff --git a/press/notifications.py b/press/notifications.py
index edd6bbb3..7c1e74b2 100644
--- a/press/notifications.py
+++ b/press/notifications.py
@@ -8,7 +8,7 @@
 
 def get_notification_config():
 	return {
-		"for_doctype": {
+		"for_pagetype": {
 			"Site": {"status": "Active"},
 			"Bench": {"status": "Active"},
 			"Server": {"status": "Active"},
diff --git a/press/overrides.py b/press/overrides.py
index 522ace03..fcaea86b 100644
--- a/press/overrides.py
+++ b/press/overrides.py
@@ -6,7 +6,7 @@ import os
 from functools import partial
 
 import jingrow
-from jingrow.core.doctype.user.user import User
+from jingrow.core.pagetype.user.user import User
 from jingrow.handler import is_whitelisted
 from jingrow.utils import cint
 
@@ -19,7 +19,7 @@ from jcloude.utils import _get_current_team, _system_user
 def upload_file():
 	files = jingrow.request.files
 	is_private = jingrow.form_dict.is_private
-	doctype = jingrow.form_dict.doctype
+	pagetype = jingrow.form_dict.pagetype
 	docname = jingrow.form_dict.docname
 	fieldname = jingrow.form_dict.fieldname
 	file_url = jingrow.form_dict.file_url
@@ -42,8 +42,8 @@ def upload_file():
 		return method()
 	ret = jingrow.get_pg(
 		{
-			"doctype": "File",
-			"attached_to_doctype": doctype,
+			"pagetype": "File",
+			"attached_to_pagetype": pagetype,
 			"attached_to_name": docname,
 			"attached_to_field": fieldname,
 			"folder": folder,
@@ -153,13 +153,13 @@ def has_permission(pg, ptype, user):
 	if pg.team == team or pg.team in child_team_members:
 		return True
 
-	if has_support_access(pg.doctype, pg.name):
+	if has_support_access(pg.pagetype, pg.name):
 		return True
 
 	return False
 
 
-def get_permission_query_conditions_for_doctype_and_user(doctype, user):
+def get_permission_query_conditions_for_pagetype_and_user(pagetype, user):
 	from jcloude.utils import get_current_team
 
 	if not user:
@@ -171,11 +171,11 @@ def get_permission_query_conditions_for_doctype_and_user(doctype, user):
 
 	team = get_current_team()
 
-	return f"(`tab{doctype}`.`team` = {jingrow.db.escape(team)})"
+	return f"(`tab{pagetype}`.`team` = {jingrow.db.escape(team)})"
 
 
-def get_permission_query_conditions_for_doctype(doctype):
-	return partial(get_permission_query_conditions_for_doctype_and_user, doctype)
+def get_permission_query_conditions_for_pagetype(pagetype):
+	return partial(get_permission_query_conditions_for_pagetype_and_user, pagetype)
 
 
 class CustomUser(User):
@@ -185,7 +185,7 @@ class CustomUser(User):
 	def get_list_query(query):
 		team = jingrow.local.team()
 		allowed_users = [d.user for d in team.team_members]
-		User = jingrow.qb.DocType("User")
+		User = jingrow.qb.PageType("User")
 		return query.where(User.name.isin(allowed_users))
 
 	def after_rename(self, old_name, new_name, merge=False):
diff --git a/press/partner/doctype/certificate_link_request/certificate_link_request.json b/press/partner/doctype/certificate_link_request/certificate_link_request.json
index 4c440ca6..906aa3ba 100644
--- a/press/partner/doctype/certificate_link_request/certificate_link_request.json
+++ b/press/partner/doctype/certificate_link_request/certificate_link_request.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "hash",
  "creation": "2025-11-14 15:07:44.473133",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "partner_team",
diff --git a/press/partner/doctype/certificate_link_request/test_certificate_link_request.py b/press/partner/doctype/certificate_link_request/test_certificate_link_request.py
index 54a13deb..d4a6b167 100644
--- a/press/partner/doctype/certificate_link_request/test_certificate_link_request.py
+++ b/press/partner/doctype/certificate_link_request/test_certificate_link_request.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/partner/doctype/lead_followup/lead_followup.json b/press/partner/doctype/lead_followup/lead_followup.json
index 34d82b9c..ab7f0298 100644
--- a/press/partner/doctype/lead_followup/lead_followup.json
+++ b/press/partner/doctype/lead_followup/lead_followup.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-05-23 11:41:16.770087",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/partner/doctype/partner_approval_request/partner_approval_request.json b/press/partner/doctype/partner_approval_request/partner_approval_request.json
index 4d3b97e9..b9a92df5 100644
--- a/press/partner/doctype/partner_approval_request/partner_approval_request.json
+++ b/press/partner/doctype/partner_approval_request/partner_approval_request.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-08-31 16:28:55.148891",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/partner/doctype/partner_certificate/partner_certificate.json b/press/partner/doctype/partner_certificate/partner_certificate.json
index 80596047..2b90103f 100644
--- a/press/partner/doctype/partner_certificate/partner_certificate.json
+++ b/press/partner/doctype/partner_certificate/partner_certificate.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "PCERT-.#####",
  "creation": "2025-02-28 21:41:15.404946",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "course",
diff --git a/press/partner/doctype/partner_certificate/partner_certificate.py b/press/partner/doctype/partner_certificate/partner_certificate.py
index 8530decb..fef696b7 100644
--- a/press/partner/doctype/partner_certificate/partner_certificate.py
+++ b/press/partner/doctype/partner_certificate/partner_certificate.py
@@ -41,8 +41,8 @@ class PartnerCertificate(Document):
 
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
-		PartnerCertificate = jingrow.qb.DocType("Partner Certificate")
-		Team = jingrow.qb.DocType("Team")
+		PartnerCertificate = jingrow.qb.PageType("Partner Certificate")
+		Team = jingrow.qb.PageType("Team")
 
 		query = (
 			jingrow.qb.from_(PartnerCertificate)
diff --git a/press/partner/doctype/partner_certificate_request/partner_certificate_request.json b/press/partner/doctype/partner_certificate_request/partner_certificate_request.json
index 65dc3ec4..96e0192a 100644
--- a/press/partner/doctype/partner_certificate_request/partner_certificate_request.json
+++ b/press/partner/doctype/partner_certificate_request/partner_certificate_request.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "hash",
  "creation": "2025-03-01 11:27:40.991647",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "partner_team",
diff --git a/press/partner/doctype/partner_consent/partner_consent.json b/press/partner/doctype/partner_consent/partner_consent.json
index 5cc4596c..b8bbdb0a 100644
--- a/press/partner/doctype/partner_consent/partner_consent.json
+++ b/press/partner/doctype/partner_consent/partner_consent.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2025-07-15 11:14:36.592329",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "date",
diff --git a/press/partner/doctype/partner_consent/test_partner_consent.py b/press/partner/doctype/partner_consent/test_partner_consent.py
index 46ac9531..756a200a 100644
--- a/press/partner/doctype/partner_consent/test_partner_consent.py
+++ b/press/partner/doctype/partner_consent/test_partner_consent.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/partner/doctype/partner_lead/partner_lead.json b/press/partner/doctype/partner_lead/partner_lead.json
index ade22ed4..597bfb2e 100644
--- a/press/partner/doctype/partner_lead/partner_lead.json
+++ b/press/partner/doctype/partner_lead/partner_lead.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "PRM-LEAD-.#####",
  "creation": "2025-05-14 16:23:41.502914",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "details_tab",
diff --git a/press/partner/doctype/partner_lead/partner_lead.py b/press/partner/doctype/partner_lead/partner_lead.py
index 04a9f3c2..e9cc0302 100644
--- a/press/partner/doctype/partner_lead/partner_lead.py
+++ b/press/partner/doctype/partner_lead/partner_lead.py
@@ -15,7 +15,7 @@ class PartnerLead(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.partner.doctype.lead_followup.lead_followup import LeadFollowup
+		from jcloude.partner.pagetype.lead_followup.lead_followup import LeadFollowup
 
 		additional_comments: DF.SmallText | None
 		assistance_type: DF.Literal["Pre-sales Demo", "Plan suggestion", "Proposal", "Closing a deal"]
@@ -121,7 +121,7 @@ class PartnerLead(Document):
 
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
-		PartnerLead = jingrow.qb.DocType("Partner Lead")
+		PartnerLead = jingrow.qb.PageType("Partner Lead")
 		query = jingrow.qb.from_(PartnerLead).select(
 			PartnerLead.name,
 			PartnerLead.organization_name,
diff --git a/press/partner/doctype/partner_lead/test_partner_lead.py b/press/partner/doctype/partner_lead/test_partner_lead.py
index a14f692f..05570996 100644
--- a/press/partner/doctype/partner_lead/test_partner_lead.py
+++ b/press/partner/doctype/partner_lead/test_partner_lead.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/partner/doctype/partner_lead_origin/partner_lead_origin.json b/press/partner/doctype/partner_lead_origin/partner_lead_origin.json
index 2c0253ec..04c97611 100644
--- a/press/partner/doctype/partner_lead_origin/partner_lead_origin.json
+++ b/press/partner/doctype/partner_lead_origin/partner_lead_origin.json
@@ -4,7 +4,7 @@
  "allow_rename": 1,
  "autoname": "field:origin",
  "creation": "2025-05-12 16:52:44.096338",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "origin",
diff --git a/press/partner/doctype/partner_lead_origin/test_partner_lead_origin.py b/press/partner/doctype/partner_lead_origin/test_partner_lead_origin.py
index c03abcaa..a497480e 100644
--- a/press/partner/doctype/partner_lead_origin/test_partner_lead_origin.py
+++ b/press/partner/doctype/partner_lead_origin/test_partner_lead_origin.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/partner/doctype/partner_lead_type/partner_lead_type.json b/press/partner/doctype/partner_lead_type/partner_lead_type.json
index 58e408aa..f6ca9a18 100644
--- a/press/partner/doctype/partner_lead_type/partner_lead_type.json
+++ b/press/partner/doctype/partner_lead_type/partner_lead_type.json
@@ -4,7 +4,7 @@
  "allow_rename": 1,
  "autoname": "field:title",
  "creation": "2025-05-12 16:54:59.138216",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "title",
diff --git a/press/partner/doctype/partner_lead_type/test_partner_lead_type.py b/press/partner/doctype/partner_lead_type/test_partner_lead_type.py
index 5f771493..23e48c7c 100644
--- a/press/partner/doctype/partner_lead_type/test_partner_lead_type.py
+++ b/press/partner/doctype/partner_lead_type/test_partner_lead_type.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/partner/doctype/partner_tier/partner_tier.json b/press/partner/doctype/partner_tier/partner_tier.json
index a16dbd44..abd4777f 100644
--- a/press/partner/doctype/partner_tier/partner_tier.json
+++ b/press/partner/doctype/partner_tier/partner_tier.json
@@ -4,7 +4,7 @@
  "allow_rename": 1,
  "autoname": "field:title",
  "creation": "2024-10-29 23:03:54.259118",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "enabled",
diff --git a/press/partner/doctype/territory/territory.json b/press/partner/doctype/territory/territory.json
index 16eb7db8..eae98067 100644
--- a/press/partner/doctype/territory/territory.json
+++ b/press/partner/doctype/territory/territory.json
@@ -4,7 +4,7 @@
  "allow_rename": 1,
  "autoname": "field:territory_name",
  "creation": "2025-11-06 11:17:55.549322",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "section_break_0ge5",
diff --git a/press/partner/doctype/territory/test_territory.py b/press/partner/doctype/territory/test_territory.py
index d2c1a2e6..316bd53f 100644
--- a/press/partner/doctype/territory/test_territory.py
+++ b/press/partner/doctype/territory/test_territory.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/patches.txt b/press/patches.txt
index 4d0b32e2..fa49cf95 100644
--- a/press/patches.txt
+++ b/press/patches.txt
@@ -3,7 +3,7 @@ jcloude.patches.v0_0_1.site_history_to_site_activity
 jcloude.patches.v0_0_1.user_account_to_team #6
 jcloude.patches.v0_0_1.rename_transaction_currency_to_currency
 jcloude.patches.v0_0_1.create_site_plan_change_log
-execute:jingrow.reload_pg('jcloude', 'doctype', 'team')
+execute:jingrow.reload_pg('jcloude', 'pagetype', 'team')
 execute:jingrow.db.set_value('Team', {'enabled': 1}, {'free_credits_allocated': 1}, update_modified=False)
 jcloude.patches.v0_0_1.update_proxy_for_suspended_and_inactive_sites
 jcloude.patches.v0_0_1.rename_site_backup_fields # 2020-05-22
@@ -21,7 +21,7 @@ jcloude.patches.v0_0_1.move_domains_from_archived_to_active_sites
 jcloude.patches.v0_0_1.remove_domains_linked_to_archived_sites
 jcloude.patches.v0_0_1.delete_logs_from_archived_sites
 jcloude.patches.v0_0_1.add_domains_to_site_config
-execute:jingrow.reload_pg('jcloude', 'doctype', 'Remote File')
+execute:jingrow.reload_pg('jcloude', 'pagetype', 'Remote File')
 # jcloude.patches.v0_0_1.add_site_to_remote_file # 2020-11-12 run via run-patch command in active site state
 jcloude.patches.v0_0_1.new_onboarding
 jcloude.patches.v0_0_1.remove_obsolete_doctypes
@@ -40,7 +40,7 @@ jcloude.patches.v0_0_1.set_document_type_in_plan
 # Backups "refactor"
 # jcloude.patches.v0_0_1.update_backups_availability
 # Update transaction details in paid invoices
-# jcloude.jcloude.doctype.invoice.patches.set_transaction_details
+# jcloude.jcloude.pagetype.invoice.patches.set_transaction_details
 jcloude.patches.v0_0_1.set_billing_name_for_teams
 # App Subsystem Refactor
 jcloude.patches.v0_0_1.rename_jingrow_app_to_app
@@ -73,82 +73,82 @@ jcloude.patches.v0_0_1.set_dependencies_in_release_group
 jcloude.patches.v0_0_1.set_monitoring_password_in_cluster
 jcloude.patches.v0_0_1.add_domains_in_site_config_preview
 jcloude.patches.v0_0_1.use_private_ip_for_upstreams
-jcloude.jcloude.doctype.site.patches.set_plan_in_site
-jcloude.jcloude.doctype.app_release.patches.set_status_to_draft
+jcloude.jcloude.pagetype.site.patches.set_plan_in_site
+jcloude.jcloude.pagetype.app_release.patches.set_status_to_draft
 jcloude.patches.v0_0_4.remove_legacy_billing_doctypes
-# jcloude.jcloude.doctype.invoice.patches.set_free_credits # 2021-08-11 run via run-patch command
-jcloude.jcloude.doctype.team.patches.set_payment_mode
+# jcloude.jcloude.pagetype.invoice.patches.set_free_credits # 2021-08-11 run via run-patch command
+jcloude.jcloude.pagetype.team.patches.set_payment_mode
 jcloude.patches.v0_0_1.add_team_name_as_default_notify_email
-jcloude.jcloude.doctype.team.patches.set_referrer_id
-jcloude.jcloude.doctype.team.patches.set_partner_email
-jcloude.jcloude.doctype.proxy_server.patches.generate_proxysql_monitor_password
-jcloude.jcloude.doctype.virtual_machine.patches.populate_volumes_table
-jcloude.jcloude.doctype.release_group.patches.set_bench_dependency_in_release_group
-jcloude.jcloude.doctype.jcloude_settings.patches.move_stripe_credentials_to_jcloude_settings
+jcloude.jcloude.pagetype.team.patches.set_referrer_id
+jcloude.jcloude.pagetype.team.patches.set_partner_email
+jcloude.jcloude.pagetype.proxy_server.patches.generate_proxysql_monitor_password
+jcloude.jcloude.pagetype.virtual_machine.patches.populate_volumes_table
+jcloude.jcloude.pagetype.release_group.patches.set_bench_dependency_in_release_group
+jcloude.jcloude.pagetype.jcloude_settings.patches.move_stripe_credentials_to_jcloude_settings
 jcloude.patches.v0_0_4.disable_subscriptions_for_inactive_sites
-jcloude.jcloude.doctype.virtual_machine.patches.set_naming_fields
-jcloude.jcloude.doctype.virtual_machine.patches.set_virtual_machine_naming_series
-jcloude.jcloude.doctype.virtual_machine.patches.rename_virtual_machines
-jcloude.jcloude.doctype.user_ssh_key.patches.set_existing_keys_as_default
-jcloude.jcloude.doctype.jcloude_settings.patches.set_jcloude_monitoring_password
-jcloude.jcloude.doctype.deploy_candidate_app.patches.set_app_name_to_app
-jcloude.jcloude.doctype.site.patches.set_database_access_credentials
-jcloude.jcloude.doctype.team.patches.set_team_title
-jcloude.jcloude.doctype.telegram_group.patches.create_groups_from_jcloude_settings
-jcloude.jcloude.doctype.app_release.patches.set_clone_directory
-jcloude.jcloude.doctype.database_server_mariadb_variable.patches.add_unique_constraint
-jcloude.jcloude.doctype.release_group.patches.sync_common_site_config
+jcloude.jcloude.pagetype.virtual_machine.patches.set_naming_fields
+jcloude.jcloude.pagetype.virtual_machine.patches.set_virtual_machine_naming_series
+jcloude.jcloude.pagetype.virtual_machine.patches.rename_virtual_machines
+jcloude.jcloude.pagetype.user_ssh_key.patches.set_existing_keys_as_default
+jcloude.jcloude.pagetype.jcloude_settings.patches.set_jcloude_monitoring_password
+jcloude.jcloude.pagetype.deploy_candidate_app.patches.set_app_name_to_app
+jcloude.jcloude.pagetype.site.patches.set_database_access_credentials
+jcloude.jcloude.pagetype.team.patches.set_team_title
+jcloude.jcloude.pagetype.telegram_group.patches.create_groups_from_jcloude_settings
+jcloude.jcloude.pagetype.app_release.patches.set_clone_directory
+jcloude.jcloude.pagetype.database_server_mariadb_variable.patches.add_unique_constraint
+jcloude.jcloude.pagetype.release_group.patches.sync_common_site_config
 execute:jingrow.delete_pg('Central Site Migration')
 execute:jingrow.delete_pg('Central Server')
 execute:jingrow.delete_pg('Feature Traction')
 jcloude.patches.v0_7_0.set_hostname_abbreviation
-jcloude.jcloude.doctype.cluster.patches.rename_aws_fields
-jcloude.jcloude.doctype.virtual_machine.patches.rename_aws_fields
-jcloude.jcloude.doctype.virtual_machine_image.patches.rename_aws_fields
-jcloude.jcloude.doctype.virtual_disk_snapshot.patches.rename_aws_fields
-jcloude.jcloude.doctype.virtual_machine_volume.patches.rename_aws_fields
+jcloude.jcloude.pagetype.cluster.patches.rename_aws_fields
+jcloude.jcloude.pagetype.virtual_machine.patches.rename_aws_fields
+jcloude.jcloude.pagetype.virtual_machine_image.patches.rename_aws_fields
+jcloude.jcloude.pagetype.virtual_disk_snapshot.patches.rename_aws_fields
+jcloude.jcloude.pagetype.virtual_machine_volume.patches.rename_aws_fields
 jcloude.patches.v0_7_0.convert_marketplace_description_to_html
-jcloude.jcloude.doctype.team.patches.remove_invalid_email_addresses
-jcloude.saas.doctype.product_trial.patches.rename_saas_product_doctypes_to_product_trial
+jcloude.jcloude.pagetype.team.patches.remove_invalid_email_addresses
+jcloude.saas.pagetype.product_trial.patches.rename_saas_product_doctypes_to_product_trial
 
 [post_model_sync]
 jcloude.patches.v0_7_0.rename_plan_to_site_plan
 jcloude.patches.v0_7_0.migrate_fields_from_plans_to_server_and_marketplace
 jcloude.patches.v0_7_0.set_password_config_type
-jcloude.jcloude.doctype.agent_job.patches.update_status_for_undelivered_jobs #2024-04-23
-jcloude.jcloude.doctype.jcloude_role.patches.migrate_permissions
-jcloude.jcloude.doctype.jcloude_role.patches.change_fields_from_enable_to_allow
-jcloude.jcloude.doctype.stripe_webhook_log.patches.add_payment_method_for_failed_events
+jcloude.jcloude.pagetype.agent_job.patches.update_status_for_undelivered_jobs #2024-04-23
+jcloude.jcloude.pagetype.jcloude_role.patches.migrate_permissions
+jcloude.jcloude.pagetype.jcloude_role.patches.change_fields_from_enable_to_allow
+jcloude.jcloude.pagetype.stripe_webhook_log.patches.add_payment_method_for_failed_events
 jcloude.patches.v0_7_0.add_team_field_for_site_related_doctypes
 jcloude.patches.v0_7_0.add_team_field_for_site_backups_archived
-jcloude.jcloude.doctype.server_storage_plan.patches.add_subscription_for_servers_with_additional_disk
-jcloude.jcloude.doctype.jcloude_notification.patches.link_reference_doctype_to_notifications
-jcloude.jcloude.doctype.site.patches.set_plan_limit_in_site_config
-jcloude.jcloude.doctype.payout_order.patches.change_fields_from_recipient_to_team
-jcloude.jcloude.doctype.payout_order.patches.compute_total_amount
-jcloude.jcloude.doctype.marketplace_app.patches.change_field_from_first_site_creation_to_site_creation
-jcloude.jcloude.doctype.marketplace_app.patches.convert_images_to_webp
-jcloude.marketplace.doctype.app_user_review.patches.add_rating_values_to_apps
-jcloude.jcloude.doctype.site.patches.set_status_wizard_check_next_retry_datetime_in_site
+jcloude.jcloude.pagetype.server_storage_plan.patches.add_subscription_for_servers_with_additional_disk
+jcloude.jcloude.pagetype.jcloude_notification.patches.link_reference_pagetype_to_notifications
+jcloude.jcloude.pagetype.site.patches.set_plan_limit_in_site_config
+jcloude.jcloude.pagetype.payout_order.patches.change_fields_from_recipient_to_team
+jcloude.jcloude.pagetype.payout_order.patches.compute_total_amount
+jcloude.jcloude.pagetype.marketplace_app.patches.change_field_from_first_site_creation_to_site_creation
+jcloude.jcloude.pagetype.marketplace_app.patches.convert_images_to_webp
+jcloude.marketplace.pagetype.app_user_review.patches.add_rating_values_to_apps
+jcloude.jcloude.pagetype.site.patches.set_status_wizard_check_next_retry_datetime_in_site
 jcloude.patches.v0_7_0.update_enable_performance_tuning
-jcloude.jcloude.doctype.server.patches.set_plan_and_subscription
+jcloude.jcloude.pagetype.server.patches.set_plan_and_subscription
 jcloude.patches.v0_7_0.move_site_db_access_users_to_site_db_perm_manager
-jcloude.jcloude.doctype.drip_email.patches.set_correct_field_for_html
+jcloude.jcloude.pagetype.drip_email.patches.set_correct_field_for_html
 jcloude.patches.v0_7_0.set_label_for_site_database_user
-jcloude.jcloude.doctype.jcloude_settings.patches.set_redis_cache_size
-jcloude.jcloude.doctype.virtual_machine.patches.set_root_disk_size
-jcloude.jcloude.doctype.virtual_machine_image.patches.set_root_size
+jcloude.jcloude.pagetype.jcloude_settings.patches.set_redis_cache_size
+jcloude.jcloude.pagetype.virtual_machine.patches.set_root_disk_size
+jcloude.jcloude.pagetype.virtual_machine_image.patches.set_root_size
 jcloude.patches.v0_7_0.fix_team_for_tls_certificates
-jcloude.jcloude.doctype.jcloude_settings.patches.set_minimum_rebuild_memory
-jcloude.jcloude.doctype.app_patch.patches.set_archived_patch_on_archived_bench
+jcloude.jcloude.pagetype.jcloude_settings.patches.set_minimum_rebuild_memory
+jcloude.jcloude.pagetype.app_patch.patches.set_archived_patch_on_archived_bench
 jcloude.patches.v0_7_0.add_site_backup_times_for_configured_ones
 jcloude.patches.v0_7_0.rename_site_skip_scheduled_backups_field
-jcloude.jcloude.doctype.drip_email.patches.migrate_to_product_trial_field
-jcloude.jcloude.doctype.mpesa_payment_record.patches.add_unique_constraint
-jcloude.jcloude.doctype.user_2fa.patches.generate_recovery_codes
-jcloude.jcloude.doctype.account_request.patches.generate_expiration_time_for_request_key
-jcloude.saas.doctype.product_trial_request.patches.set_subscription_created_flag
+jcloude.jcloude.pagetype.drip_email.patches.migrate_to_product_trial_field
+jcloude.jcloude.pagetype.mpesa_payment_record.patches.add_unique_constraint
+jcloude.jcloude.pagetype.user_2fa.patches.generate_recovery_codes
+jcloude.jcloude.pagetype.account_request.patches.generate_expiration_time_for_request_key
+jcloude.saas.pagetype.product_trial_request.patches.set_subscription_created_flag
 jcloude.patches.v0_8_0.move_notify_billing_email_of_team_to_child_pg
 jcloude.patches.v0_8_0.reset_release_group_gunicorn_workers
 jcloude.patches.v0_8_0.clear_alertmanager_webhook_log
-jcloude.jcloude.doctype.jcloude_role.patches.to_resources
+jcloude.jcloude.pagetype.jcloude_role.patches.to_resources
diff --git a/press/patches/v0_0_1/add_site_index_to_site_migration.py b/press/patches/v0_0_1/add_site_index_to_site_migration.py
index cfca2fc5..0207c982 100644
--- a/press/patches/v0_0_1/add_site_index_to_site_migration.py
+++ b/press/patches/v0_0_1/add_site_index_to_site_migration.py
@@ -6,4 +6,4 @@ import jingrow
 
 
 def execute():
-	jingrow.get_pg("DocType", "Site Migration").run_module_method("on_doctype_update")
+	jingrow.get_pg("PageType", "Site Migration").run_module_method("on_pagetype_update")
diff --git a/press/patches/v0_0_1/add_team_name_as_default_notify_email.py b/press/patches/v0_0_1/add_team_name_as_default_notify_email.py
index b082246b..95551391 100644
--- a/press/patches/v0_0_1/add_team_name_as_default_notify_email.py
+++ b/press/patches/v0_0_1/add_team_name_as_default_notify_email.py
@@ -1,7 +1,7 @@
 import jingrow
 
-jingrow.reload_doctype("Team")
-jingrow.reload_doctype("Site")
+jingrow.reload_pagetype("Team")
+jingrow.reload_pagetype("Site")
 
 
 def execute():
diff --git a/press/patches/v0_0_1/breakdown_site_usage_into_multiple_fields.py b/press/patches/v0_0_1/breakdown_site_usage_into_multiple_fields.py
index 2f81095a..f7da1fc8 100644
--- a/press/patches/v0_0_1/breakdown_site_usage_into_multiple_fields.py
+++ b/press/patches/v0_0_1/breakdown_site_usage_into_multiple_fields.py
@@ -5,7 +5,7 @@ import jingrow
 
 def execute():
 	"""Convert site._site_usages Data field into individual fields"""
-	jingrow.reload_pg("jcloude", "doctype", "site")
+	jingrow.reload_pg("jcloude", "pagetype", "site")
 	non_archived_sites = jingrow.get_all(
 		"Site", filters={"status": ("!=", "Archived")}, pluck="name"
 	)
diff --git a/press/patches/v0_0_1/create_app_release_difference_from_deploy_candidate_difference.py b/press/patches/v0_0_1/create_app_release_difference_from_deploy_candidate_difference.py
index 0d6125d7..6f8458ff 100644
--- a/press/patches/v0_0_1/create_app_release_difference_from_deploy_candidate_difference.py
+++ b/press/patches/v0_0_1/create_app_release_difference_from_deploy_candidate_difference.py
@@ -7,9 +7,9 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "deploy_candidate_difference")
-	jingrow.reload_pg("jcloude", "doctype", "deploy_candidate_difference_app")
-	jingrow.reload_pg("jcloude", "doctype", "app_release_difference")
+	jingrow.reload_pg("jcloude", "pagetype", "deploy_candidate_difference")
+	jingrow.reload_pg("jcloude", "pagetype", "deploy_candidate_difference_app")
+	jingrow.reload_pg("jcloude", "pagetype", "app_release_difference")
 
 	jingrow.db.delete("Deploy Candidate Difference App", {"changed": False})
 	differences = jingrow.get_all("Deploy Candidate Difference App", "*")
@@ -25,7 +25,7 @@ def execute():
 		if not release_difference:
 			release_difference_pg = jingrow.get_pg(
 				{
-					"doctype": "App Release Difference",
+					"pagetype": "App Release Difference",
 					"app": difference.app,
 					"deploy_type": difference.deploy_type,
 					"source": jingrow.db.get_value("App Release", difference.source_release, "source"),
diff --git a/press/patches/v0_0_1/create_app_source_from_app.py b/press/patches/v0_0_1/create_app_source_from_app.py
index aee4d5e4..c796906e 100644
--- a/press/patches/v0_0_1/create_app_source_from_app.py
+++ b/press/patches/v0_0_1/create_app_source_from_app.py
@@ -8,16 +8,16 @@ from jingrow.utils.fixtures import sync_fixtures
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "app")
-	jingrow.reload_pg("jcloude", "doctype", "app_source")
-	jingrow.reload_pg("jcloude", "doctype", "jingrow_version")
+	jingrow.reload_pg("jcloude", "pagetype", "app")
+	jingrow.reload_pg("jcloude", "pagetype", "app_source")
+	jingrow.reload_pg("jcloude", "pagetype", "jingrow_version")
 	sync_fixtures("jcloude")
-	jingrow.reload_pg("jcloude", "doctype", "app_source_version")
-	jingrow.reload_pg("jcloude", "doctype", "app_release")
-	jingrow.reload_pg("jcloude", "doctype", "app_release_difference")
-	jingrow.reload_pg("jcloude", "doctype", "release_group_app")
-	jingrow.reload_pg("jcloude", "doctype", "bench_app")
-	jingrow.reload_pg("jcloude", "doctype", "deploy_candidate_app")
+	jingrow.reload_pg("jcloude", "pagetype", "app_source_version")
+	jingrow.reload_pg("jcloude", "pagetype", "app_release")
+	jingrow.reload_pg("jcloude", "pagetype", "app_release_difference")
+	jingrow.reload_pg("jcloude", "pagetype", "release_group_app")
+	jingrow.reload_pg("jcloude", "pagetype", "bench_app")
+	jingrow.reload_pg("jcloude", "pagetype", "deploy_candidate_app")
 	distinct_apps = jingrow.get_all("App", ["title", "scrubbed"], group_by="scrubbed")
 
 	for distinct_app in distinct_apps:
@@ -34,7 +34,7 @@ def execute():
 			if not versions:
 				continue
 			source = {
-				"doctype": "App Source",
+				"pagetype": "App Source",
 				"app": app.name,
 				"app_title": app.title,
 				"jingrow": app.jingrow,
diff --git a/press/patches/v0_0_1/create_backup_uploads_folder.py b/press/patches/v0_0_1/create_backup_uploads_folder.py
index 690aea9c..c432e177 100644
--- a/press/patches/v0_0_1/create_backup_uploads_folder.py
+++ b/press/patches/v0_0_1/create_backup_uploads_folder.py
@@ -2,7 +2,7 @@
 # For license information, please see license.txt
 
 
-from jingrow.core.doctype.file.file import create_new_folder
+from jingrow.core.pagetype.file.file import create_new_folder
 
 
 def execute():
diff --git a/press/patches/v0_0_1/create_balance_transactions.py b/press/patches/v0_0_1/create_balance_transactions.py
index d573cc0b..105fa647 100644
--- a/press/patches/v0_0_1/create_balance_transactions.py
+++ b/press/patches/v0_0_1/create_balance_transactions.py
@@ -9,7 +9,7 @@ from jcloude.api.billing import get_stripe
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "balance_transaction")
+	jingrow.reload_pg("jcloude", "pagetype", "balance_transaction")
 
 	partners = jingrow.db.get_all("Team", filters={"erpnext_partner": 1}, pluck="name")
 	for i, name in enumerate(partners):
diff --git a/press/patches/v0_0_1/create_balance_transactions_from_stripe.py b/press/patches/v0_0_1/create_balance_transactions_from_stripe.py
index 17849211..12913a0a 100644
--- a/press/patches/v0_0_1/create_balance_transactions_from_stripe.py
+++ b/press/patches/v0_0_1/create_balance_transactions_from_stripe.py
@@ -12,7 +12,7 @@ migrated_cache_key = "migrated_teams"
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "balance_transaction")
+	jingrow.reload_pg("jcloude", "pagetype", "balance_transaction")
 
 	skip_teams = list(jingrow.cache().smembers(migrated_cache_key))
 	teams = jingrow.db.get_all(
@@ -179,7 +179,7 @@ def get_last_unallocated_balance_transactions(balance_transactions):
 
 
 def create_balance_transaction(team, **kwargs):
-	pg = jingrow.get_pg(doctype="Balance Transaction", team=team.name)
+	pg = jingrow.get_pg(pagetype="Balance Transaction", team=team.name)
 	pg.update(kwargs)
 	pg.insert(ignore_permissions=True)
 	pg.submit()
diff --git a/press/patches/v0_0_1/create_certificate_authorities.py b/press/patches/v0_0_1/create_certificate_authorities.py
index 4b0f3b62..a0f1c664 100644
--- a/press/patches/v0_0_1/create_certificate_authorities.py
+++ b/press/patches/v0_0_1/create_certificate_authorities.py
@@ -9,7 +9,7 @@ from jcloude.install import create_certificate_authorities
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "certificate_authority")
+	jingrow.reload_pg("jcloude", "pagetype", "certificate_authority")
 	if jingrow.get_site_config().developer_mode:
 		jingrow.conf.developer_mode = 1
 	create_certificate_authorities()
diff --git a/press/patches/v0_0_1/create_child_table_records_in_teams.py b/press/patches/v0_0_1/create_child_table_records_in_teams.py
index edd744f3..f55f0fbf 100644
--- a/press/patches/v0_0_1/create_child_table_records_in_teams.py
+++ b/press/patches/v0_0_1/create_child_table_records_in_teams.py
@@ -4,7 +4,7 @@ from jcloude.utils import log_error
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "team")
+	jingrow.reload_pg("jcloude", "pagetype", "team")
 	teams = jingrow.get_all("Team", pluck="name")
 
 	for name in teams:
diff --git a/press/patches/v0_0_1/create_default_cluster.py b/press/patches/v0_0_1/create_default_cluster.py
index d6cd7a44..6e1b4d22 100644
--- a/press/patches/v0_0_1/create_default_cluster.py
+++ b/press/patches/v0_0_1/create_default_cluster.py
@@ -6,10 +6,10 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "cluster")
-	cluster = jingrow.get_pg({"doctype": "Cluster", "name": "Default", "default": True})
+	jingrow.reload_pg("jcloude", "pagetype", "cluster")
+	cluster = jingrow.get_pg({"pagetype": "Cluster", "name": "Default", "default": True})
 	cluster.insert()
 	doctypes = ["Server", "Proxy Server", "Database Server", "Bench", "Site"]
-	for doctype in doctypes:
-		jingrow.reload_pg("jcloude", "doctype", jingrow.scrub(doctype))
-		jingrow.db.set_value(doctype, {"name": ("like", "%")}, "cluster", "Default")
+	for pagetype in doctypes:
+		jingrow.reload_pg("jcloude", "pagetype", jingrow.scrub(pagetype))
+		jingrow.db.set_value(pagetype, {"name": ("like", "%")}, "cluster", "Default")
diff --git a/press/patches/v0_0_1/create_invoice_for_past_ples.py b/press/patches/v0_0_1/create_invoice_for_past_ples.py
index 5d721bb4..7888da36 100644
--- a/press/patches/v0_0_1/create_invoice_for_past_ples.py
+++ b/press/patches/v0_0_1/create_invoice_for_past_ples.py
@@ -7,7 +7,7 @@ from datetime import datetime
 import jingrow
 
 from jcloude.api.billing import get_stripe
-from jcloude.jcloude.doctype.team.team_invoice import TeamInvoice
+from jcloude.jcloude.pagetype.team.team_invoice import TeamInvoice
 
 # - Cancel subscription
 # - Create old invoices
diff --git a/press/patches/v0_0_1/create_root_domain_from_press_settings.py b/press/patches/v0_0_1/create_root_domain_from_press_settings.py
index 13cbbe1f..63339094 100644
--- a/press/patches/v0_0_1/create_root_domain_from_press_settings.py
+++ b/press/patches/v0_0_1/create_root_domain_from_press_settings.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "root_domain")
+	jingrow.reload_pg("jcloude", "pagetype", "root_domain")
 	jcloude_settings = jingrow.get_pg("Jcloude Settings", "Jcloude Settings")
 	if (
 		jcloude_settings.domain
@@ -17,7 +17,7 @@ def execute():
 		default_cluster = jingrow.db.get_value("Cluster", {"default": True})
 		jingrow.get_pg(
 			{
-				"doctype": "Root Domain",
+				"pagetype": "Root Domain",
 				"name": jcloude_settings.domain,
 				"default_cluster": default_cluster,
 				"dns_provider": jcloude_settings.dns_provider,
diff --git a/press/patches/v0_0_1/create_site_plan_change_log.py b/press/patches/v0_0_1/create_site_plan_change_log.py
index 9d76cfeb..2e994be4 100644
--- a/press/patches/v0_0_1/create_site_plan_change_log.py
+++ b/press/patches/v0_0_1/create_site_plan_change_log.py
@@ -6,6 +6,6 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "site_plan_change")
+	jingrow.reload_pg("jcloude", "pagetype", "site_plan_change")
 	for site in jingrow.db.get_all("Site", {"status": "Active"}, ["name"]):
 		jingrow.get_pg("Site", site.name)._create_initial_site_plan_change()
diff --git a/press/patches/v0_0_1/create_site_subscriptions.py b/press/patches/v0_0_1/create_site_subscriptions.py
index af2d8739..12ab1108 100644
--- a/press/patches/v0_0_1/create_site_subscriptions.py
+++ b/press/patches/v0_0_1/create_site_subscriptions.py
@@ -9,8 +9,8 @@ from jingrow.utils import update_progress_bar
 def execute():
 	jingrow.db.sql("DROP TABLE IF EXISTS `tabSubscription`")
 
-	jingrow.reload_pg("jcloude", "doctype", "subscription", force=True)
-	jingrow.reload_pg("jcloude", "doctype", "site")
+	jingrow.reload_pg("jcloude", "pagetype", "subscription", force=True)
+	jingrow.reload_pg("jcloude", "pagetype", "site")
 
 	active_sites = jingrow.db.get_all(
 		"Site",
@@ -29,7 +29,7 @@ def execute():
 
 		try:
 			jingrow.get_pg(
-				doctype="Subscription",
+				pagetype="Subscription",
 				enabled=1,
 				team=site.team,
 				document_type="Site",
diff --git a/press/patches/v0_0_1/delete_logs_from_archived_sites.py b/press/patches/v0_0_1/delete_logs_from_archived_sites.py
index 37c5f865..c8a62d6a 100644
--- a/press/patches/v0_0_1/delete_logs_from_archived_sites.py
+++ b/press/patches/v0_0_1/delete_logs_from_archived_sites.py
@@ -5,7 +5,7 @@
 
 import jingrow
 
-from jcloude.jcloude.doctype.site.site import delete_logs
+from jcloude.jcloude.pagetype.site.site import delete_logs
 
 
 def execute():
diff --git a/press/patches/v0_0_1/make_apps_in_public_release_group_public.py b/press/patches/v0_0_1/make_apps_in_public_release_group_public.py
index 94b6539d..f0343681 100644
--- a/press/patches/v0_0_1/make_apps_in_public_release_group_public.py
+++ b/press/patches/v0_0_1/make_apps_in_public_release_group_public.py
@@ -7,8 +7,8 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("Release Group")
-	jingrow.reload_doctype("Jingrow App")
+	jingrow.reload_pagetype("Release Group")
+	jingrow.reload_pagetype("Jingrow App")
 	groups = jingrow.get_all("Release Group", filters={"public": True})
 	for group in groups:
 		for app in jingrow.get_pg("Release Group", group.name).apps:
diff --git a/press/patches/v0_0_1/make_default_site_domain.py b/press/patches/v0_0_1/make_default_site_domain.py
index 8dca5871..e253c5ae 100644
--- a/press/patches/v0_0_1/make_default_site_domain.py
+++ b/press/patches/v0_0_1/make_default_site_domain.py
@@ -6,7 +6,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "site")
-	jingrow.reload_pg("jcloude", "doctype", "site_domain")
+	jingrow.reload_pg("jcloude", "pagetype", "site")
+	jingrow.reload_pg("jcloude", "pagetype", "site_domain")
 	for site in jingrow.db.get_all("Site", {"status": ("!=", "Archived")}, pluck="name"):
 		jingrow.get_pg("Site", site)._create_default_site_domain()
diff --git a/press/patches/v0_0_1/mark_deployed_app_releases_as_approved_and_deployable.py b/press/patches/v0_0_1/mark_deployed_app_releases_as_approved_and_deployable.py
index 9f119998..b15b4a73 100644
--- a/press/patches/v0_0_1/mark_deployed_app_releases_as_approved_and_deployable.py
+++ b/press/patches/v0_0_1/mark_deployed_app_releases_as_approved_and_deployable.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("App Release")
+	jingrow.reload_pagetype("App Release")
 	benches = jingrow.get_all(
 		"Bench", fields=["name", "candidate"], filters={"status": ("!=", "Archived")}
 	)
diff --git a/press/patches/v0_0_1/new_onboarding.py b/press/patches/v0_0_1/new_onboarding.py
index 59516b3e..732e3063 100644
--- a/press/patches/v0_0_1/new_onboarding.py
+++ b/press/patches/v0_0_1/new_onboarding.py
@@ -7,8 +7,8 @@ from jingrow.utils import update_progress_bar
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "team")
-	jingrow.reload_pg("jcloude", "doctype", "team_onboarding")
+	jingrow.reload_pg("jcloude", "pagetype", "team")
+	jingrow.reload_pg("jcloude", "pagetype", "team_onboarding")
 
 	teams = jingrow.db.get_all("Team")
 	for i, team in enumerate(teams):
diff --git a/press/patches/v0_0_1/patch_invoice.py b/press/patches/v0_0_1/patch_invoice.py
index 36548a1f..4ffd1751 100644
--- a/press/patches/v0_0_1/patch_invoice.py
+++ b/press/patches/v0_0_1/patch_invoice.py
@@ -6,8 +6,8 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "invoice")
-	jingrow.reload_pg("jcloude", "doctype", "invoice_item")
+	jingrow.reload_pg("jcloude", "pagetype", "invoice")
+	jingrow.reload_pg("jcloude", "pagetype", "invoice_item")
 
 	# invoice site usage -> invoice item
 	jingrow.db.sql(
diff --git a/press/patches/v0_0_1/ple_to_usage_record.py b/press/patches/v0_0_1/ple_to_usage_record.py
index ae9a714e..63263ba7 100644
--- a/press/patches/v0_0_1/ple_to_usage_record.py
+++ b/press/patches/v0_0_1/ple_to_usage_record.py
@@ -6,7 +6,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "usage_record")
+	jingrow.reload_pg("jcloude", "pagetype", "usage_record")
 	# PLE to Usage Record
 	jingrow.db.sql(
 		"""
diff --git a/press/patches/v0_0_1/remove_obsolete_doctypes.py b/press/patches/v0_0_1/remove_obsolete_doctypes.py
index f7da0417..1be8e488 100644
--- a/press/patches/v0_0_1/remove_obsolete_doctypes.py
+++ b/press/patches/v0_0_1/remove_obsolete_doctypes.py
@@ -16,6 +16,6 @@ def execute():
 		"Usage Report",
 		"User Account",
 	]
-	for doctype in obsolete_doctypes:
-		if jingrow.db.exists("DocType", doctype):
-			jingrow.delete_pg("DocType", doctype)
+	for pagetype in obsolete_doctypes:
+		if jingrow.db.exists("PageType", pagetype):
+			jingrow.delete_pg("PageType", pagetype)
diff --git a/press/patches/v0_0_1/rename_archived_sites.py b/press/patches/v0_0_1/rename_archived_sites.py
index 538b433c..3f92bc09 100644
--- a/press/patches/v0_0_1/rename_archived_sites.py
+++ b/press/patches/v0_0_1/rename_archived_sites.py
@@ -4,11 +4,11 @@
 
 import jingrow
 
-from jcloude.jcloude.doctype.site.site import release_name
+from jcloude.jcloude.pagetype.site.site import release_name
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "site")
+	jingrow.reload_pg("jcloude", "pagetype", "site")
 	sites = jingrow.get_all("Site", filters={"status": "Archived"})
 	for site in sites:
 		release_name(site.name)
diff --git a/press/patches/v0_0_1/rename_columns_in_tls_certificate.py b/press/patches/v0_0_1/rename_columns_in_tls_certificate.py
index 266e06ab..2f759000 100644
--- a/press/patches/v0_0_1/rename_columns_in_tls_certificate.py
+++ b/press/patches/v0_0_1/rename_columns_in_tls_certificate.py
@@ -8,7 +8,7 @@ from jingrow.model.utils.rename_field import rename_field
 
 
 def execute():
-	jingrow.reload_doctype("TLS Certificate")
+	jingrow.reload_pagetype("TLS Certificate")
 	rename_field("TLS Certificate", "expiry", "expires_on")
 	rename_field("TLS Certificate", "privkey", "private_key")
 	rename_field("TLS Certificate", "fullchain", "full_chain")
diff --git a/press/patches/v0_0_1/rename_deploy_candidate_app_release_to_deploy_candidate_app.py b/press/patches/v0_0_1/rename_deploy_candidate_app_release_to_deploy_candidate_app.py
index 5e24f905..6ac98434 100644
--- a/press/patches/v0_0_1/rename_deploy_candidate_app_release_to_deploy_candidate_app.py
+++ b/press/patches/v0_0_1/rename_deploy_candidate_app_release_to_deploy_candidate_app.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	from_doctype = "Deploy Candidate App Release"
-	to_doctype = "Deploy Candidate App"
-	if jingrow.db.table_exists(from_doctype) and not jingrow.db.table_exists(to_doctype):
-		jingrow.rename_pg("DocType", from_doctype, to_doctype, force=True)
+	from_pagetype = "Deploy Candidate App Release"
+	to_pagetype = "Deploy Candidate App"
+	if jingrow.db.table_exists(from_pagetype) and not jingrow.db.table_exists(to_pagetype):
+		jingrow.rename_pg("PageType", from_pagetype, to_pagetype, force=True)
diff --git a/press/patches/v0_0_1/rename_frappe_app_to_app.py b/press/patches/v0_0_1/rename_frappe_app_to_app.py
index 69193068..58362953 100644
--- a/press/patches/v0_0_1/rename_frappe_app_to_app.py
+++ b/press/patches/v0_0_1/rename_frappe_app_to_app.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	from_doctype = "Jingrow App"
-	to_doctype = "App"
-	if jingrow.db.table_exists(from_doctype) and not jingrow.db.table_exists(to_doctype):
-		jingrow.rename_pg("DocType", from_doctype, to_doctype, force=True)
+	from_pagetype = "Jingrow App"
+	to_pagetype = "App"
+	if jingrow.db.table_exists(from_pagetype) and not jingrow.db.table_exists(to_pagetype):
+		jingrow.rename_pg("PageType", from_pagetype, to_pagetype, force=True)
diff --git a/press/patches/v0_0_1/rename_installed_app_to_bench_app.py b/press/patches/v0_0_1/rename_installed_app_to_bench_app.py
index bc9d4ef1..6db5fba0 100644
--- a/press/patches/v0_0_1/rename_installed_app_to_bench_app.py
+++ b/press/patches/v0_0_1/rename_installed_app_to_bench_app.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	from_doctype = "Installed App"
-	to_doctype = "Bench App"
-	if jingrow.db.table_exists(from_doctype) and not jingrow.db.table_exists(to_doctype):
-		jingrow.rename_pg("DocType", from_doctype, to_doctype, force=True)
+	from_pagetype = "Installed App"
+	to_pagetype = "Bench App"
+	if jingrow.db.table_exists(from_pagetype) and not jingrow.db.table_exists(to_pagetype):
+		jingrow.rename_pg("PageType", from_pagetype, to_pagetype, force=True)
diff --git a/press/patches/v0_0_1/rename_release_group_frappe_app_to_release_group_app.py b/press/patches/v0_0_1/rename_release_group_frappe_app_to_release_group_app.py
index 3aacbd1f..a91aa3b6 100644
--- a/press/patches/v0_0_1/rename_release_group_frappe_app_to_release_group_app.py
+++ b/press/patches/v0_0_1/rename_release_group_frappe_app_to_release_group_app.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	from_doctype = "Release Group Jingrow App"
-	to_doctype = "Release Group App"
-	if jingrow.db.table_exists(from_doctype) and not jingrow.db.table_exists(to_doctype):
-		jingrow.rename_pg("DocType", from_doctype, to_doctype, force=True)
+	from_pagetype = "Release Group Jingrow App"
+	to_pagetype = "Release Group App"
+	if jingrow.db.table_exists(from_pagetype) and not jingrow.db.table_exists(to_pagetype):
+		jingrow.rename_pg("PageType", from_pagetype, to_pagetype, force=True)
diff --git a/press/patches/v0_0_1/rename_release_groups.py b/press/patches/v0_0_1/rename_release_groups.py
index d30c8a3d..0f5a4ad4 100644
--- a/press/patches/v0_0_1/rename_release_groups.py
+++ b/press/patches/v0_0_1/rename_release_groups.py
@@ -7,9 +7,9 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "release_group")
-	jingrow.reload_pg("jcloude", "doctype", "release_group_app")
-	jingrow.reload_pg("jcloude", "doctype", "release_group_server")
+	jingrow.reload_pg("jcloude", "pagetype", "release_group")
+	jingrow.reload_pg("jcloude", "pagetype", "release_group_app")
+	jingrow.reload_pg("jcloude", "pagetype", "release_group_server")
 
 	groups = jingrow.get_all("Release Group")
 	for group in groups:
diff --git a/press/patches/v0_0_1/rename_site_backup_fields.py b/press/patches/v0_0_1/rename_site_backup_fields.py
index f15a385d..9fc01776 100644
--- a/press/patches/v0_0_1/rename_site_backup_fields.py
+++ b/press/patches/v0_0_1/rename_site_backup_fields.py
@@ -6,7 +6,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "site_backup")
+	jingrow.reload_pg("jcloude", "pagetype", "site_backup")
 	jingrow.db.sql(
 		"""
 		UPDATE `tabSite Backup`
diff --git a/press/patches/v0_0_1/rename_transaction_currency_to_currency.py b/press/patches/v0_0_1/rename_transaction_currency_to_currency.py
index 95cd73e0..49a2ac56 100644
--- a/press/patches/v0_0_1/rename_transaction_currency_to_currency.py
+++ b/press/patches/v0_0_1/rename_transaction_currency_to_currency.py
@@ -7,5 +7,5 @@ from jingrow.model.utils.rename_field import rename_field
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "team")
+	jingrow.reload_pg("jcloude", "pagetype", "team")
 	rename_field("Team", "transaction_currency", "currency")
diff --git a/press/patches/v0_0_1/rename_workers_to_background_workers.py b/press/patches/v0_0_1/rename_workers_to_background_workers.py
index 71126232..1ebc12f7 100644
--- a/press/patches/v0_0_1/rename_workers_to_background_workers.py
+++ b/press/patches/v0_0_1/rename_workers_to_background_workers.py
@@ -8,5 +8,5 @@ from jingrow.model.utils.rename_field import rename_field
 
 
 def execute():
-	jingrow.reload_doctype("Bench")
+	jingrow.reload_pagetype("Bench")
 	rename_field("Bench", "workers", "background_workers")
diff --git a/press/patches/v0_0_1/set_app_title_from_custom_field.py b/press/patches/v0_0_1/set_app_title_from_custom_field.py
index 0bd5fb39..c3ae33ab 100644
--- a/press/patches/v0_0_1/set_app_title_from_custom_field.py
+++ b/press/patches/v0_0_1/set_app_title_from_custom_field.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "app")
+	jingrow.reload_pg("jcloude", "pagetype", "app")
 	apps = jingrow.get_all("App", ["name", "_title"], {"title": ("is", "not set")})
 	for app in apps:
 		jingrow.db.set_value("App", app.name, "title", app._title)
diff --git a/press/patches/v0_0_1/set_billing_name_for_teams.py b/press/patches/v0_0_1/set_billing_name_for_teams.py
index 549b5348..54bdda83 100644
--- a/press/patches/v0_0_1/set_billing_name_for_teams.py
+++ b/press/patches/v0_0_1/set_billing_name_for_teams.py
@@ -8,7 +8,7 @@ import jingrow
 def execute():
 	scheme_before = jingrow.db.auto_commit_on_many_writes
 	jingrow.db.auto_commit_on_many_writes = True
-	jingrow.reload_pg("jcloude", "doctype", "team")
+	jingrow.reload_pg("jcloude", "pagetype", "team")
 
 	teams = jingrow.get_all("Team", pluck="name")
 	for team in teams:
diff --git a/press/patches/v0_0_1/set_cluster_in_press_settings.py b/press/patches/v0_0_1/set_cluster_in_press_settings.py
index 986ef12d..a547fbf2 100644
--- a/press/patches/v0_0_1/set_cluster_in_press_settings.py
+++ b/press/patches/v0_0_1/set_cluster_in_press_settings.py
@@ -7,8 +7,8 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "erpnext_app")
-	jingrow.reload_pg("jcloude", "doctype", "jcloude_settings")
+	jingrow.reload_pg("jcloude", "pagetype", "erpnext_app")
+	jingrow.reload_pg("jcloude", "pagetype", "jcloude_settings")
 	jingrow.clear_cache()
 	jcloude_settings = jingrow.get_pg("Jcloude Settings", "Jcloude Settings")
 	if not jcloude_settings.get("cluster"):
diff --git a/press/patches/v0_0_1/set_dependencies_in_release_group.py b/press/patches/v0_0_1/set_dependencies_in_release_group.py
index c8d55a4d..f19c9169 100644
--- a/press/patches/v0_0_1/set_dependencies_in_release_group.py
+++ b/press/patches/v0_0_1/set_dependencies_in_release_group.py
@@ -6,8 +6,8 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "release_group_dependency")
-	jingrow.reload_pg("jcloude", "doctype", "release_group")
+	jingrow.reload_pg("jcloude", "pagetype", "release_group_dependency")
+	jingrow.reload_pg("jcloude", "pagetype", "release_group")
 
 	for name in jingrow.db.get_all("Release Group", pluck="name"):
 		release_group = jingrow.get_pg("Release Group", name)
diff --git a/press/patches/v0_0_1/set_document_type_in_plan.py b/press/patches/v0_0_1/set_document_type_in_plan.py
index b6362ea0..e6d01682 100644
--- a/press/patches/v0_0_1/set_document_type_in_plan.py
+++ b/press/patches/v0_0_1/set_document_type_in_plan.py
@@ -6,5 +6,5 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "plan")
+	jingrow.reload_pg("jcloude", "pagetype", "plan")
 	jingrow.db.sql('update tabPlan set document_type = "Site", `interval` = "Daily"')
diff --git a/press/patches/v0_0_1/set_domain_in_site.py b/press/patches/v0_0_1/set_domain_in_site.py
index 564f6bc6..5d5b2324 100644
--- a/press/patches/v0_0_1/set_domain_in_site.py
+++ b/press/patches/v0_0_1/set_domain_in_site.py
@@ -6,7 +6,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "site")
+	jingrow.reload_pg("jcloude", "pagetype", "site")
 	domain = jingrow.db.get_single_value("Jcloude Settings", "domain")
 	jingrow.db.sql(
 		"UPDATE tabSite SET domain = %s WHERE IFNULL(domain, '') = ''", (domain,)
diff --git a/press/patches/v0_0_1/set_host_name_for_sites_with_domains.py b/press/patches/v0_0_1/set_host_name_for_sites_with_domains.py
index a78f3f7e..c3a33018 100644
--- a/press/patches/v0_0_1/set_host_name_for_sites_with_domains.py
+++ b/press/patches/v0_0_1/set_host_name_for_sites_with_domains.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("Site")
+	jingrow.reload_pagetype("Site")
 	domains = jingrow.get_all(
 		"Site Domain",
 		fields=["site", "domain"],
diff --git a/press/patches/v0_0_1/set_hostname_in_server.py b/press/patches/v0_0_1/set_hostname_in_server.py
index f03c0d55..4f28bdd6 100644
--- a/press/patches/v0_0_1/set_hostname_in_server.py
+++ b/press/patches/v0_0_1/set_hostname_in_server.py
@@ -7,11 +7,11 @@ import jingrow
 
 def execute():
 	doctypes = ["Server", "Proxy Server", "Database Server"]
-	for doctype in doctypes:
-		jingrow.reload_pg("jcloude", "doctype", jingrow.scrub(doctype))
-		servers = jingrow.get_all(doctype, {"hostname": ("is", "not set")})
+	for pagetype in doctypes:
+		jingrow.reload_pg("jcloude", "pagetype", jingrow.scrub(pagetype))
+		servers = jingrow.get_all(pagetype, {"hostname": ("is", "not set")})
 		domain = jingrow.db.get_single_value("Jcloude Settings", "domain")
 		for server in servers:
 			hostname = server.name.replace(f".{domain}", "")
-			jingrow.db.set_value(doctype, server.name, "hostname", hostname)
-			jingrow.db.set_value(doctype, server.name, "domain", domain)
+			jingrow.db.set_value(pagetype, server.name, "hostname", hostname)
+			jingrow.db.set_value(pagetype, server.name, "domain", domain)
diff --git a/press/patches/v0_0_1/set_marketplace_app_app_field_from_name.py b/press/patches/v0_0_1/set_marketplace_app_app_field_from_name.py
index ae5992b2..93e38447 100644
--- a/press/patches/v0_0_1/set_marketplace_app_app_field_from_name.py
+++ b/press/patches/v0_0_1/set_marketplace_app_app_field_from_name.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "marketplace_app")
+	jingrow.reload_pg("jcloude", "pagetype", "marketplace_app")
 	apps = jingrow.get_all("Marketplace App", {"app": ("is", "not set")})
 	for app in apps:
 		jingrow.db.set_value(
diff --git a/press/patches/v0_0_1/set_monitoring_password_in_cluster.py b/press/patches/v0_0_1/set_monitoring_password_in_cluster.py
index 570800d3..0d86640a 100644
--- a/press/patches/v0_0_1/set_monitoring_password_in_cluster.py
+++ b/press/patches/v0_0_1/set_monitoring_password_in_cluster.py
@@ -6,7 +6,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "cluster")
+	jingrow.reload_pg("jcloude", "pagetype", "cluster")
 	for name in jingrow.get_all("Cluster", pluck="name"):
 		cluster = jingrow.get_pg("Cluster", name)
 		cluster.save()
diff --git a/press/patches/v0_0_1/set_public_field_in_app_release_based_on_app_source_public.py b/press/patches/v0_0_1/set_public_field_in_app_release_based_on_app_source_public.py
index 356eee7f..6024ce79 100644
--- a/press/patches/v0_0_1/set_public_field_in_app_release_based_on_app_source_public.py
+++ b/press/patches/v0_0_1/set_public_field_in_app_release_based_on_app_source_public.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "app_release")
+	jingrow.reload_pg("jcloude", "pagetype", "app_release")
 	jingrow.db.sql(
 		"""
 		UPDATE `tabApp Release` as `release`
diff --git a/press/patches/v0_0_1/set_rate_limit_config_based_on_plan.py b/press/patches/v0_0_1/set_rate_limit_config_based_on_plan.py
index d0a82d6b..974adb7c 100644
--- a/press/patches/v0_0_1/set_rate_limit_config_based_on_plan.py
+++ b/press/patches/v0_0_1/set_rate_limit_config_based_on_plan.py
@@ -5,7 +5,7 @@
 
 import jingrow
 
-from jcloude.jcloude.doctype.site_plan.site_plan import get_plan_config
+from jcloude.jcloude.pagetype.site_plan.site_plan import get_plan_config
 from jcloude.utils import log_error
 
 
diff --git a/press/patches/v0_0_1/set_release_group_version_and_title_from_custom_field.py b/press/patches/v0_0_1/set_release_group_version_and_title_from_custom_field.py
index 2105060a..f08cb186 100644
--- a/press/patches/v0_0_1/set_release_group_version_and_title_from_custom_field.py
+++ b/press/patches/v0_0_1/set_release_group_version_and_title_from_custom_field.py
@@ -6,7 +6,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "release_group")
+	jingrow.reload_pg("jcloude", "pagetype", "release_group")
 	groups = jingrow.get_all("Release Group", ["name", "_title"], {"title": ("is", "not set")})
 	for group in groups:
 		jingrow.db.set_value("Release Group", group.name, "title", group._title)
diff --git a/press/patches/v0_0_1/set_remote_file_location.py b/press/patches/v0_0_1/set_remote_file_location.py
index 730057e2..83014e07 100644
--- a/press/patches/v0_0_1/set_remote_file_location.py
+++ b/press/patches/v0_0_1/set_remote_file_location.py
@@ -4,11 +4,11 @@
 
 
 import jingrow
-from jingrow.desk.doctype.tag.tag import add_tag
+from jingrow.desk.pagetype.tag.tag import add_tag
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "remote_file")
+	jingrow.reload_pg("jcloude", "pagetype", "remote_file")
 	remote_files = (
 		x["name"] for x in jingrow.get_all("Remote File", [["bucket", "like", ""]])
 	)
diff --git a/press/patches/v0_0_1/set_repository_in_frappe_app.py b/press/patches/v0_0_1/set_repository_in_frappe_app.py
index 3cc45265..e283c141 100644
--- a/press/patches/v0_0_1/set_repository_in_frappe_app.py
+++ b/press/patches/v0_0_1/set_repository_in_frappe_app.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("Jingrow App")
+	jingrow.reload_pagetype("Jingrow App")
 	apps = jingrow.get_all(
 		"Jingrow App", fields=["name", "url"], filters={"repo": ("is", "not set")}
 	)
diff --git a/press/patches/v0_0_1/set_team_field_for_permission_checks.py b/press/patches/v0_0_1/set_team_field_for_permission_checks.py
index cee938d5..479d37af 100644
--- a/press/patches/v0_0_1/set_team_field_for_permission_checks.py
+++ b/press/patches/v0_0_1/set_team_field_for_permission_checks.py
@@ -15,12 +15,12 @@ def execute():
 		["Deploy", "Release Group", "group"],
 		["Bench", "Release Group", "group"],
 	]
-	for target_doctype, source_doctype, link_fieldname in updates:
-		jingrow.reload_pg("jcloude", "doctype", jingrow.scrub(target_doctype))
+	for target_pagetype, source_pagetype, link_fieldname in updates:
+		jingrow.reload_pg("jcloude", "pagetype", jingrow.scrub(target_pagetype))
 		jingrow.db.sql(
 			f"""
-			UPDATE `tab{target_doctype}` as target
-			INNER JOIN `tab{source_doctype}` as source
+			UPDATE `tab{target_pagetype}` as target
+			INNER JOIN `tab{source_pagetype}` as source
 			ON `target`.`{link_fieldname}` = `source`.`name`
 			SET `target`.team = `source`.team
 			WHERE ifnull(`target`.team, '') = ""
diff --git a/press/patches/v0_0_1/set_team_field_in_tls_certificate_based_on_domain_team.py b/press/patches/v0_0_1/set_team_field_in_tls_certificate_based_on_domain_team.py
index b48fefc9..6a6453c3 100644
--- a/press/patches/v0_0_1/set_team_field_in_tls_certificate_based_on_domain_team.py
+++ b/press/patches/v0_0_1/set_team_field_in_tls_certificate_based_on_domain_team.py
@@ -7,8 +7,8 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "site_domain")
-	jingrow.reload_pg("jcloude", "doctype", "tls_certificate")
+	jingrow.reload_pg("jcloude", "pagetype", "site_domain")
+	jingrow.reload_pg("jcloude", "pagetype", "tls_certificate")
 	certificates = jingrow.get_all(
 		"TLS Certificate", ["name", "domain"], {"wildcard": False}
 	)
diff --git a/press/patches/v0_0_1/site_history_to_site_activity.py b/press/patches/v0_0_1/site_history_to_site_activity.py
index f6d6cb21..73fc9de9 100644
--- a/press/patches/v0_0_1/site_history_to_site_activity.py
+++ b/press/patches/v0_0_1/site_history_to_site_activity.py
@@ -7,7 +7,7 @@ import jingrow
 
 
 def execute():
-	from_doctype = "Site History"
-	to_doctype = "Site Activity"
-	if jingrow.db.table_exists(from_doctype) and not jingrow.db.table_exists(to_doctype):
-		jingrow.rename_pg("DocType", from_doctype, to_doctype, force=True)
+	from_pagetype = "Site History"
+	to_pagetype = "Site Activity"
+	if jingrow.db.table_exists(from_pagetype) and not jingrow.db.table_exists(to_pagetype):
+		jingrow.rename_pg("PageType", from_pagetype, to_pagetype, force=True)
diff --git a/press/patches/v0_0_1/site_usage_convert_history.py b/press/patches/v0_0_1/site_usage_convert_history.py
index 25590d28..2dec0acc 100644
--- a/press/patches/v0_0_1/site_usage_convert_history.py
+++ b/press/patches/v0_0_1/site_usage_convert_history.py
@@ -9,23 +9,23 @@ from jingrow.utils import cint
 
 
 def execute():
-	doctype = "Site Usage"
-	jingrow.reload_doctype(doctype)
+	pagetype = "Site Usage"
+	jingrow.reload_pagetype(pagetype)
 	scheme_before = jingrow.db.auto_commit_on_many_writes
 	jingrow.db.auto_commit_on_many_writes = True
-	records = jingrow.get_all(doctype, pluck="name")
+	records = jingrow.get_all(pagetype, pluck="name")
 	total = len(records)
 
 	for current, record in enumerate(records):
 		print(f"Updated {current} of {total}", end="\r")
 
 		fields = ["backups", "database", "public", "private"]
-		current_values = jingrow.db.get_value(doctype, record, fields)
+		current_values = jingrow.db.get_value(pagetype, record, fields)
 
 		for field, value in zip(fields, current_values):
 			value = ceil(cint(value) / (1024**2))
-			jingrow.get_pg(doctype, record).db_set(field, value, update_modified=False)
+			jingrow.get_pg(pagetype, record).db_set(field, value, update_modified=False)
 
 	jingrow.db.commit()
 	jingrow.db.auto_commit_on_many_writes = scheme_before
-	print(f"{total} {doctype} records updated")
+	print(f"{total} {pagetype} records updated")
diff --git a/press/patches/v0_0_1/track_offsite_backups_via_remote_files.py b/press/patches/v0_0_1/track_offsite_backups_via_remote_files.py
index 6d002924..e705a259 100644
--- a/press/patches/v0_0_1/track_offsite_backups_via_remote_files.py
+++ b/press/patches/v0_0_1/track_offsite_backups_via_remote_files.py
@@ -6,11 +6,11 @@
 import json
 
 import jingrow
-from jingrow.desk.doctype.tag.tag import add_tag
+from jingrow.desk.pagetype.tag.tag import add_tag
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "site_backup")
+	jingrow.reload_pg("jcloude", "pagetype", "site_backup")
 	bucket = jingrow.db.get_single_value("Jcloude Settings", "aws_s3_bucket")
 	offsite_backups = [
 		jingrow.get_pg("Site Backup", x["name"])
@@ -27,7 +27,7 @@ def execute():
 			if remote_database:
 				remote_file = jingrow.get_pg(
 					{
-						"doctype": "Remote File",
+						"pagetype": "Remote File",
 						"file_name": offsite_backup.database_file,
 						"file_path": remote_database,
 						"file_size": offsite_backup.database_size,
@@ -36,13 +36,13 @@ def execute():
 					}
 				)
 				remote_file.save()
-				add_tag("Offsite Backup", remote_file.doctype, remote_file.name)
+				add_tag("Offsite Backup", remote_file.pagetype, remote_file.name)
 				offsite_backup.remote_database_file = remote_file.name
 
 			if remote_public:
 				remote_file = jingrow.get_pg(
 					{
-						"doctype": "Remote File",
+						"pagetype": "Remote File",
 						"file_name": offsite_backup.public_file,
 						"file_path": remote_public,
 						"file_size": offsite_backup.public_size,
@@ -51,13 +51,13 @@ def execute():
 					}
 				)
 				remote_file.save()
-				add_tag("Offsite Backup", remote_file.doctype, remote_file.name)
+				add_tag("Offsite Backup", remote_file.pagetype, remote_file.name)
 				offsite_backup.remote_public_file = remote_file.name
 
 			if remote_private:
 				remote_file = jingrow.get_pg(
 					{
-						"doctype": "Remote File",
+						"pagetype": "Remote File",
 						"file_name": offsite_backup.private_file,
 						"file_path": remote_private,
 						"file_size": offsite_backup.private_size,
@@ -66,7 +66,7 @@ def execute():
 					}
 				)
 				remote_file.save()
-				add_tag("Offsite Backup", remote_file.doctype, remote_file.name)
+				add_tag("Offsite Backup", remote_file.pagetype, remote_file.name)
 				offsite_backup.remote_private_file = remote_file.name
 
 			offsite_backup.save()
diff --git a/press/patches/v0_0_1/update_site_config_doc.py b/press/patches/v0_0_1/update_site_config_doc.py
index 7282f648..378aa8e2 100644
--- a/press/patches/v0_0_1/update_site_config_doc.py
+++ b/press/patches/v0_0_1/update_site_config_doc.py
@@ -4,8 +4,8 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "site")
-	jingrow.reload_pg("jcloude", "doctype", "site config")
+	jingrow.reload_pg("jcloude", "pagetype", "site")
+	jingrow.reload_pg("jcloude", "pagetype", "site config")
 	sites = jingrow.get_all("Site", {"status": ("!=", "Archived")})
 
 	commit_scheme = jingrow.db.auto_commit_on_many_writes
diff --git a/press/patches/v0_0_1/user_account_to_team.py b/press/patches/v0_0_1/user_account_to_team.py
index 3f3cac3c..8dfd345f 100644
--- a/press/patches/v0_0_1/user_account_to_team.py
+++ b/press/patches/v0_0_1/user_account_to_team.py
@@ -7,10 +7,10 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "site")
-	jingrow.reload_pg("jcloude", "doctype", "account_request")
-	jingrow.reload_pg("jcloude", "doctype", "team")
-	jingrow.reload_pg("jcloude", "doctype", "team_member")
+	jingrow.reload_pg("jcloude", "pagetype", "site")
+	jingrow.reload_pg("jcloude", "pagetype", "account_request")
+	jingrow.reload_pg("jcloude", "pagetype", "team")
+	jingrow.reload_pg("jcloude", "pagetype", "team_member")
 
 	user_accounts = jingrow.db.sql(
 		"SELECT user, account_key, creation FROM `tabUser Account`", as_dict=1
@@ -47,4 +47,4 @@ def execute():
 		# update team in sites
 		jingrow.db.set_value("Site", {"owner": d.user}, "team", team.name)
 
-	jingrow.delete_pg_if_exists("DocType", "User Account")
+	jingrow.delete_pg_if_exists("PageType", "User Account")
diff --git a/press/patches/v0_0_4/disable_subscriptions_for_inactive_sites.py b/press/patches/v0_0_4/disable_subscriptions_for_inactive_sites.py
index be94c9c1..adc1719c 100644
--- a/press/patches/v0_0_4/disable_subscriptions_for_inactive_sites.py
+++ b/press/patches/v0_0_4/disable_subscriptions_for_inactive_sites.py
@@ -5,8 +5,8 @@ import jingrow
 
 
 def execute():
-	subscription = jingrow.qb.DocType("Subscription")
-	site = jingrow.qb.DocType("Site")
+	subscription = jingrow.qb.PageType("Subscription")
+	site = jingrow.qb.PageType("Site")
 
 	inactive_sites = (
 		jingrow.qb.from_(subscription)
diff --git a/press/patches/v0_0_4/remove_legacy_billing_doctypes.py b/press/patches/v0_0_4/remove_legacy_billing_doctypes.py
index 93fc3234..038ab274 100644
--- a/press/patches/v0_0_4/remove_legacy_billing_doctypes.py
+++ b/press/patches/v0_0_4/remove_legacy_billing_doctypes.py
@@ -6,6 +6,6 @@ import jingrow
 
 
 def execute():
-	# these doctypes are only deleted from DocType table, their tables will exist
+	# these doctypes are only deleted from PageType table, their tables will exist
 	doctypes = ["Payment", "Payment Ledger Entry"]
 	jingrow.db.sql("DELETE from tabDocType where name in %s", [doctypes])
diff --git a/press/patches/v0_7_0/add_site_backup_times_for_configured_ones.py b/press/patches/v0_7_0/add_site_backup_times_for_configured_ones.py
index cb61febc..4d20e4c9 100644
--- a/press/patches/v0_7_0/add_site_backup_times_for_configured_ones.py
+++ b/press/patches/v0_7_0/add_site_backup_times_for_configured_ones.py
@@ -19,7 +19,7 @@ def execute():
 		jingrow.db.set_value("Site", site.name, "schedule_logical_backup_at_custom_time", True)
 		jingrow.get_pg(
 			{
-				"doctype": "Site Backup Time",
+				"pagetype": "Site Backup Time",
 				"parent": site.name,
 				"parenttype": "Site",
 				"parentfield": "logical_backup_times",
diff --git a/press/patches/v0_7_0/migrate_fields_from_plans_to_server_and_marketplace.py b/press/patches/v0_7_0/migrate_fields_from_plans_to_server_and_marketplace.py
index fc35cae1..afe99da9 100644
--- a/press/patches/v0_7_0/migrate_fields_from_plans_to_server_and_marketplace.py
+++ b/press/patches/v0_7_0/migrate_fields_from_plans_to_server_and_marketplace.py
@@ -17,7 +17,7 @@ def execute():
 		plan_pg = jingrow.get_pg("Site Plan", plan)
 		server_plan_pg = jingrow.get_pg(
 			{
-				"doctype": "Server Plan",
+				"pagetype": "Server Plan",
 				"name": plan_pg.name,
 				"title": plan_pg.plan_title,
 				"price_inr": plan_pg.price_inr,
diff --git a/press/patches/v0_7_0/move_site_db_access_users_to_site_db_perm_manager.py b/press/patches/v0_7_0/move_site_db_access_users_to_site_db_perm_manager.py
index 3baf9da7..65c7d679 100644
--- a/press/patches/v0_7_0/move_site_db_access_users_to_site_db_perm_manager.py
+++ b/press/patches/v0_7_0/move_site_db_access_users_to_site_db_perm_manager.py
@@ -18,7 +18,7 @@ def execute():
 			site = jingrow.get_pg("Site", site_name)
 			db_user = jingrow.get_pg(
 				{
-					"doctype": "Site Database User",
+					"pagetype": "Site Database User",
 					"site": site.name,
 					"team": site.team,
 					"mode": site.database_access_mode,
diff --git a/press/patches/v0_7_0/rename_plan_to_site_plan.py b/press/patches/v0_7_0/rename_plan_to_site_plan.py
index 87d4f723..4254cee7 100644
--- a/press/patches/v0_7_0/rename_plan_to_site_plan.py
+++ b/press/patches/v0_7_0/rename_plan_to_site_plan.py
@@ -2,7 +2,7 @@ import jingrow
 
 
 def execute():
-	from_doctype = "Plan"
-	to_doctype = "Site Plan"
-	if jingrow.db.table_exists(from_doctype) and not jingrow.db.table_exists(to_doctype):
-		jingrow.rename_pg("DocType", from_doctype, to_doctype, force=True)
+	from_pagetype = "Plan"
+	to_pagetype = "Site Plan"
+	if jingrow.db.table_exists(from_pagetype) and not jingrow.db.table_exists(to_pagetype):
+		jingrow.rename_pg("PageType", from_pagetype, to_pagetype, force=True)
diff --git a/press/patches/v0_7_0/set_hostname_abbreviation.py b/press/patches/v0_7_0/set_hostname_abbreviation.py
index ba75a783..52dcf8f1 100644
--- a/press/patches/v0_7_0/set_hostname_abbreviation.py
+++ b/press/patches/v0_7_0/set_hostname_abbreviation.py
@@ -1,15 +1,15 @@
 import jingrow
 
-from jcloude.jcloude.doctype.server.server import get_hostname_abbreviation
+from jcloude.jcloude.pagetype.server.server import get_hostname_abbreviation
 
 
 def execute():
-	for doctype in ["Server", "Database Server", "Proxy Server"]:
-		jingrow.reload_pg("jcloude", "doctype", doctype)
+	for pagetype in ["Server", "Database Server", "Proxy Server"]:
+		jingrow.reload_pg("jcloude", "pagetype", pagetype)
 
-		for pg in jingrow.get_all(doctype, fields=["name", "hostname"]):
+		for pg in jingrow.get_all(pagetype, fields=["name", "hostname"]):
 			abbr = get_hostname_abbreviation(pg.hostname)
 
 			jingrow.db.set_value(
-				doctype, pg.name, "hostname_abbreviation", abbr, update_modified=False
+				pagetype, pg.name, "hostname_abbreviation", abbr, update_modified=False
 			)
diff --git a/press/patches/v0_7_0/update_enable_performance_tuning.py b/press/patches/v0_7_0/update_enable_performance_tuning.py
index e81374c9..4233241d 100644
--- a/press/patches/v0_7_0/update_enable_performance_tuning.py
+++ b/press/patches/v0_7_0/update_enable_performance_tuning.py
@@ -2,8 +2,8 @@ import jingrow
 
 
 def execute():
-	# Set enable_performance_tuning to True for all records in Team DocType
-	# Default value in Team doctype has been set to True
+	# Set enable_performance_tuning to True for all records in Team PageType
+	# Default value in Team pagetype has been set to True
 	jingrow.db.sql(
 		"""
         UPDATE `tabTeam`
diff --git a/press/patches/v0_8_0/clear_alertmanager_webhook_log.py b/press/patches/v0_8_0/clear_alertmanager_webhook_log.py
index 9b046a39..a55475b0 100644
--- a/press/patches/v0_8_0/clear_alertmanager_webhook_log.py
+++ b/press/patches/v0_8_0/clear_alertmanager_webhook_log.py
@@ -1,6 +1,6 @@
 from contextlib import suppress
 
-from jingrow.core.doctype.log_settings.log_settings import clear_log_table
+from jingrow.core.pagetype.log_settings.log_settings import clear_log_table
 
 
 def execute():
diff --git a/press/patches/v0_8_0/move_notify_billing_email_of_team_to_child_doc.py b/press/patches/v0_8_0/move_notify_billing_email_of_team_to_child_doc.py
index fe06be9c..1a38490f 100644
--- a/press/patches/v0_8_0/move_notify_billing_email_of_team_to_child_doc.py
+++ b/press/patches/v0_8_0/move_notify_billing_email_of_team_to_child_doc.py
@@ -17,7 +17,7 @@ def sanitize_emails(email_str: str):
 
 
 def execute():
-	Team = jingrow.qb.DocType("Team")
+	Team = jingrow.qb.PageType("Team")
 
 	# First test if the columns exist
 	if not jingrow.db.has_column("Team", "notify_email") or not jingrow.db.has_column("Team", "billing_email"):
diff --git a/press/press/audit.py b/press/press/audit.py
index c60f8b94..c4655d38 100644
--- a/press/press/audit.py
+++ b/press/press/audit.py
@@ -10,8 +10,8 @@ import jingrow
 from jingrow.utils import add_days, rounded, today
 
 from jcloude.agent import Agent
-from jcloude.jcloude.doctype.server.server import Server
-from jcloude.jcloude.doctype.subscription.subscription import (
+from jcloude.jcloude.pagetype.server.server import Server
+from jcloude.jcloude.pagetype.subscription.subscription import (
 	created_usage_records,
 	paid_plans,
 	sites_with_free_hosting,
@@ -48,7 +48,7 @@ class Audit:
 	):
 		jingrow.get_pg(
 			{
-				"doctype": "Audit Log",
+				"pagetype": "Audit Log",
 				"log": json.dumps(log, indent=2),
 				"status": status,
 				"audit_type": self.audit_type,
@@ -235,7 +235,7 @@ class BackupRecordCheck(Audit):
 	def get_sites_activated_yesterday(self):
 		from pypika import functions as fn
 
-		site_activites = jingrow.qb.DocType("Site Activity")
+		site_activites = jingrow.qb.PageType("Site Activity")
 		return set(
 			[
 				t[0]
@@ -438,7 +438,7 @@ class BillingAudit(Audit):
 		# last day of previous month
 		last_day = jingrow.utils.get_last_day(jingrow.utils.add_months(today, -1))
 
-		plan = jingrow.qb.DocType("Site Plan")
+		plan = jingrow.qb.PageType("Site Plan")
 		query = (
 			jingrow.qb.from_(plan)
 			.select(plan.name)
@@ -446,9 +446,9 @@ class BillingAudit(Audit):
 		).run(as_dict=True)
 		jingrow_plans = [d.name for d in query]
 
-		invoice = jingrow.qb.DocType("Invoice")
-		team = jingrow.qb.DocType("Team")
-		site = jingrow.qb.DocType("Site")
+		invoice = jingrow.qb.PageType("Invoice")
+		team = jingrow.qb.PageType("Team")
+		site = jingrow.qb.PageType("Site")
 
 		query = (
 			jingrow.qb.from_(invoice)
@@ -566,13 +566,13 @@ class PlanAudit(Audit):
 
 	def __init__(self):
 		"""Check for plan and virtual machine discrepancies"""
-		VirtualMachineDocType = jingrow.qb.DocType("Virtual Machine")
-		ServerPlan = jingrow.qb.DocType("Server Plan")
+		VirtualMachineDocType = jingrow.qb.PageType("Virtual Machine")
+		ServerPlan = jingrow.qb.PageType("Server Plan")
 		server_types = ["Server", "Database Server"]
 		server_level_discrepancies = {}
 
 		for server_type in server_types:
-			ServerDoctype = jingrow.qb.DocType(server_type)
+			ServerDoctype = jingrow.qb.PageType(server_type)
 			query = (
 				jingrow.qb.from_(ServerDoctype)
 				.select(
@@ -633,8 +633,8 @@ def partner_billing_audit():
 
 
 def suspend_sites_with_disabled_team():
-	site = jingrow.qb.DocType("Site")
-	team = jingrow.qb.DocType("Team")
+	site = jingrow.qb.PageType("Site")
+	team = jingrow.qb.PageType("Team")
 
 	disabled_teams_with_active_sites = (
 		jingrow.qb.from_(site)
diff --git a/press/press/custom/address.json b/press/press/custom/address.json
index 3d51ec9a..ef777ebb 100644
--- a/press/press/custom/address.json
+++ b/press/press/custom/address.json
@@ -284,7 +284,7 @@
    "write": 1
   }
  ],
- "doctype": "Address",
+ "pagetype": "Address",
  "links": [],
  "property_setters": [],
  "sync_on_migrate": 1
diff --git a/press/press/custom/country.json b/press/press/custom/country.json
index 7f792bc0..a4da3d11 100644
--- a/press/press/custom/country.json
+++ b/press/press/custom/country.json
@@ -62,7 +62,7 @@
   }
  ],
  "custom_perms": [],
- "doctype": "Country",
+ "pagetype": "Country",
  "property_setters": [],
  "sync_on_migrate": 1
 }
\ No newline at end of file
diff --git a/press/press/doctype/account_request/account_request.json b/press/press/doctype/account_request/account_request.json
index 7d00fe9e..e729d795 100644
--- a/press/press/doctype/account_request/account_request.json
+++ b/press/press/doctype/account_request/account_request.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2022-03-06 20:52:32.662775",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/account_request/account_request.py b/press/press/doctype/account_request/account_request.py
index a5acb71d..e7444935 100644
--- a/press/press/doctype/account_request/account_request.py
+++ b/press/press/doctype/account_request/account_request.py
@@ -24,7 +24,7 @@ class AccountRequest(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.account_request_jcloude_role.account_request_jcloude_role import (
+		from jcloude.jcloude.pagetype.account_request_jcloude_role.account_request_jcloude_role import (
 			AccountRequestPressRole,
 		)
 
@@ -164,7 +164,7 @@ class AccountRequest(Document):
 		key = getattr(self, field_name)
 		for allowed_count, kwargs in limits:
 			count = jingrow.db.count(
-				self.doctype,
+				self.pagetype,
 				{field_name: key, "creation": (">", jingrow.utils.add_to_date(None, **kwargs))},
 			)
 			if count > allowed_count:
@@ -227,7 +227,7 @@ class AccountRequest(Document):
 						log_error(
 							"Error reading logo for inline images in email",
 							data=ex,
-							reference_doctype=self.doctype,
+							reference_pagetype=self.pagetype,
 							reference_name=self.name,
 						)
 				args.update({"header_content": product_trial.email_header_content or ""})
@@ -274,7 +274,7 @@ class AccountRequest(Document):
 				template=template,
 				args=args,
 				now=True,
-				reference_doctype=self.doctype,
+				reference_pagetype=self.pagetype,
 				reference_name=self.name,
 				inline_images=inline_images,
 			)
@@ -284,7 +284,7 @@ class AccountRequest(Document):
 			log_error(
 				"Error sending verification email",
 				data=e,
-				reference_doctype=self.doctype,
+				reference_pagetype=self.pagetype,
 				reference_name=self.name,
 			)
 
@@ -319,7 +319,7 @@ class AccountRequest(Document):
 			template=template,
 			args=args,
 			now=True,
-			reference_doctype=self.doctype,
+			reference_pagetype=self.pagetype,
 			reference_name=self.name,
 		)
 
diff --git a/press/press/doctype/account_request/test_account_request.py b/press/press/doctype/account_request/test_account_request.py
index 6cedceaa..d46202d5 100644
--- a/press/press/doctype/account_request/test_account_request.py
+++ b/press/press/doctype/account_request/test_account_request.py
@@ -8,7 +8,7 @@ from unittest.mock import patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.account_request.account_request import AccountRequest
+from jcloude.jcloude.pagetype.account_request.account_request import AccountRequest
 
 
 def create_test_account_request(
@@ -25,7 +25,7 @@ def create_test_account_request(
 	with patch.object(AccountRequest, "send_verification_email"):
 		account_request = jingrow.get_pg(
 			{
-				"doctype": "Account Request",
+				"pagetype": "Account Request",
 				"subdomain": subdomain,
 				"email": email,
 				"erpnext": erpnext,
@@ -44,7 +44,7 @@ class TestAccountRequest(FrappeTestCase):
 	def test_bare(self):
 		account_request = jingrow.get_pg(
 			{
-				"doctype": "Account Request",
+				"pagetype": "Account Request",
 				"email": jingrow.mock("email"),
 			}
 		)
@@ -59,7 +59,7 @@ class TestAccountRequest(FrappeTestCase):
 
 		account_request = jingrow.get_pg(
 			{
-				"doctype": "Account Request",
+				"pagetype": "Account Request",
 				"email": "hello@" + domain,
 			}
 		)
diff --git a/press/press/doctype/account_request_press_role/account_request_press_role.json b/press/press/doctype/account_request_press_role/account_request_press_role.json
index 1132dac5..68f51093 100644
--- a/press/press/doctype/account_request_press_role/account_request_press_role.json
+++ b/press/press/doctype/account_request_press_role/account_request_press_role.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-07-06 23:39:13.802962",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/add_on_settings/add_on_settings.json b/press/press/doctype/add_on_settings/add_on_settings.json
index 2be613fc..3b31ff74 100644
--- a/press/press/doctype/add_on_settings/add_on_settings.json
+++ b/press/press/doctype/add_on_settings/add_on_settings.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-02-14 19:25:06.365019",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/add_on_storage_log/add_on_storage_log.json b/press/press/doctype/add_on_storage_log/add_on_storage_log.json
index e41f7489..deb5c479 100644
--- a/press/press/doctype/add_on_storage_log/add_on_storage_log.json
+++ b/press/press/doctype/add_on_storage_log/add_on_storage_log.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-07-11 11:12:51.772222",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "annotations_section",
diff --git a/press/press/doctype/add_on_storage_log/add_on_storage_log.py b/press/press/doctype/add_on_storage_log/add_on_storage_log.py
index e387c291..ab939446 100644
--- a/press/press/doctype/add_on_storage_log/add_on_storage_log.py
+++ b/press/press/doctype/add_on_storage_log/add_on_storage_log.py
@@ -6,10 +6,10 @@ import typing
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.server.server import BaseServer
+	from jcloude.jcloude.pagetype.server.server import BaseServer
 
 
 class AddOnStorageLog(Document):
@@ -40,7 +40,7 @@ class AddOnStorageLog(Document):
 		)
 
 		jingrow.sendmail(
-			recipients=get_communication_info("Email", "Server Activity", server.doctype, server.name),
+			recipients=get_communication_info("Email", "Server Activity", server.pagetype, server.name),
 			subject=f"Important: Server {server.name} storage space at 90%",
 			template="enabled_auto_disk_expansion" if not self.is_warning else "disabled_auto_disk_expansion",
 			args={
@@ -66,9 +66,9 @@ def insert_addon_storage_log(
 	database_server: str | None = None,
 	server: str | None = None,
 ) -> AddOnStorageLog | None:
-	doctype = "Server" if server else "Database Server"
+	pagetype = "Server" if server else "Database Server"
 	name = server or database_server
-	base_server: BaseServer = jingrow.get_pg(doctype, name)
+	base_server: BaseServer = jingrow.get_pg(pagetype, name)
 
 	if (
 		(base_server.provider not in ("AWS EC2", "OCI"))
@@ -80,7 +80,7 @@ def insert_addon_storage_log(
 
 	add_on_storage_log: AddOnStorageLog = jingrow.get_pg(
 		{
-			"doctype": "Add On Storage Log",
+			"pagetype": "Add On Storage Log",
 			"adding_storage": adding_storage,
 			"available_disk_space": available_disk_space,
 			"current_disk_usage": current_disk_usage,
diff --git a/press/press/doctype/agent_job/agent_job.json b/press/press/doctype/agent_job/agent_job.json
index a4ebebff..90d5690d 100644
--- a/press/press/doctype/agent_job/agent_job.json
+++ b/press/press/doctype/agent_job/agent_job.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-01-13 17:59:25.842963",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -26,7 +26,7 @@
   "end",
   "duration",
   "section_break_zqbm",
-  "reference_doctype",
+  "reference_pagetype",
   "column_break_ayyq",
   "reference_name",
   "data_19",
@@ -118,7 +118,7 @@
    "fieldname": "server_type",
    "fieldtype": "Link",
    "label": "Server Type",
-   "options": "DocType",
+   "options": "PageType",
    "read_only": 1,
    "reqd": 1,
    "search_index": 1
@@ -232,11 +232,11 @@
    "fieldtype": "Section Break"
   },
   {
-   "depends_on": "eval: pg.reference_doctype",
-   "fieldname": "reference_doctype",
+   "depends_on": "eval: pg.reference_pagetype",
+   "fieldname": "reference_pagetype",
    "fieldtype": "Link",
-   "label": "Reference Doctype",
-   "options": "DocType",
+   "label": "Reference Pagetype",
+   "options": "PageType",
    "read_only": 1,
    "search_index": 1
   },
@@ -245,7 +245,7 @@
    "fieldname": "reference_name",
    "fieldtype": "Dynamic Link",
    "label": "Reference Name",
-   "options": "reference_doctype",
+   "options": "reference_pagetype",
    "read_only": 1,
    "search_index": 1
   },
diff --git a/press/press/doctype/agent_job/agent_job.py b/press/press/doctype/agent_job/agent_job.py
index f82c8336..351f96b1 100644
--- a/press/press/doctype/agent_job/agent_job.py
+++ b/press/press/doctype/agent_job/agent_job.py
@@ -24,15 +24,15 @@ from jingrow.utils import (
 from jcloude.access.support_access import has_support_access
 from jcloude.agent import Agent, AgentCallbackException, AgentRequestSkippedException
 from jcloude.api.client import is_owned_by_team
-from jcloude.jcloude.doctype.agent_job_type.agent_job_type import (
+from jcloude.jcloude.pagetype.agent_job_type.agent_job_type import (
 	get_retryable_job_types_and_max_retry_count,
 )
-from jcloude.jcloude.doctype.site_database_user.site_database_user import SiteDatabaseUser
-from jcloude.jcloude.doctype.site_migration.site_migration import (
+from jcloude.jcloude.pagetype.site_database_user.site_database_user import SiteDatabaseUser
+from jcloude.jcloude.pagetype.site_migration.site_migration import (
 	get_ongoing_migration,
 	process_site_migration_job_update,
 )
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 from jcloude.utils import log_error, timer
 
 AGENT_LOG_KEY = "agent-jobs"
@@ -59,7 +59,7 @@ class AgentJob(Document):
 		job_type: DF.Link
 		next_retry_at: DF.Datetime | None
 		output: DF.Code | None
-		reference_doctype: DF.Link | None
+		reference_pagetype: DF.Link | None
 		reference_name: DF.DynamicLink | None
 		request_data: DF.Code
 		request_files: DF.Code | None
@@ -107,8 +107,8 @@ class AgentJob(Document):
 			if not has_support_access("Release Group", group):
 				is_owned_by_team("Release Group", group, raise_exception=True)
 
-			AgentJob = jingrow.qb.DocType("Agent Job")
-			Bench = jingrow.qb.DocType("Bench")
+			AgentJob = jingrow.qb.PageType("Agent Job")
+			Bench = jingrow.qb.PageType("Bench")
 			benches = jingrow.qb.from_(Bench).select(Bench.name).where(Bench.group == filters.group)
 			query = query.where(AgentJob.bench.isin(benches))
 
@@ -156,7 +156,7 @@ class AgentJob(Document):
 
 	def enqueue_http_request(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"create_http_request",
 			timeout=600,
@@ -240,7 +240,7 @@ class AgentJob(Document):
 		for step in job_type.steps:
 			pg = jingrow.get_pg(
 				{
-					"doctype": "Agent Job Step",
+					"pagetype": "Agent Job Step",
 					"agent_job": self.name,
 					"status": "Pending",
 					"step_name": step.step_name,
@@ -253,7 +253,7 @@ class AgentJob(Document):
 	def retry(self):
 		return jingrow.get_pg(
 			{
-				"doctype": "Agent Job",
+				"pagetype": "Agent Job",
 				"status": "Undelivered",
 				"job_type": self.job_type,
 				"server_type": self.server_type,
@@ -324,7 +324,7 @@ class AgentJob(Document):
 
 		jingrow.db.delete(
 			"Jcloude Notification",
-			{"document_type": self.doctype, "document_name": self.name},
+			{"document_type": self.pagetype, "document_name": self.name},
 		)
 
 	def get_step_status(self, step_name: str):
@@ -423,21 +423,21 @@ def job_detail(job):
 
 def publish_update(job):
 	message = job_detail(job)
-	jingrow.publish_realtime(event="agent_job_update", doctype="Agent Job", docname=job, message=message)
+	jingrow.publish_realtime(event="agent_job_update", pagetype="Agent Job", docname=job, message=message)
 
 	# publish event for agent job list to update in dashboard
 	# we are doing this since process agent job doesn't emit list_update for job due to set_value
-	jingrow.publish_realtime(event="list_update", message={"doctype": "Agent Job", "name": job})
+	jingrow.publish_realtime(event="list_update", message={"pagetype": "Agent Job", "name": job})
 
 	# publish event for site to show job running on dashboard and update site
 	# we are doing this since process agent job doesn't emit pg_update for site due to set_value
 	if message["site"]:
 		jingrow.publish_realtime(
 			event="pg_update",
-			doctype="Site",
+			pagetype="Site",
 			docname=message["site"],
 			message={
-				"doctype": "Site",
+				"pagetype": "Site",
 				"name": message["site"],
 				"status": message["status"],
 				"id": message["id"],
@@ -544,7 +544,7 @@ def handle_polled_job(polled_job, pending_jobs=None, job=None):
 			"Agent Job Poll Exception",
 			job=job,
 			polled=polled_job,
-			reference_doctype="Agent Job",
+			reference_pagetype="Agent Job",
 			reference_name=job.name,
 		)
 		jingrow.db.rollback()
@@ -620,7 +620,7 @@ def poll_pending_jobs():
 
 	for server in alive_servers:
 		jingrow.enqueue(
-			"jcloude.jcloude.doctype.agent_job.agent_job.poll_pending_jobs_server",
+			"jcloude.jcloude.pagetype.agent_job.agent_job.poll_pending_jobs_server",
 			queue="short",
 			server=server,
 			job_id=f"poll_pending_jobs:{server.server}",
@@ -695,16 +695,16 @@ def lock_pg_updated_by_job(job_name):
 		return None
 
 	for field, value in field_values.items():
-		doctype = field.capitalize()
+		pagetype = field.capitalize()
 		if field == "server":
-			doctype = field_values["server_type"]
+			pagetype = field_values["server_type"]
 		elif field in (
 			"server_type",
 			"job_type",
 		):  # ideally will never happen, but for sanity
 			return None
 		if value:
-			jingrow.db.get_value(doctype, value, "modified", for_update=True)
+			jingrow.db.get_value(pagetype, value, "modified", for_update=True)
 			return value
 
 	return None
@@ -860,10 +860,10 @@ def is_auto_retry_disabled(server):
 
 
 def update_job_and_step_status(job: str, status: str):
-	agent_job = jingrow.qb.DocType("Agent Job")
+	agent_job = jingrow.qb.PageType("Agent Job")
 	jingrow.qb.update(agent_job).set(agent_job.status, status).where(agent_job.name == job).run()
 
-	agent_job_step = jingrow.qb.DocType("Agent Job Step")
+	agent_job_step = jingrow.qb.PageType("Agent Job Step")
 	jingrow.qb.update(agent_job_step).set(agent_job_step.status, status).where(
 		agent_job_step.agent_job == job
 	).run()
@@ -945,55 +945,55 @@ def process_job_updates(job_name: str, response_data: dict | None = None):  # no
 	start = now_datetime()
 
 	try:
-		from jcloude.jcloude.doctype.agent_job.agent_job_notifications import (
+		from jcloude.jcloude.pagetype.agent_job.agent_job_notifications import (
 			send_job_failure_notification,
 		)
-		from jcloude.jcloude.doctype.app_patch.app_patch import AppPatch
-		from jcloude.jcloude.doctype.bench.bench import (
+		from jcloude.jcloude.pagetype.app_patch.app_patch import AppPatch
+		from jcloude.jcloude.pagetype.bench.bench import (
 			Bench,
 			process_add_ssh_user_job_update,
 			process_archive_bench_job_update,
 			process_new_bench_job_update,
 			process_remove_ssh_user_job_update,
 		)
-		from jcloude.jcloude.doctype.code_server.code_server import (
+		from jcloude.jcloude.pagetype.code_server.code_server import (
 			process_archive_code_server_job_update,
 			process_new_code_server_job_update,
 			process_start_code_server_job_update,
 			process_stop_code_server_job_update,
 		)
-		from jcloude.jcloude.doctype.database_server.database_server import (
+		from jcloude.jcloude.pagetype.database_server.database_server import (
 			process_add_binlogs_to_indexer_agent_job_update,
 			process_remove_binlogs_from_indexer_agent_job_update,
 		)
-		from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
-		from jcloude.jcloude.doctype.logical_replication_backup.logical_replication_backup import (
+		from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+		from jcloude.jcloude.pagetype.logical_replication_backup.logical_replication_backup import (
 			process_logical_replication_backup_activate_site_job_update,
 			process_logical_replication_backup_deactivate_site_job_update,
 			process_logical_replication_backup_update_database_host_job_update,
 		)
-		from jcloude.jcloude.doctype.mariadb_binlog.mariadb_binlog import (
+		from jcloude.jcloude.pagetype.mariadb_binlog.mariadb_binlog import (
 			process_upload_binlogs_to_s3_job_update,
 		)
-		from jcloude.jcloude.doctype.physical_backup_restoration.physical_backup_restoration import (
+		from jcloude.jcloude.pagetype.physical_backup_restoration.physical_backup_restoration import (
 			process_job_update as process_physical_backup_restoration_job_update,
 		)
-		from jcloude.jcloude.doctype.physical_backup_restoration.physical_backup_restoration import (
+		from jcloude.jcloude.pagetype.physical_backup_restoration.physical_backup_restoration import (
 			process_physical_backup_restoration_deactivate_site_job_update,
 		)
-		from jcloude.jcloude.doctype.proxy_server.proxy_server import (
+		from jcloude.jcloude.pagetype.proxy_server.proxy_server import (
 			process_update_nginx_job_update,
 		)
-		from jcloude.jcloude.doctype.server.server import process_new_server_job_update
-		from jcloude.jcloude.doctype.server_snapshot_recovery.server_snapshot_recovery import (
+		from jcloude.jcloude.pagetype.server.server import process_new_server_job_update
+		from jcloude.jcloude.pagetype.server_snapshot_recovery.server_snapshot_recovery import (
 			process_backup_database_from_snapshot_job_callback,
 			process_backup_files_from_snapshot_job_callback,
 			process_search_sites_in_snapshot_job_callback,
 		)
-		from jcloude.jcloude.doctype.site.erpnext_site import (
+		from jcloude.jcloude.pagetype.site.erpnext_site import (
 			process_setup_erpnext_site_job_update,
 		)
-		from jcloude.jcloude.doctype.site.site import (
+		from jcloude.jcloude.pagetype.site.site import (
 			process_add_domain_job_update,
 			process_archive_site_job_update,
 			process_complete_setup_wizard_job_update,
@@ -1009,15 +1009,15 @@ def process_job_updates(job_name: str, response_data: dict | None = None):  # no
 			process_restore_tables_job_update,
 			process_uninstall_app_site_job_update,
 		)
-		from jcloude.jcloude.doctype.site_backup.site_backup import process_backup_site_job_update
-		from jcloude.jcloude.doctype.site_backup.site_backup import (
+		from jcloude.jcloude.pagetype.site_backup.site_backup import process_backup_site_job_update
+		from jcloude.jcloude.pagetype.site_backup.site_backup import (
 			process_deactivate_site_job_update as process_site_backup_deactivate_site_job_update,
 		)
-		from jcloude.jcloude.doctype.site_domain.site_domain import (
+		from jcloude.jcloude.pagetype.site_domain.site_domain import (
 			process_add_domain_to_upstream_job_update,
 			process_new_host_job_update,
 		)
-		from jcloude.jcloude.doctype.site_update.site_update import (
+		from jcloude.jcloude.pagetype.site_update.site_update import (
 			process_activate_site_job_update,
 			process_deactivate_site_job_update,
 			process_update_site_job_update,
@@ -1085,7 +1085,7 @@ def process_job_updates(job_name: str, response_data: dict | None = None):  # no
 		elif job.job_type == "Remove User from Proxy":
 			process_remove_ssh_user_job_update(job)
 		elif job.job_type == "Add User to ProxySQL" or job.job_type == "Remove User from ProxySQL":
-			if job.reference_doctype == "Site Database User":
+			if job.reference_pagetype == "Site Database User":
 				SiteDatabaseUser.process_job_update(job)
 		elif job.job_type == "Reload NGINX":
 			process_update_nginx_job_update(job)
@@ -1113,19 +1113,19 @@ def process_job_updates(job_name: str, response_data: dict | None = None):  # no
 			SiteDatabaseUser.process_job_update(job)
 		elif job.job_type == "Physical Restore Database":
 			process_physical_backup_restoration_job_update(job)
-		elif job.job_type == "Deactivate Site" and job.reference_doctype == "Site Update":
+		elif job.job_type == "Deactivate Site" and job.reference_pagetype == "Site Update":
 			process_deactivate_site_job_update(job)
-		elif job.job_type == "Activate Site" and job.reference_doctype == "Site Update":
+		elif job.job_type == "Activate Site" and job.reference_pagetype == "Site Update":
 			process_activate_site_job_update(job)
-		elif job.job_type == "Activate Site" and job.reference_doctype == "Logical Replication Backup":
+		elif job.job_type == "Activate Site" and job.reference_pagetype == "Logical Replication Backup":
 			process_logical_replication_backup_activate_site_job_update(job)
-		elif job.job_type == "Deactivate Site" and job.reference_doctype == "Site Backup":
+		elif job.job_type == "Deactivate Site" and job.reference_pagetype == "Site Backup":
 			process_site_backup_deactivate_site_job_update(job)
-		elif job.job_type == "Deactivate Site" and job.reference_doctype == "Physical Backup Restoration":
+		elif job.job_type == "Deactivate Site" and job.reference_pagetype == "Physical Backup Restoration":
 			process_physical_backup_restoration_deactivate_site_job_update(job)
-		elif job.job_type == "Deactivate Site" and job.reference_doctype == "Logical Replication Backup":
+		elif job.job_type == "Deactivate Site" and job.reference_pagetype == "Logical Replication Backup":
 			process_logical_replication_backup_deactivate_site_job_update(job)
-		elif job.job_type == "Update Database Host" and job.reference_doctype == "Logical Replication Backup":
+		elif job.job_type == "Update Database Host" and job.reference_pagetype == "Logical Replication Backup":
 			process_logical_replication_backup_update_database_host_job_update(job)
 		elif job.job_type == "Add Domain":
 			process_add_domain_job_update(job)
@@ -1153,7 +1153,7 @@ def process_job_updates(job_name: str, response_data: dict | None = None):  # no
 			log_error(
 				"Agent Job Callback Exception",
 				job=job.as_dict(),
-				reference_doctype="Agent Job",
+				reference_pagetype="Agent Job",
 				reference_name=job_name,
 			)
 		log_update(job, start, e)
@@ -1183,8 +1183,8 @@ def log_update(job, start, exception=None):
 def update_job_step_status():
 	from jingrow.query_builder.custom import GROUP_CONCAT
 
-	agent_job = jingrow.qb.DocType("Agent Job")
-	agent_job_step = jingrow.qb.DocType("Agent Job Step")
+	agent_job = jingrow.qb.PageType("Agent Job")
+	agent_job_step = jingrow.qb.PageType("Agent Job Step")
 
 	steps_to_update = (
 		jingrow.qb.from_(agent_job)
@@ -1214,9 +1214,9 @@ def update_job_step_status():
 		).run()
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	jingrow.db.add_index("Agent Job", ["status", "server"])
-	jingrow.db.add_index("Agent Job", ["reference_doctype", "reference_name"])
+	jingrow.db.add_index("Agent Job", ["reference_pagetype", "reference_name"])
 	# We don't need modified index, it's harmful on constantly updating tables
 	jingrow.db.sql_ddl("drop index if exists modified on `tabAgent Job`")
 	jingrow.db.add_index("Agent Job", ["creation"])
diff --git a/press/press/doctype/agent_job/agent_job_notifications.py b/press/press/doctype/agent_job/agent_job_notifications.py
index a461fe41..12196b93 100644
--- a/press/press/doctype/agent_job/agent_job_notifications.py
+++ b/press/press/doctype/agent_job/agent_job_notifications.py
@@ -36,7 +36,7 @@ if typing.TYPE_CHECKING:
 	# TYPE_CHECKING guard for code below cause DeployCandidate
 	# might cause circular import.
 
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
 
 	class UserAddressableHandler(Protocol):
 		def __call__(
@@ -127,10 +127,10 @@ def create_job_failed_notification(
 
 	details = get_details(job, title, message)
 	pg_dict = {
-		"doctype": "Jcloude Notification",
+		"pagetype": "Jcloude Notification",
 		"team": team,
 		"type": notification_type,
-		"document_type": job.doctype,
+		"document_type": job.pagetype,
 		"document_name": job.name,
 		"class": "Error",
 		**details,
@@ -139,7 +139,7 @@ def create_job_failed_notification(
 	pg.insert()
 	jingrow.db.commit()
 
-	jingrow.publish_realtime("jcloude_notification", doctype="Jcloude Notification", message={"team": team})
+	jingrow.publish_realtime("jcloude_notification", pagetype="Jcloude Notification", message={"team": team})
 
 	return details["is_actionable"]
 
@@ -222,7 +222,7 @@ def update_with_data_truncated_for_column_err(details: Details, job: AgentJob):
 	details[
 		"message"
 	] = f"""<p>The server encountered a data truncated for column error while migrating the site <b>{job.site}</b>.</p>
-	<p>This tends to happen when the datatype of a field changes, but there is existing data in the doctype that don't fit to the new datatype</p>
+	<p>This tends to happen when the datatype of a field changes, but there is existing data in the pagetype that don't fit to the new datatype</p>
 	<p>To rectify this issue, please follow the steps mentioned in <i>Help</i>.</p>
 	"""
 
@@ -345,7 +345,7 @@ def get_default_message(job: AgentJob) -> str:
 
 
 def send_job_failure_notification(job: AgentJob):
-	from jcloude.jcloude.doctype.site_migration.site_migration import (
+	from jcloude.jcloude.pagetype.site_migration.site_migration import (
 		get_ongoing_migration,
 		job_matches_site_migration,
 	)
@@ -358,7 +358,7 @@ def send_job_failure_notification(job: AgentJob):
 	notification_type = get_notification_type(job)
 	team = None
 
-	if job.reference_doctype == "Site Database User":
+	if job.reference_pagetype == "Site Database User":
 		return
 
 	if job.site:
diff --git a/press/press/doctype/agent_job/test_agent_job.py b/press/press/doctype/agent_job/test_agent_job.py
index 02fadd37..151c7c38 100644
--- a/press/press/doctype/agent_job/test_agent_job.py
+++ b/press/press/doctype/agent_job/test_agent_job.py
@@ -14,9 +14,9 @@ from jingrow.model.naming import make_autoname
 from jingrow.tests.utils import FrappeTestCase
 
 from jcloude.agent import Agent
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob, lock_pg_updated_by_job
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.team.test_team import create_test_jcloude_admin_team
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob, lock_pg_updated_by_job
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.team.test_team import create_test_jcloude_admin_team
 from jcloude.utils.test import foreground_enqueue, foreground_enqueue_pg
 
 if TYPE_CHECKING:
@@ -189,15 +189,15 @@ def fake_agent_job(
 			create=True,
 		),
 		patch(
-			"jcloude.jcloude.doctype.agent_job.agent_job.jingrow.enqueue_pg",
+			"jcloude.jcloude.pagetype.agent_job.agent_job.jingrow.enqueue_pg",
 			new=foreground_enqueue_pg,
 		),
 		patch(
-			"jcloude.jcloude.doctype.agent_job.agent_job.jingrow.enqueue",
+			"jcloude.jcloude.pagetype.agent_job.agent_job.jingrow.enqueue",
 			new=foreground_enqueue,
 		),
-		patch("jcloude.jcloude.doctype.agent_job.agent_job.jingrow.db.commit", new=Mock()),
-		patch("jcloude.jcloude.doctype.agent_job.agent_job.jingrow.db.rollback", new=Mock()),
+		patch("jcloude.jcloude.pagetype.agent_job.agent_job.jingrow.db.commit", new=Mock()),
+		patch("jcloude.jcloude.pagetype.agent_job.agent_job.jingrow.db.rollback", new=Mock()),
 	):
 		jingrow.local.role_permissions = {}  # due to bug in FF related to only_if_creator docperm
 		yield
@@ -241,8 +241,8 @@ class TestAgentJob(FrappeTestCase):
 		pg_name = lock_pg_updated_by_job(job.name)
 		self.assertIsNone(pg_name)
 
-	@patch("jcloude.jcloude.doctype.site.site.create_dns_record", new=Mock())
-	@patch("jcloude.jcloude.doctype.site.site._change_dns_record", new=Mock())
+	@patch("jcloude.jcloude.pagetype.site.site.create_dns_record", new=Mock())
+	@patch("jcloude.jcloude.pagetype.site.site._change_dns_record", new=Mock())
 	def test_lock_pg_updated_by_job_locks_on_site_rename(self):
 		site = create_test_site()
 		site.subdomain = "renamed-domain"
diff --git a/press/press/doctype/agent_job_callback/agent_job_callback.json b/press/press/doctype/agent_job_callback/agent_job_callback.json
index 784d7285..8bdbf513 100644
--- a/press/press/doctype/agent_job_callback/agent_job_callback.json
+++ b/press/press/doctype/agent_job_callback/agent_job_callback.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2025-03-27 09:16:28.629290",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "job_name",
diff --git a/press/press/doctype/agent_job_step/agent_job_step.json b/press/press/doctype/agent_job_step/agent_job_step.json
index a07176cf..b7ad06c0 100644
--- a/press/press/doctype/agent_job_step/agent_job_step.json
+++ b/press/press/doctype/agent_job_step/agent_job_step.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-01-14 10:47:46.916471",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/agent_job_step/agent_job_step.py b/press/press/doctype/agent_job_step/agent_job_step.py
index 753131a8..3033d9cd 100644
--- a/press/press/doctype/agent_job_step/agent_job_step.py
+++ b/press/press/doctype/agent_job_step/agent_job_step.py
@@ -29,7 +29,7 @@ class AgentJobStep(Document):
 	# end: auto-generated types
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	# We don't need modified index, it's harmful on constantly updating tables
 	jingrow.db.sql_ddl("drop index if exists modified on `tabAgent Job Step`")
 	jingrow.db.add_index("Agent Job Step", ["creation"])
diff --git a/press/press/doctype/agent_job_type/agent_job_type.json b/press/press/doctype/agent_job_type/agent_job_type.json
index 1c68f9e5..59eecea7 100644
--- a/press/press/doctype/agent_job_type/agent_job_type.json
+++ b/press/press/doctype/agent_job_type/agent_job_type.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "Prompt",
  "creation": "2020-01-14 10:43:38.943661",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/agent_job_type/agent_job_type.py b/press/press/doctype/agent_job_type/agent_job_type.py
index 8be2e7c0..19622c7d 100644
--- a/press/press/doctype/agent_job_type/agent_job_type.py
+++ b/press/press/doctype/agent_job_type/agent_job_type.py
@@ -17,7 +17,7 @@ class AgentJobType(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.agent_job_type_step.agent_job_type_step import (
+		from jcloude.jcloude.pagetype.agent_job_type_step.agent_job_type_step import (
 			AgentJobTypeStep,
 		)
 
diff --git a/press/press/doctype/agent_job_type_step/agent_job_type_step.json b/press/press/doctype/agent_job_type_step/agent_job_type_step.json
index d465829b..1c024367 100644
--- a/press/press/doctype/agent_job_type_step/agent_job_type_step.json
+++ b/press/press/doctype/agent_job_type_step/agent_job_type_step.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-01-14 10:43:26.284328",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/agent_request_failure/agent_request_failure.json b/press/press/doctype/agent_request_failure/agent_request_failure.json
index b7951fe8..83661db6 100644
--- a/press/press/doctype/agent_request_failure/agent_request_failure.json
+++ b/press/press/doctype/agent_request_failure/agent_request_failure.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-06-10 15:55:14.514080",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "MyISAM",
  "field_order": [
   "server_type",
@@ -21,7 +21,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Server Type",
-   "options": "DocType",
+   "options": "PageType",
    "read_only": 1,
    "reqd": 1
   },
diff --git a/press/press/doctype/agent_update/agent_update.json b/press/press/doctype/agent_update/agent_update.json
index 61537657..d3d663ec 100644
--- a/press/press/doctype/agent_update/agent_update.json
+++ b/press/press/doctype/agent_update/agent_update.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-04-23 13:20:25.030627",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "status",
diff --git a/press/press/doctype/agent_update/agent_update.py b/press/press/doctype/agent_update/agent_update.py
index f68bc1bf..f6ad555d 100644
--- a/press/press/doctype/agent_update/agent_update.py
+++ b/press/press/doctype/agent_update/agent_update.py
@@ -29,7 +29,7 @@ class AgentUpdate(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.agent_update_server.agent_update_server import AgentUpdateServer
+		from jcloude.jcloude.pagetype.agent_update_server.agent_update_server import AgentUpdateServer
 
 		agent_startup_timeout_minutes: DF.Int
 		app_server: DF.Check
@@ -226,7 +226,7 @@ class AgentUpdate(Document):
 		for _ in range(no_of_batches - 1):
 			pg = jingrow.get_pg(
 				{
-					"doctype": "Agent Update",
+					"pagetype": "Agent Update",
 					"agent_startup_timeout_minutes": self.agent_startup_timeout_minutes,
 					"app_server": self.app_server,
 					"auto_rollback_changes": self.auto_rollback_changes,
@@ -285,7 +285,7 @@ class AgentUpdate(Document):
 	@jingrow.whitelist()
 	def create_execution_plan(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_create_execution_plan",
 			queue="long",
@@ -369,7 +369,7 @@ class AgentUpdate(Document):
 	def execute(self):
 		if self._process_next_step():
 			jingrow.enqueue_pg(
-				self.doctype,
+				self.pagetype,
 				self.name,
 				"_update_agent_on_server",
 				queue="long",
diff --git a/press/press/doctype/agent_update_server/agent_update_server.json b/press/press/doctype/agent_update_server/agent_update_server.json
index 5c23db8f..b100be25 100644
--- a/press/press/doctype/agent_update_server/agent_update_server.json
+++ b/press/press/doctype/agent_update_server/agent_update_server.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-04-23 15:27:00.620133",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.json b/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.json
index accf3c13..6610b0c7 100644
--- a/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.json
+++ b/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-05-25 12:20:51.312501",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.py b/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.py
index a482bf9c..72fa2c54 100644
--- a/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.py
+++ b/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.py
@@ -16,18 +16,18 @@ from jingrow.utils.data import add_to_date
 from jingrow.utils.synchronization import filelock
 
 from jcloude.exceptions import AlertRuleNotEnabled
-from jcloude.jcloude.doctype.incident.incident import (
+from jcloude.jcloude.pagetype.incident.incident import (
 	INCIDENT_ALERT,
 	INCIDENT_SCOPE,
 	MIN_FIRING_INSTANCES,
 	MIN_FIRING_INSTANCES_FRACTION,
 	Incident,
 )
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.prometheus_alert_rule.prometheus_alert_rule import (
+	from jcloude.jcloude.pagetype.prometheus_alert_rule.prometheus_alert_rule import (
 		PrometheusAlertRule,
 	)
 
@@ -60,7 +60,7 @@ class AlertmanagerWebhookLog(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.alertmanager_webhook_log_reaction_job.alertmanager_webhook_log_reaction_job import (
+		from jcloude.jcloude.pagetype.alertmanager_webhook_log_reaction_job.alertmanager_webhook_log_reaction_job import (
 			AlertmanagerWebhookLogReactionJob,
 		)
 
@@ -82,7 +82,7 @@ class AlertmanagerWebhookLog(Document):
 		from jingrow.query_builder import Interval
 		from jingrow.query_builder.functions import Now
 
-		table = jingrow.qb.DocType("Alertmanager Webhook Log")
+		table = jingrow.qb.PageType("Alertmanager Webhook Log")
 		jingrow.db.delete(table, filters=(table.modified < (Now() - Interval(days=days))))
 
 	def validate(self):
@@ -110,7 +110,7 @@ class AlertmanagerWebhookLog(Document):
 	def after_insert(self):
 		if self.alert == INCIDENT_ALERT:
 			enqueue_pg(
-				self.doctype,
+				self.pagetype,
 				self.name,
 				"validate_and_create_incident",
 				enqueue_after_commit=True,
@@ -118,17 +118,17 @@ class AlertmanagerWebhookLog(Document):
 		if not jingrow.get_cached_value("Prometheus Alert Rule", self.alert, "silent"):
 			send_telegram_notifs = jingrow.db.get_single_value("Jcloude Settings", "send_telegram_notifications")
 			if send_telegram_notifs:
-				enqueue_pg(self.doctype, self.name, "send_telegram_notification", enqueue_after_commit=True)
+				enqueue_pg(self.pagetype, self.name, "send_telegram_notification", enqueue_after_commit=True)
 
 			send_email_notifs = jingrow.db.get_single_value("Jcloude Settings", "send_email_notifications")
 			if send_email_notifs:
-				enqueue_pg(self.doctype, self.name, "send_email_notification", enqueue_after_commit=True)
+				enqueue_pg(self.pagetype, self.name, "send_email_notification", enqueue_after_commit=True)
 
 		if self.status == "Firing" and jingrow.get_cached_value(
 			"Prometheus Alert Rule", self.alert, "jcloude_job_type"
 		):
 			enqueue_pg(
-				self.doctype,
+				self.pagetype,
 				self.name,
 				"react",
 				enqueue_after_commit=True,
@@ -137,7 +137,7 @@ class AlertmanagerWebhookLog(Document):
 			)
 
 	def react_for_instance(self, instance) -> dict:
-		instance_type = self.guess_doctype(instance)
+		instance_type = self.guess_pagetype(instance)
 		if not instance_type:
 			# Prometheus is monitoring instances we don't know about
 			return {}
@@ -171,7 +171,7 @@ class AlertmanagerWebhookLog(Document):
 
 	def past_alert_instances(self, status: DF.Literal["Firing", "Resolved"]) -> set[str]:
 		past_alerts = jingrow.get_all(
-			self.doctype,
+			self.pagetype,
 			fields=["payload"],
 			filters={
 				"alert": self.alert,
@@ -238,7 +238,7 @@ class AlertmanagerWebhookLog(Document):
 		self.instances = [
 			{
 				"name": alert["labels"]["instance"],
-				"doctype": alert["labels"].get("doctype", self.guess_doctype(alert["labels"]["instance"])),
+				"pagetype": alert["labels"].get("pagetype", self.guess_pagetype(alert["labels"]["instance"])),
 			}
 			for alert in self.parsed["alerts"][:20]
 		]
@@ -247,13 +247,13 @@ class AlertmanagerWebhookLog(Document):
 		labels.pop("alertname", None)
 
 		for instance in self.instances:
-			if instance["doctype"]:
-				instance["link"] = get_url_to_form(instance["doctype"], instance["name"])
+			if instance["pagetype"]:
+				instance["link"] = get_url_to_form(instance["pagetype"], instance["name"])
 
 		context.update({"instances": self.instances, "labels": labels, "rule": rule})
 		return jingrow.render_template(TELEGRAM_NOTIFICATION_TEMPLATE, context)
 
-	def guess_doctype(self, name):
+	def guess_pagetype(self, name):
 		doctypes = [
 			"Site",
 			"Bench",
@@ -268,9 +268,9 @@ class AlertmanagerWebhookLog(Document):
 			"Trace Server",
 			"NFS Server",
 		]
-		for doctype in doctypes:
-			if jingrow.db.exists(doctype, name):
-				return doctype
+		for pagetype in doctypes:
+			if jingrow.db.exists(pagetype, name):
+				return pagetype
 		return None
 
 	def send_telegram_notification(self):
diff --git a/press/press/doctype/alertmanager_webhook_log/test_alertmanager_webhook_log.py b/press/press/doctype/alertmanager_webhook_log/test_alertmanager_webhook_log.py
index 947630b5..510cc513 100644
--- a/press/press/doctype/alertmanager_webhook_log/test_alertmanager_webhook_log.py
+++ b/press/press/doctype/alertmanager_webhook_log/test_alertmanager_webhook_log.py
@@ -8,19 +8,19 @@ import typing
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.prometheus_alert_rule.test_prometheus_alert_rule import (
+from jcloude.jcloude.pagetype.prometheus_alert_rule.test_prometheus_alert_rule import (
 	create_test_prometheus_alert_rule,
 )
-from jcloude.jcloude.doctype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
 
 if typing.TYPE_CHECKING:
 	from datetime import datetime
 
-	from jcloude.jcloude.doctype.alertmanager_webhook_log.alertmanager_webhook_log import AlertmanagerWebhookLog
-	from jcloude.jcloude.doctype.prometheus_alert_rule.prometheus_alert_rule import (
+	from jcloude.jcloude.pagetype.alertmanager_webhook_log.alertmanager_webhook_log import AlertmanagerWebhookLog
+	from jcloude.jcloude.pagetype.prometheus_alert_rule.prometheus_alert_rule import (
 		PrometheusAlertRule,
 	)
-	from jcloude.jcloude.doctype.site.site import Site
+	from jcloude.jcloude.pagetype.site.site import Site
 
 
 def create_test_alertmanager_webhook_log(
@@ -33,7 +33,7 @@ def create_test_alertmanager_webhook_log(
 	site = site or create_test_site()
 	return jingrow.get_pg(  # type: ignore
 		{
-			"doctype": "Alertmanager Webhook Log",
+			"pagetype": "Alertmanager Webhook Log",
 			"alert": alert.name,
 			"creation": creation or jingrow.utils.now_datetime(),
 			"payload": json.dumps(
diff --git a/press/press/doctype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.json b/press/press/doctype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.json
index 347a1789..5689714c 100644
--- a/press/press/doctype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.json
+++ b/press/press/doctype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-04-30 15:36:25.358922",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "jcloude_job_type",
diff --git a/press/press/doctype/analytics_server/analytics_server.json b/press/press/doctype/analytics_server/analytics_server.json
index 1ccf0f2a..54ee8dbf 100644
--- a/press/press/doctype/analytics_server/analytics_server.json
+++ b/press/press/doctype/analytics_server/analytics_server.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2022-03-16 18:28:50.237675",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -257,7 +257,7 @@
  "grid_page_length": 50,
  "links": [
   {
-   "link_doctype": "Ansible Play",
+   "link_pagetype": "Ansible Play",
    "link_fieldname": "server"
   }
  ],
diff --git a/press/press/doctype/analytics_server/analytics_server.py b/press/press/doctype/analytics_server/analytics_server.py
index b7a24fe4..aa7e1119 100644
--- a/press/press/doctype/analytics_server/analytics_server.py
+++ b/press/press/doctype/analytics_server/analytics_server.py
@@ -6,7 +6,7 @@ import os
 
 import jingrow
 
-from jcloude.jcloude.doctype.server.server import BaseServer
+from jcloude.jcloude.pagetype.server.server import BaseServer
 from jcloude.runner import Ansible
 from jcloude.utils import log_error
 
diff --git a/press/press/doctype/ansible_console/ansible_console.json b/press/press/doctype/ansible_console/ansible_console.json
index 42433e3d..b6e6922d 100644
--- a/press/press/doctype/ansible_console/ansible_console.json
+++ b/press/press/doctype/ansible_console/ansible_console.json
@@ -6,7 +6,7 @@
    "label": "Logs"
   },
   {
-   "action": "jcloude.jcloude.doctype.ansible_console.ansible_console.execute_command",
+   "action": "jcloude.jcloude.pagetype.ansible_console.ansible_console.execute_command",
    "action_type": "Server Action",
    "hidden": 1,
    "label": "Execute"
@@ -14,7 +14,7 @@
  ],
  "creation": "2023-11-08 14:10:51.358824",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/ansible_console/ansible_console.py b/press/press/doctype/ansible_console/ansible_console.py
index 56d4798c..258f0fa5 100644
--- a/press/press/doctype/ansible_console/ansible_console.py
+++ b/press/press/doctype/ansible_console/ansible_console.py
@@ -29,7 +29,7 @@ class AnsibleConsole(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.ansible_console_output.ansible_console_output import (
+		from jcloude.jcloude.pagetype.ansible_console_output.ansible_console_output import (
 			AnsibleConsoleOutput,
 		)
 
@@ -52,7 +52,7 @@ class AnsibleConsole(Document):
 
 			traceback.print_exc()
 		log = self.as_dict()
-		log.update({"doctype": "Ansible Console Log"})
+		log.update({"pagetype": "Ansible Console Log"})
 		jingrow.get_pg(log).insert()
 		jingrow.db.commit()
 
@@ -60,7 +60,7 @@ class AnsibleConsole(Document):
 @jingrow.whitelist()
 def execute_command(pg):
 	jingrow.enqueue(
-		"jcloude.jcloude.doctype.ansible_console.ansible_console._execute_command",
+		"jcloude.jcloude.pagetype.ansible_console.ansible_console._execute_command",
 		pg=pg,
 		timeout=7200,
 	)
@@ -116,7 +116,7 @@ class AnsibleCallback(CallbackBase):
 		message = {"nonce": self.nonce, "output": list(self.hosts.values())}
 		jingrow.publish_realtime(
 			event="ansible_console_update",
-			doctype="Ansible Console",
+			pagetype="Ansible Console",
 			docname="Ansible Console",
 			user=jingrow.session.user,
 			message=message,
diff --git a/press/press/doctype/ansible_console_log/ansible_console_log.json b/press/press/doctype/ansible_console_log/ansible_console_log.json
index 8c7ca065..00a6006e 100644
--- a/press/press/doctype/ansible_console_log/ansible_console_log.json
+++ b/press/press/doctype/ansible_console_log/ansible_console_log.json
@@ -3,7 +3,7 @@
  "autoname": "format:Log on {timestamp}",
  "creation": "2023-11-08 14:12:56.262141",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/ansible_console_log/ansible_console_log.py b/press/press/doctype/ansible_console_log/ansible_console_log.py
index 7b94644b..e8fcc2e8 100644
--- a/press/press/doctype/ansible_console_log/ansible_console_log.py
+++ b/press/press/doctype/ansible_console_log/ansible_console_log.py
@@ -14,7 +14,7 @@ class AnsibleConsoleLog(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.ansible_console_output.ansible_console_output import (
+		from jcloude.jcloude.pagetype.ansible_console_output.ansible_console_output import (
 			AnsibleConsoleOutput,
 		)
 
diff --git a/press/press/doctype/ansible_console_output/ansible_console_output.json b/press/press/doctype/ansible_console_output/ansible_console_output.json
index 8970097c..912e93ca 100644
--- a/press/press/doctype/ansible_console_output/ansible_console_output.json
+++ b/press/press/doctype/ansible_console_output/ansible_console_output.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2023-11-24 11:04:34.401204",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "host",
diff --git a/press/press/doctype/ansible_play/ansible_play.json b/press/press/doctype/ansible_play/ansible_play.json
index d34ab21e..8892a78f 100644
--- a/press/press/doctype/ansible_play/ansible_play.json
+++ b/press/press/doctype/ansible_play/ansible_play.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-09-29 20:35:02.147164",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -33,7 +33,7 @@
    "fieldname": "server_type",
    "fieldtype": "Link",
    "label": "Server Type",
-   "options": "DocType",
+   "options": "PageType",
    "read_only": 1,
    "reqd": 1,
    "search_index": 1
diff --git a/press/press/doctype/ansible_play/ansible_play.py b/press/press/doctype/ansible_play/ansible_play.py
index a2c11a81..7d3cb4da 100644
--- a/press/press/doctype/ansible_play/ansible_play.py
+++ b/press/press/doctype/ansible_play/ansible_play.py
@@ -8,7 +8,7 @@ from jingrow.model.document import Document
 from jingrow.utils import cstr
 
 from jcloude.api.client import is_owned_by_team
-from jcloude.utils import poly_get_doctype
+from jcloude.utils import poly_get_pagetype
 
 
 class AnsiblePlay(Document):
@@ -60,11 +60,11 @@ class AnsiblePlay(Document):
 			servers = jingrow.parse_json(server.replace("'", '"'))[1]
 
 			for server in servers:
-				doctype = poly_get_doctype(["Server", "Database Server"], server)
-				is_owned_by_team(doctype, server, raise_exception=True)
+				pagetype = poly_get_pagetype(["Server", "Database Server"], server)
+				is_owned_by_team(pagetype, server, raise_exception=True)
 		else:
-			doctype = poly_get_doctype(["Server", "Database Server"], server)
-			is_owned_by_team(doctype, server, raise_exception=True)
+			pagetype = poly_get_pagetype(["Server", "Database Server"], server)
+			is_owned_by_team(pagetype, server, raise_exception=True)
 
 		results = query.run(as_dict=1)
 		return results
diff --git a/press/press/doctype/ansible_play/test_ansible_play.py b/press/press/doctype/ansible_play/test_ansible_play.py
index e1facf4e..898cbcb2 100644
--- a/press/press/doctype/ansible_play/test_ansible_play.py
+++ b/press/press/doctype/ansible_play/test_ansible_play.py
@@ -24,7 +24,7 @@ def create_test_ansible_play(
 		vars = {}
 	play = jingrow.get_pg(
 		{
-			"doctype": "Ansible Play",
+			"pagetype": "Ansible Play",
 			"play": play,
 			"playbook": playbook,
 			"server_type": server_type,
diff --git a/press/press/doctype/ansible_task/ansible_task.json b/press/press/doctype/ansible_task/ansible_task.json
index 257d9dfe..64e39dda 100644
--- a/press/press/doctype/ansible_task/ansible_task.json
+++ b/press/press/doctype/ansible_task/ansible_task.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-09-29 20:45:05.363968",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/ansible_task/ansible_task.py b/press/press/doctype/ansible_task/ansible_task.py
index 5a29498c..293b9db5 100644
--- a/press/press/doctype/ansible_task/ansible_task.py
+++ b/press/press/doctype/ansible_task/ansible_task.py
@@ -35,7 +35,7 @@ class AnsibleTask(Document):
 	def on_update(self):
 		jingrow.publish_realtime(
 			"ansible_play_update",
-			doctype="Ansible Play",
+			pagetype="Ansible Play",
 			docname=self.play,
 			message={"id": self.play},
 		)
diff --git a/press/press/doctype/ansible_task/test_ansible_task.py b/press/press/doctype/ansible_task/test_ansible_task.py
index 9e96d1b2..48757fe9 100644
--- a/press/press/doctype/ansible_task/test_ansible_task.py
+++ b/press/press/doctype/ansible_task/test_ansible_task.py
@@ -15,7 +15,7 @@ def create_test_ansible_play_task(
 ):
 	play = jingrow.get_pg(
 		{
-			"doctype": "Ansible Task",
+			"pagetype": "Ansible Task",
 			"play": play,
 			"role": role,
 			"task": task,
diff --git a/press/press/doctype/app/app.json b/press/press/doctype/app/app.json
index 78df3ab0..a7b58d88 100644
--- a/press/press/doctype/app/app.json
+++ b/press/press/doctype/app/app.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "Prompt",
  "creation": "2019-12-09 14:45:21.955245",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/app/app.py b/press/press/doctype/app/app.py
index 7745c4f5..ad67845e 100644
--- a/press/press/doctype/app/app.py
+++ b/press/press/doctype/app/app.py
@@ -11,7 +11,7 @@ from jingrow.model.document import Document
 from jcloude.utils.jobs import has_job_timeout_exceeded
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app_source.app_source import AppSource
+	from jcloude.jcloude.pagetype.app_source.app_source import AppSource
 
 
 class App(Document):
@@ -64,7 +64,7 @@ class App(Document):
 			# Add new App Source
 			source = jingrow.get_pg(
 				{
-					"doctype": "App Source",
+					"pagetype": "App Source",
 					"app": self.name,
 					"versions": [{"version": version}],
 					"repository_url": repository_url,
@@ -82,7 +82,7 @@ class App(Document):
 
 
 def new_app(name, title):
-	app: "App" = jingrow.get_pg({"doctype": "App", "name": name, "title": title}).insert()
+	app: "App" = jingrow.get_pg({"pagetype": "App", "name": name, "title": title}).insert()
 	return app
 
 
diff --git a/press/press/doctype/app/test_app.py b/press/press/doctype/app/test_app.py
index 7bcb8c4d..43d9e5d3 100644
--- a/press/press/doctype/app/test_app.py
+++ b/press/press/doctype/app/test_app.py
@@ -7,14 +7,14 @@ from typing import TYPE_CHECKING
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app.app import App
+	from jcloude.jcloude.pagetype.app.app import App
 
 
 def create_test_app(name: str = "jingrow", title: str = "Jingrow Framework") -> "App":
-	return jingrow.get_pg({"doctype": "App", "name": name, "title": title}).insert(ignore_if_duplicate=True)
+	return jingrow.get_pg({"pagetype": "App", "name": name, "title": title}).insert(ignore_if_duplicate=True)
 
 
 class TestApp(FrappeTestCase):
diff --git a/press/press/doctype/app_group/app_group.json b/press/press/doctype/app_group/app_group.json
index 1b76f2a8..0b3caa85 100644
--- a/press/press/doctype/app_group/app_group.json
+++ b/press/press/doctype/app_group/app_group.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-09-03 15:07:30.256352",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/app_patch/app_patch.json b/press/press/doctype/app_patch/app_patch.json
index c5e2bcb1..d5f8a9fa 100644
--- a/press/press/doctype/app_patch/app_patch.json
+++ b/press/press/doctype/app_patch/app_patch.json
@@ -3,7 +3,7 @@
  "autoname": "autoincrement",
  "beta": 1,
  "creation": "2024-02-22 10:31:03.366179",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "app",
diff --git a/press/press/doctype/app_patch/app_patch.py b/press/press/doctype/app_patch/app_patch.py
index 01da4234..be4da3dc 100644
--- a/press/press/doctype/app_patch/app_patch.py
+++ b/press/press/doctype/app_patch/app_patch.py
@@ -33,7 +33,7 @@ class AgentPatchConfig(TypedDict):
 
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
 
 
 class AppPatch(Document):
@@ -164,7 +164,7 @@ def create_app_patch(
 
 	for bench in benches:
 		pg_dict = dict(
-			doctype="App Patch",
+			pagetype="App Patch",
 			patch=patch,
 			bench=bench,
 			group=release_group,
diff --git a/press/press/doctype/app_patch/patches/set_archived_patch_on_archived_bench.py b/press/press/doctype/app_patch/patches/set_archived_patch_on_archived_bench.py
index 7a6cf25c..4e516e8a 100644
--- a/press/press/doctype/app_patch/patches/set_archived_patch_on_archived_bench.py
+++ b/press/press/doctype/app_patch/patches/set_archived_patch_on_archived_bench.py
@@ -5,10 +5,10 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("App Patch")
+	jingrow.reload_pagetype("App Patch")
 
 	# All archived benches
-	Bench = jingrow.qb.DocType("Bench")
+	Bench = jingrow.qb.PageType("Bench")
 	bench_names = (
 		jingrow.qb.from_(Bench).select(Bench.name).where(Bench.status == "Archived").run(pluck="name")
 	)
diff --git a/press/press/doctype/app_release/app_release.json b/press/press/doctype/app_release/app_release.json
index d1780009..2cc188b0 100644
--- a/press/press/doctype/app_release/app_release.json
+++ b/press/press/doctype/app_release/app_release.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-01-13 15:39:20.221775",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -169,32 +169,32 @@
  "links": [
   {
    "group": "Connections",
-   "link_doctype": "Bench",
+   "link_pagetype": "Bench",
    "link_fieldname": "release"
   },
   {
    "group": "Connections",
-   "link_doctype": "Deploy Candidate",
+   "link_pagetype": "Deploy Candidate",
    "link_fieldname": "release"
   },
   {
    "group": "Sources",
-   "link_doctype": "App Release Difference",
+   "link_pagetype": "App Release Difference",
    "link_fieldname": "source_release"
   },
   {
    "group": "Destinations",
-   "link_doctype": "App Release Difference",
+   "link_pagetype": "App Release Difference",
    "link_fieldname": "destination_release"
   },
   {
    "group": "Sources",
-   "link_doctype": "Deploy Candidate Difference",
+   "link_pagetype": "Deploy Candidate Difference",
    "link_fieldname": "source_release"
   },
   {
    "group": "Destinations",
-   "link_doctype": "Deploy Candidate Difference",
+   "link_pagetype": "Deploy Candidate Difference",
    "link_fieldname": "destination_release"
   }
  ],
diff --git a/press/press/doctype/app_release/app_release.py b/press/press/doctype/app_release/app_release.py
index e68cd73d..e4e328c2 100644
--- a/press/press/doctype/app_release/app_release.py
+++ b/press/press/doctype/app_release/app_release.py
@@ -13,13 +13,13 @@ import jingrow
 from jingrow.model.document import Document
 
 from jcloude.api.github import get_access_token
-from jcloude.jcloude.doctype.app_source.app_source import AppSource
+from jcloude.jcloude.pagetype.app_source.app_source import AppSource
 from jcloude.utils import log_error
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
-	from jcloude.jcloude.doctype.resource_tag.resource_tag import ResourceTag
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.resource_tag.resource_tag import ResourceTag
 
 
 class AppReleaseDict(TypedDict):
@@ -67,8 +67,8 @@ class AppRelease(Document):
 
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
-		app_release = jingrow.qb.DocType("App Release")
-		release_approve_request = jingrow.qb.DocType("App Release Approval Request")
+		app_release = jingrow.qb.PageType("App Release")
+		release_approve_request = jingrow.qb.PageType("App Release Approval Request")
 
 		# Subquery to get the latest screening_status for each app_release
 		latest_approval_request = (
@@ -174,8 +174,8 @@ class AppRelease(Document):
 			self._deploy_bench_group(bench_group)
 
 		else:
-			ReleaseGroup: "ReleaseGroup" = jingrow.qb.DocType("Release Group")
-			ResourceTag: "ResourceTag" = jingrow.qb.DocType("Resource Tag")
+			ReleaseGroup: "ReleaseGroup" = jingrow.qb.PageType("Release Group")
+			ResourceTag: "ResourceTag" = jingrow.qb.PageType("Resource Tag")
 
 			release_groups_with_auto_deploy = (
 				jingrow.qb.from_(ReleaseGroup)
@@ -192,7 +192,7 @@ class AppRelease(Document):
 
 	def after_insert(self):
 		self.create_release_differences()
-		jingrow.enqueue_pg(self.doctype, self.name, "auto_deploy", enqueue_after_commit=True)
+		jingrow.enqueue_pg(self.pagetype, self.name, "auto_deploy", enqueue_after_commit=True)
 
 	def get_source(self) -> AppSource:
 		"""Return the `App Source` associated with this `App Release`"""
@@ -204,7 +204,7 @@ class AppRelease(Document):
 
 	@jingrow.whitelist()
 	def clone(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_clone")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_clone")
 
 	def _clone(self, force: bool = False):
 		if self.cloned and not force:
@@ -346,7 +346,7 @@ class AppRelease(Document):
 		for release in releases:
 			difference = jingrow.get_pg(
 				{
-					"doctype": "App Release Difference",
+					"pagetype": "App Release Difference",
 					"app": self.app,
 					"source": self.source,
 					"source_release": release.release,
@@ -430,7 +430,7 @@ def cleanup_unused_releases():
 				log_error(
 					"App Release Cleanup Error",
 					release=release,
-					reference_doctype="App Release",
+					reference_pagetype="App Release",
 					reference_name=release,
 				)
 				jingrow.db.rollback()
diff --git a/press/press/doctype/app_release/patches/set_clone_directory.py b/press/press/doctype/app_release/patches/set_clone_directory.py
index 6b1c2900..0b398a20 100644
--- a/press/press/doctype/app_release/patches/set_clone_directory.py
+++ b/press/press/doctype/app_release/patches/set_clone_directory.py
@@ -6,7 +6,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("App Release")
+	jingrow.reload_pagetype("App Release")
 	clone_directory = jingrow.db.get_single_value("Jcloude Settings", "clone_directory")
 	releases = jingrow.get_all(
 		"App Release",
diff --git a/press/press/doctype/app_release/patches/set_status_to_draft.py b/press/press/doctype/app_release/patches/set_status_to_draft.py
index adfb544c..45ede7c7 100644
--- a/press/press/doctype/app_release/patches/set_status_to_draft.py
+++ b/press/press/doctype/app_release/patches/set_status_to_draft.py
@@ -5,7 +5,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("App Release")
+	jingrow.reload_pagetype("App Release")
 
 	jingrow.db.sql(
 		"""
diff --git a/press/press/doctype/app_release/test_app_release.py b/press/press/doctype/app_release/test_app_release.py
index 020f3819..b45e72d4 100644
--- a/press/press/doctype/app_release/test_app_release.py
+++ b/press/press/doctype/app_release/test_app_release.py
@@ -9,8 +9,8 @@ import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app_release.app_release import AppRelease
-	from jcloude.jcloude.doctype.app_source.app_source import AppSource
+	from jcloude.jcloude.pagetype.app_release.app_release import AppRelease
+	from jcloude.jcloude.pagetype.app_source.app_source import AppSource
 
 
 def create_test_app_release(app_source: AppSource, hash: str | None = None) -> "AppRelease":
@@ -18,7 +18,7 @@ def create_test_app_release(app_source: AppSource, hash: str | None = None) -> "
 	hash = hash or jingrow.mock("sha1")
 	app_release = jingrow.get_pg(
 		{
-			"doctype": "App Release",
+			"pagetype": "App Release",
 			"app": app_source.app,
 			"source": app_source.name,
 			"hash": hash,
diff --git a/press/press/doctype/app_release_approval_request/app_release_approval_request.json b/press/press/doctype/app_release_approval_request/app_release_approval_request.json
index 3326561c..e5127ada 100644
--- a/press/press/doctype/app_release_approval_request/app_release_approval_request.json
+++ b/press/press/doctype/app_release_approval_request/app_release_approval_request.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-07-12 16:17:54.427902",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/app_release_approval_request/app_release_approval_request.py b/press/press/doctype/app_release_approval_request/app_release_approval_request.py
index 6dfb5566..de44b45a 100644
--- a/press/press/doctype/app_release_approval_request/app_release_approval_request.py
+++ b/press/press/doctype/app_release_approval_request/app_release_approval_request.py
@@ -12,7 +12,7 @@ from pygments import highlight
 from pygments.formatters import HtmlFormatter as HF
 from pygments.lexers import PythonLexer as PL
 
-from jcloude.jcloude.doctype.app_release.app_release import AppRelease
+from jcloude.jcloude.pagetype.app_release.app_release import AppRelease
 
 
 class AppReleaseApprovalRequest(Document):
@@ -23,7 +23,7 @@ class AppReleaseApprovalRequest(Document):
 
 	if TYPE_CHECKING:
 		from jingrow.types import DF
-		from jcloude.marketplace.doctype.app_release_approval_code_comments.app_release_approval_code_comments import (
+		from jcloude.marketplace.pagetype.app_release_approval_code_comments.app_release_approval_code_comments import (
 			AppReleaseApprovalCodeComments,
 		)
 
@@ -251,7 +251,7 @@ class AppReleaseApprovalRequest(Document):
 			for line in file["lines"]:
 				line["highlighted_context"] = highlight_context(line["context"])
 		html = jingrow.render_template(
-			"jcloude/jcloude/doctype/app_release_approval_request/app_release_approval_request.html",
+			"jcloude/jcloude/pagetype/app_release_approval_request/app_release_approval_request.html",
 			{"result": diff_result, "styles": styles},
 		)
 		self.result_html = html
diff --git a/press/press/doctype/app_release_difference/app_release_difference.json b/press/press/doctype/app_release_difference/app_release_difference.json
index 83a39f47..38d3c494 100644
--- a/press/press/doctype/app_release_difference/app_release_difference.json
+++ b/press/press/doctype/app_release_difference/app_release_difference.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-12-14 20:15:05.386124",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/app_release_difference/app_release_difference.py b/press/press/doctype/app_release_difference/app_release_difference.py
index 2c562bb9..34464f83 100644
--- a/press/press/doctype/app_release_difference/app_release_difference.py
+++ b/press/press/doctype/app_release_difference/app_release_difference.py
@@ -40,8 +40,8 @@ class AppReleaseDifference(Document):
 			jingrow.throw("Destination Release must be different from Source Release", jingrow.ValidationError)
 
 	def _get_branch_from_app_source(self, release: str) -> str | None:
-		AppRelease = jingrow.qb.DocType("App Release")
-		AppSource = jingrow.qb.DocType("App Source")
+		AppRelease = jingrow.qb.PageType("App Release")
+		AppSource = jingrow.qb.PageType("App Source")
 
 		branch = (
 			jingrow.qb.from_(AppRelease)
diff --git a/press/press/doctype/app_rename/app_rename.json b/press/press/doctype/app_rename/app_rename.json
index e2049ac0..0129db70 100644
--- a/press/press/doctype/app_rename/app_rename.json
+++ b/press/press/doctype/app_rename/app_rename.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-04-20 14:10:57.268298",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/app_source/app_source.json b/press/press/doctype/app_source/app_source.json
index a95a3660..5855b04b 100644
--- a/press/press/doctype/app_source/app_source.json
+++ b/press/press/doctype/app_source/app_source.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-01-28 20:07:40.451028",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -179,7 +179,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Error Log",
+   "link_pagetype": "Error Log",
    "link_fieldname": "reference_name"
   }
  ],
diff --git a/press/press/doctype/app_source/app_source.py b/press/press/doctype/app_source/app_source.py
index 13049633..4efbde17 100644
--- a/press/press/doctype/app_source/app_source.py
+++ b/press/press/doctype/app_source/app_source.py
@@ -13,13 +13,13 @@ from jingrow.model.document import Document
 from jingrow.model.naming import make_autoname
 
 from jcloude.api.github import get_access_token, get_auth_headers
-from jcloude.overrides import get_permission_query_conditions_for_doctype
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
 from jcloude.utils import get_current_team, log_error
 
 REQUIRED_APPS_PATTERN = re.compile(r"^\s*(?!#)\s*required_apps\s*=\s*\[(.*?)\]", re.DOTALL | re.MULTILINE)
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app_release.app_release import AppRelease
+	from jcloude.jcloude.pagetype.app_release.app_release import AppRelease
 
 
 class AppSource(Document):
@@ -31,8 +31,8 @@ class AppSource(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.app_source_version.app_source_version import AppSourceVersion
-		from jcloude.jcloude.doctype.required_apps.required_apps import RequiredApps
+		from jcloude.jcloude.pagetype.app_source_version.app_source_version import AppSourceVersion
+		from jcloude.jcloude.pagetype.required_apps.required_apps import RequiredApps
 
 		app: DF.Link
 		app_title: DF.Data
@@ -194,7 +194,7 @@ class AppSource(Document):
 	):
 		app_release: "AppRelease" = jingrow.get_pg(
 			{
-				"doctype": "App Release",
+				"pagetype": "App Release",
 				"app": self.app,
 				"source": self.name,
 				"hash": commit_hash,
@@ -297,7 +297,7 @@ def create_app_source(
 
 	app_source = jingrow.get_pg(
 		{
-			"doctype": "App Source",
+			"pagetype": "App Source",
 			"app": app,
 			"repository_url": repository_url,
 			"branch": branch,
@@ -312,7 +312,7 @@ def create_app_source(
 	return app_source
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("App Source")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("App Source")
 
 
 def get_timestamp_from_commit_info(commit_info: dict) -> str | None:
diff --git a/press/press/doctype/app_source/test_app_source.py b/press/press/doctype/app_source/test_app_source.py
index bb64de64..cb2be9c1 100644
--- a/press/press/doctype/app_source/test_app_source.py
+++ b/press/press/doctype/app_source/test_app_source.py
@@ -8,13 +8,13 @@ from unittest.mock import Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.app_release.test_app_release import create_test_app_release
-from jcloude.jcloude.doctype.app_source.app_source import AppSource
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.app_release.test_app_release import create_test_app_release
+from jcloude.jcloude.pagetype.app_source.app_source import AppSource
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 from jcloude.utils import get_current_team
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app.app import App
+	from jcloude.jcloude.pagetype.app.app import App
 
 
 @patch.object(AppSource, "create_release", create_test_app_release)
@@ -38,7 +38,7 @@ def create_test_app_source(
 
 class TestAppSource(FrappeTestCase):
 	def create_app(self, name: str, title: str):
-		app: App = jingrow.get_pg({"doctype": "App", "name": name, "title": title})
+		app: App = jingrow.get_pg({"pagetype": "App", "name": name, "title": title})
 		app.insert(ignore_if_duplicate=True)
 		return app
 
diff --git a/press/press/doctype/app_source_version/app_source_version.json b/press/press/doctype/app_source_version/app_source_version.json
index 7fe37ad5..42d26b8a 100644
--- a/press/press/doctype/app_source_version/app_source_version.json
+++ b/press/press/doctype/app_source_version/app_source_version.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-12-01 09:22:53.614702",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/app_tag/app_tag.json b/press/press/doctype/app_tag/app_tag.json
index 7013b633..5a070bf2 100644
--- a/press/press/doctype/app_tag/app_tag.json
+++ b/press/press/doctype/app_tag/app_tag.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-06-04 19:57:08.666628",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/audit_log/audit_log.json b/press/press/doctype/audit_log/audit_log.json
index f6259c18..30e264b4 100644
--- a/press/press/doctype/audit_log/audit_log.json
+++ b/press/press/doctype/audit_log/audit_log.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-03-16 18:37:18.284146",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/audit_log/audit_log.py b/press/press/doctype/audit_log/audit_log.py
index 70b68a28..d0b97e8e 100644
--- a/press/press/doctype/audit_log/audit_log.py
+++ b/press/press/doctype/audit_log/audit_log.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 
 
 class AuditLog(Document):
diff --git a/press/press/doctype/auto_scale_record/auto_scale_record.json b/press/press/doctype/auto_scale_record/auto_scale_record.json
index 23b48839..6dedeaaa 100644
--- a/press/press/doctype/auto_scale_record/auto_scale_record.json
+++ b/press/press/doctype/auto_scale_record/auto_scale_record.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-10-23 10:27:46.053961",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "server_section",
@@ -109,7 +109,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Jcloude Notification",
+   "link_pagetype": "Jcloude Notification",
    "link_fieldname": "document_name"
   }
  ],
diff --git a/press/press/doctype/auto_scale_record/auto_scale_record.py b/press/press/doctype/auto_scale_record/auto_scale_record.py
index 6e594035..9ab28346 100644
--- a/press/press/doctype/auto_scale_record/auto_scale_record.py
+++ b/press/press/doctype/auto_scale_record/auto_scale_record.py
@@ -14,14 +14,14 @@ from requests.exceptions import ConnectionError, HTTPError, JSONDecodeError
 
 from jcloude.agent import Agent
 from jcloude.api.client import dashboard_whitelist
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
 from jcloude.runner import Ansible, Status, StepHandler
 from jcloude.utils import log_error
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.prometheus_alert_rule.prometheus_alert_rule import PrometheusAlertRule
-	from jcloude.jcloude.doctype.server.server import Server
-	from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+	from jcloude.jcloude.pagetype.prometheus_alert_rule.prometheus_alert_rule import PrometheusAlertRule
+	from jcloude.jcloude.pagetype.server.server import Server
+	from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 
 
 class PrometheusAlertRuleRow(TypedDict):
@@ -33,10 +33,10 @@ class AutoScaleStepFailureHandler:
 		team = jingrow.db.get_value("Server", self.primary_server, "team")
 		jcloude_notification = jingrow.get_pg(
 			{
-				"doctype": "Jcloude Notification",
+				"pagetype": "Jcloude Notification",
 				"team": team,
 				"type": "Auto Scale",
-				"document_type": self.doctype,
+				"document_type": self.pagetype,
 				"document_name": self.name,
 				"class": "Error",
 				"traceback": jingrow.get_traceback(with_context=False),
@@ -56,7 +56,7 @@ class AutoScaleRecord(Document, AutoScaleStepFailureHandler, StepHandler):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.scale_step.scale_step import ScaleStep
+		from jcloude.jcloude.pagetype.scale_step.scale_step import ScaleStep
 
 		action: DF.Literal["Scale Up", "Scale Down"]
 		duration: DF.Time | None
@@ -83,7 +83,7 @@ class AutoScaleRecord(Document, AutoScaleStepFailureHandler, StepHandler):
 	@staticmethod
 	def get_list_query(query, filters: dict[str, str] | None = None, **args):
 		"""Fetch the secondary server from the primary server pg"""
-		AutoScaleRecord = jingrow.qb.DocType("Auto Scale Record")
+		AutoScaleRecord = jingrow.qb.PageType("Auto Scale Record")
 		secondary_server = jingrow.db.get_value(
 			"Server", filters.get("primary_server", None) if filters else None, "secondary_server"
 		)
@@ -279,7 +279,7 @@ class AutoScaleRecord(Document, AutoScaleStepFailureHandler, StepHandler):
 				"password": settings.docker_registry_password,
 			},
 			restart_benches=True,
-			reference_doctype="Server",
+			reference_pagetype="Server",
 			reference_name=self.secondary_server,
 		)
 
@@ -308,7 +308,7 @@ class AutoScaleRecord(Document, AutoScaleStepFailureHandler, StepHandler):
 	def remove_redis_localhost_bind(self, step: "ScaleStep"):
 		"""Expose Redis Of Primary Server"""
 		agent_job = Agent(self.primary_server).remove_redis_localhost_bind(
-			reference_doctype="Server", reference_name=self.primary_server
+			reference_pagetype="Server", reference_name=self.primary_server
 		)
 
 		step.status = Status.Success
@@ -420,7 +420,7 @@ class AutoScaleRecord(Document, AutoScaleStepFailureHandler, StepHandler):
 			is_primary=True,
 			directory=shared_directory,
 			restart_benches=False,
-			reference_doctype="Server",
+			reference_pagetype="Server",
 			reference_name=self.primary_server,
 		)
 
@@ -515,7 +515,7 @@ class AutoScaleRecord(Document, AutoScaleStepFailureHandler, StepHandler):
 		)
 
 		usage_record = jingrow.get_pg(
-			doctype="Usage Record",
+			pagetype="Usage Record",
 			team=secondary_server_team,
 			document_type="Server",
 			document_name=self.secondary_server,
@@ -615,7 +615,7 @@ class AutoScaleRecord(Document, AutoScaleStepFailureHandler, StepHandler):
 
 	def execute_scale_steps(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_execute_steps",
 			steps=self.scale_steps,
@@ -637,7 +637,7 @@ class AutoScaleRecord(Document, AutoScaleStepFailureHandler, StepHandler):
 def create_autoscale_failure_notification(team: str, name: str, exc: str):
 	jcloude_notification = jingrow.get_pg(
 		{
-			"doctype": "Jcloude Notification",
+			"pagetype": "Jcloude Notification",
 			"team": team,
 			"type": "Auto Scale",
 			"document_type": "Auto Scale Record",
@@ -653,7 +653,7 @@ def create_autoscale_failure_notification(team: str, name: str, exc: str):
 def _is_scale_up_colliding_with_a_existing_scaling_window(
 	primary_server: str, scale_up_time: datetime.datetime
 ):
-	AutoScaleRecord = jingrow.qb.DocType("Auto Scale Record")
+	AutoScaleRecord = jingrow.qb.PageType("Auto Scale Record")
 
 	last_scale_up = (
 		jingrow.qb.from_(AutoScaleRecord)
@@ -691,7 +691,7 @@ def _is_scale_up_colliding_with_a_existing_scaling_window(
 def _is_scale_down_colliding_with_a_existing_scaling_window(
 	primary_server: str, scale_down_time: datetime.datetime
 ):
-	AutoScaleRecord = jingrow.qb.DocType("Auto Scale Record")
+	AutoScaleRecord = jingrow.qb.PageType("Auto Scale Record")
 
 	next_scale_down = (
 		jingrow.qb.from_(AutoScaleRecord)
@@ -939,7 +939,7 @@ def create_prometheus_rule_for_scaling(
 	else:
 		pg = jingrow.get_pg(
 			{
-				"doctype": "Prometheus Alert Rule",
+				"pagetype": "Prometheus Alert Rule",
 				"name": rule_name,
 				"description": f"Autoscale trigger for {instance_name}",
 				"expression": query_with_threshold,
diff --git a/press/press/doctype/auto_scale_record/test_auto_scale_record.py b/press/press/doctype/auto_scale_record/test_auto_scale_record.py
index cde53556..51127148 100644
--- a/press/press/doctype/auto_scale_record/test_auto_scale_record.py
+++ b/press/press/doctype/auto_scale_record/test_auto_scale_record.py
@@ -9,14 +9,14 @@ from unittest.mock import Mock, patch
 import jingrow
 
 from jcloude.api.server import schedule_auto_scale
-from jcloude.jcloude.doctype.auto_scale_record.auto_scale_record import (
+from jcloude.jcloude.pagetype.auto_scale_record.auto_scale_record import (
 	AutoScaleRecord,
 	is_secondary_ready_for_scale_down,
 )
-from jcloude.jcloude.doctype.prometheus_alert_rule.prometheus_alert_rule import (
+from jcloude.jcloude.pagetype.prometheus_alert_rule.prometheus_alert_rule import (
 	PrometheusAlertRule,
 )
-from jcloude.jcloude.doctype.server.test_server import create_test_server
+from jcloude.jcloude.pagetype.server.test_server import create_test_server
 
 
 def mimic_memory_usage(is_high: bool = False):
diff --git a/press/press/doctype/auto_scale_trigger/auto_scale_trigger.json b/press/press/doctype/auto_scale_trigger/auto_scale_trigger.json
index 9cc8b1cf..f6ef6765 100644
--- a/press/press/doctype/auto_scale_trigger/auto_scale_trigger.json
+++ b/press/press/doctype/auto_scale_trigger/auto_scale_trigger.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-10-23 10:36:12.939955",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.json b/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.json
index 0d79c868..4cbb809c 100644
--- a/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.json
+++ b/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2024-09-12 13:04:04.454139",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "savings_plan_type",
diff --git a/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py b/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py
index ac1cfedd..97891d26 100644
--- a/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py
+++ b/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py
@@ -8,7 +8,7 @@ import jingrow.utils
 from jingrow.model.document import Document
 from jingrow.utils import cint, flt
 
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 from jcloude.utils import log_error
 
 AWS_HOURS_IN_A_MONTH = 730
@@ -123,7 +123,7 @@ ROI Percentage: {cint(self.roi_percentage)} %"""
 
 	def validate_duplicate(self):
 		if jingrow.db.exists(
-			self.doctype,
+			self.pagetype,
 			{
 				"generated_at": self.generated_at,
 			},
diff --git a/press/press/doctype/backup_bucket/backup_bucket.json b/press/press/doctype/backup_bucket/backup_bucket.json
index e6486373..9f93f803 100644
--- a/press/press/doctype/backup_bucket/backup_bucket.json
+++ b/press/press/doctype/backup_bucket/backup_bucket.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "field:bucket_name",
  "creation": "2022-11-21 22:28:38.259329",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/backup_restoration_test/backup_restoration_test.json b/press/press/doctype/backup_restoration_test/backup_restoration_test.json
index 9e54f133..d9d9922d 100644
--- a/press/press/doctype/backup_restoration_test/backup_restoration_test.json
+++ b/press/press/doctype/backup_restoration_test/backup_restoration_test.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format:BRT-{DD}-{MM}-{YYYY}-{###}",
  "creation": "2022-07-25 12:02:28.181011",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/backup_restoration_test/backup_restoration_test.py b/press/press/doctype/backup_restoration_test/backup_restoration_test.py
index dcaa6a28..ce80a716 100644
--- a/press/press/doctype/backup_restoration_test/backup_restoration_test.py
+++ b/press/press/doctype/backup_restoration_test/backup_restoration_test.py
@@ -5,7 +5,7 @@ import jingrow
 from jingrow.model.document import Document
 
 from jcloude.api.site import _new
-from jcloude.jcloude.doctype.site.site import prepare_site
+from jcloude.jcloude.pagetype.site.site import prepare_site
 
 
 class BackupRestorationTest(Document):
diff --git a/press/press/doctype/backup_restoration_test/backup_test.py b/press/press/doctype/backup_restoration_test/backup_test.py
index 58d16c60..f6f28087 100644
--- a/press/press/doctype/backup_restoration_test/backup_test.py
+++ b/press/press/doctype/backup_restoration_test/backup_test.py
@@ -11,7 +11,7 @@ import jingrow
 from jcloude.jcloude.audit import get_benches_in_server
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.site_backup.site_backup import SiteBackup
+	from jcloude.jcloude.pagetype.site_backup.site_backup import SiteBackup
 
 BATCH_SIZE = 50
 BACKUP_SIZE_LIMIT = 2 * 1024 * 1024 * 1024  # 2 GB
@@ -64,7 +64,7 @@ class BackupTest:
 			try:
 				jingrow.get_pg(
 					{
-						"doctype": "Backup Restoration Test",
+						"pagetype": "Backup Restoration Test",
 						"date": jingrow.utils.now_datetime(),
 						"site": site,
 						"status": "Running",
diff --git a/press/press/doctype/balance_transaction/balance_transaction.json b/press/press/doctype/balance_transaction/balance_transaction.json
index 2fb2eaef..fe436b17 100644
--- a/press/press/doctype/balance_transaction/balance_transaction.json
+++ b/press/press/doctype/balance_transaction/balance_transaction.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "BT-.YYYY.-.#####",
  "creation": "2020-10-21 22:08:02.694042",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/balance_transaction/balance_transaction.py b/press/press/doctype/balance_transaction/balance_transaction.py
index 64abf82e..780a1c00 100644
--- a/press/press/doctype/balance_transaction/balance_transaction.py
+++ b/press/press/doctype/balance_transaction/balance_transaction.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.overrides import get_permission_query_conditions_for_doctype
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
 
 
 class BalanceTransaction(Document):
@@ -17,7 +17,7 @@ class BalanceTransaction(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.balance_transaction_allocation.balance_transaction_allocation import (
+		from jcloude.jcloude.pagetype.balance_transaction_allocation.balance_transaction_allocation import (
 			BalanceTransactionAllocation,
 		)
 
@@ -137,4 +137,4 @@ class BalanceTransaction(Document):
 			)
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Balance Transaction")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Balance Transaction")
diff --git a/press/press/doctype/balance_transaction/test_balance_transaction.py b/press/press/doctype/balance_transaction/test_balance_transaction.py
index a186eb20..4fba43a3 100644
--- a/press/press/doctype/balance_transaction/test_balance_transaction.py
+++ b/press/press/doctype/balance_transaction/test_balance_transaction.py
@@ -5,7 +5,7 @@
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 
 class TestBalanceTransaction(FrappeTestCase):
diff --git a/press/press/doctype/balance_transaction_allocation/balance_transaction_allocation.json b/press/press/doctype/balance_transaction_allocation/balance_transaction_allocation.json
index 65b091fc..700fe93a 100644
--- a/press/press/doctype/balance_transaction_allocation/balance_transaction_allocation.json
+++ b/press/press/doctype/balance_transaction_allocation/balance_transaction_allocation.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-11-12 21:24:19.153533",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/bastion_server/bastion_server.json b/press/press/doctype/bastion_server/bastion_server.json
index d81240db..e2ad123f 100644
--- a/press/press/doctype/bastion_server/bastion_server.json
+++ b/press/press/doctype/bastion_server/bastion_server.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-09-24 11:40:34.007344",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "status",
diff --git a/press/press/doctype/bastion_server/test_bastion_server.py b/press/press/doctype/bastion_server/test_bastion_server.py
index fa02b034..7177f01e 100644
--- a/press/press/doctype/bastion_server/test_bastion_server.py
+++ b/press/press/doctype/bastion_server/test_bastion_server.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/bench/bench.json b/press/press/doctype/bench/bench.json
index 49816021..621082d9 100644
--- a/press/press/doctype/bench/bench.json
+++ b/press/press/doctype/bench/bench.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2022-02-08 15:13:45.929287",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/bench/bench.py b/press/press/doctype/bench/bench.py
index fd24eb36..1bc8b6bf 100644
--- a/press/press/doctype/bench/bench.py
+++ b/press/press/doctype/bench/bench.py
@@ -20,12 +20,12 @@ from jcloude.agent import Agent
 from jcloude.api.client import dashboard_whitelist
 from jcloude.api.server import usage
 from jcloude.exceptions import ArchiveBenchError
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.bench_shell_log.bench_shell_log import (
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.bench_shell_log.bench_shell_log import (
 	ExecuteResult,
 	create_bench_shell_log,
 )
-from jcloude.jcloude.doctype.site.site import Site
+from jcloude.jcloude.pagetype.site.site import Site
 from jcloude.runner import Ansible
 from jcloude.utils import (
 	SupervisorProcess,
@@ -56,13 +56,13 @@ MIN_BACKGROUND_WORKERS = 1
 if TYPE_CHECKING:
 	from collections.abc import Generator, Iterable
 
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.app_source.app_source import AppSource
-	from jcloude.jcloude.doctype.bench_update.bench_update import BenchUpdate
-	from jcloude.jcloude.doctype.bench_update_app.bench_update_app import BenchUpdateApp
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-	from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
-	from jcloude.jcloude.doctype.jcloude_settings.jcloude_settings import PressSettings
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.app_source.app_source import AppSource
+	from jcloude.jcloude.pagetype.bench_update.bench_update import BenchUpdate
+	from jcloude.jcloude.pagetype.bench_update_app.bench_update_app import BenchUpdateApp
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+	from jcloude.jcloude.pagetype.jcloude_settings.jcloude_settings import PressSettings
 
 	SupervisorctlActions = Literal[
 		"start",
@@ -83,9 +83,9 @@ class Bench(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.bench_app.bench_app import BenchApp
-		from jcloude.jcloude.doctype.bench_mount.bench_mount import BenchMount
-		from jcloude.jcloude.doctype.bench_variable.bench_variable import BenchVariable
+		from jcloude.jcloude.pagetype.bench_app.bench_app import BenchApp
+		from jcloude.jcloude.pagetype.bench_mount.bench_mount import BenchMount
+		from jcloude.jcloude.pagetype.bench_variable.bench_variable import BenchVariable
 
 		apps: DF.Table[BenchApp]
 		auto_scale_workers: DF.Check
@@ -137,9 +137,9 @@ class Bench(Document):
 
 	@staticmethod
 	def get_list_query(query):
-		Bench = jingrow.qb.DocType("Bench")
-		Server = jingrow.qb.DocType("Server")
-		Site = jingrow.qb.DocType("Site")
+		Bench = jingrow.qb.PageType("Bench")
+		Server = jingrow.qb.PageType("Server")
+		Site = jingrow.qb.PageType("Site")
 
 		site_count = (
 			jingrow.qb.from_(Site)
@@ -397,7 +397,7 @@ class Bench(Document):
 	def correct_bench_permissions(self):
 		"""Give all permissions to jingrow:jingrow in (container:/home/jingrow)"""
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_correct_bench_permissions",
 			queue="long",
@@ -496,7 +496,7 @@ class Bench(Document):
 	@dashboard_whitelist()
 	def take_process_snapshot(self):
 		process_snapshot = jingrow.get_pg(
-			{"doctype": "Process Snapshot", "bench": self.name, "server": self.server}
+			{"pagetype": "Process Snapshot", "bench": self.name, "server": self.server}
 		)
 		process_snapshot.insert()
 		return process_snapshot.name
@@ -542,7 +542,7 @@ class Bench(Document):
 						"Site Sync Error",
 						site=site,
 						info=info,
-						reference_doctype="Bench",
+						reference_pagetype="Bench",
 						reference_name=self.name,
 					)
 					jingrow.db.rollback()
@@ -566,7 +566,7 @@ class Bench(Document):
 					"Site Analytics Sync Error",
 					site=site,
 					analytics=analytics,
-					reference_doctype="Bench",
+					reference_pagetype="Bench",
 					reference_name=self.name,
 				)
 				jingrow.db.rollback()
@@ -607,7 +607,7 @@ class Bench(Document):
 					"Site Users Sync Error",
 					site=site,
 					analytics=analytics,
-					reference_doctype="Bench",
+					reference_pagetype="Bench",
 					reference_name=self.name,
 				)
 				jingrow.db.rollback()
@@ -705,7 +705,7 @@ class Bench(Document):
 		for idx, site in enumerate(sites):
 			jingrow.get_pg(
 				{
-					"doctype": "Site Migration",
+					"pagetype": "Site Migration",
 					"site": site,
 					"destination_bench": destination_bench.name,
 					"scheduled_time": jingrow.utils.add_to_date(None, minutes=5 * idx),
@@ -1062,7 +1062,7 @@ class Bench(Document):
 
 	def check_ongoing_site_updates(self):
 		jingrow.db.commit()
-		site_updates = jingrow.qb.DocType("Site Update")
+		site_updates = jingrow.qb.PageType("Site Update")
 
 		ongoing_site_updates = (
 			jingrow.qb.from_(site_updates)
@@ -1156,7 +1156,7 @@ class StagingSite(Site):
 			log_error(title="Staging plan not set in settings")
 		super().__init__(
 			{
-				"doctype": "Site",
+				"pagetype": "Site",
 				"subdomain": make_autoname("staging-.########"),
 				"staging": True,
 				"bench": bench.name,
@@ -1227,7 +1227,7 @@ def process_new_bench_job_update(job):
 	StagingSite.create_if_needed(bench)
 	bench = Bench("Bench", job.bench)
 	jingrow.enqueue(
-		"jcloude.jcloude.doctype.bench.bench.archive_obsolete_benches",
+		"jcloude.jcloude.pagetype.bench.bench.archive_obsolete_benches",
 		enqueue_after_commit=True,
 		group=bench.group,
 		server=bench.server,
@@ -1296,8 +1296,8 @@ class BenchLike(jingrow._dict):
 
 def get_scheduled_version_upgrades(bench: BenchLike | Bench):
 	jingrow.db.commit()
-	sites = jingrow.qb.DocType("Site")
-	version_upgrades = jingrow.qb.DocType("Version Upgrade")
+	sites = jingrow.qb.PageType("Site")
+	version_upgrades = jingrow.qb.PageType("Version Upgrade")
 	return (
 		jingrow.qb.from_(sites)
 		.join(version_upgrades)
@@ -1333,7 +1333,7 @@ def try_archive(bench: str):
 		log_error(
 			"Bench Archival Error",
 			bench=bench,
-			reference_doctype="Bench",
+			reference_pagetype="Bench",
 			reference_name=bench,
 		)
 		jingrow.db.rollback()
@@ -1365,7 +1365,7 @@ def archive_obsolete_benches(group: str | None = None, server: str | None = None
 	benches_by_server = groupby(benches, lambda x: x.server)
 	for server_benches in benches_by_server:
 		jingrow.enqueue(
-			"jcloude.jcloude.doctype.bench.bench.archive_obsolete_benches_for_server",
+			"jcloude.jcloude.pagetype.bench.bench.archive_obsolete_benches_for_server",
 			queue="long",
 			job_id=f"archive_obsolete_benches:{server_benches[0]}",
 			deduplicate=True,
@@ -1414,7 +1414,7 @@ def sync_benches():
 	benches = jingrow.get_all("Bench", {"status": "Active"}, pluck="name")
 	for bench in benches:
 		jingrow.enqueue(
-			"jcloude.jcloude.doctype.bench.bench.sync_bench",
+			"jcloude.jcloude.pagetype.bench.bench.sync_bench",
 			queue="sync",
 			name=bench,
 			job_id=f"sync_bench:{bench}",
@@ -1446,7 +1446,7 @@ def sync_bench(name):
 		log_error(
 			"Bench Sync Error",
 			bench=bench.name,
-			reference_doctype="Bench",
+			reference_pagetype="Bench",
 			reference_name=bench.name,
 		)
 		jingrow.db.rollback()
@@ -1456,7 +1456,7 @@ def sync_analytics():
 	benches = jingrow.get_all("Bench", {"status": "Active"}, pluck="name")
 	for bench in benches:
 		jingrow.enqueue(
-			"jcloude.jcloude.doctype.bench.bench.sync_bench_analytics",
+			"jcloude.jcloude.pagetype.bench.bench.sync_bench_analytics",
 			queue="sync",
 			name=bench,
 			job_id=f"sync_bench_analytics:{bench}",
@@ -1478,7 +1478,7 @@ def sync_bench_analytics(name):
 		log_error(
 			"Bench Analytics Sync Error",
 			bench=bench.name,
-			reference_doctype="Bench",
+			reference_pagetype="Bench",
 			reference_name=bench.name,
 		)
 		jingrow.db.rollback()
@@ -1538,4 +1538,4 @@ def group_supervisor_processes(processes: list[SupervisorProcess]):
 	return status_grouped
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Bench")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Bench")
diff --git a/press/press/doctype/bench/test_bench.py b/press/press/doctype/bench/test_bench.py
index 2d3a3fb3..af982486 100644
--- a/press/press/doctype/bench/test_bench.py
+++ b/press/press/doctype/bench/test_bench.py
@@ -13,12 +13,12 @@ from jingrow.tests.utils import FrappeTestCase
 
 from jcloude.agent import Agent
 from jcloude.exceptions import ArchiveBenchError
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob, poll_pending_jobs
-from jcloude.jcloude.doctype.agent_job.test_agent_job import fake_agent_job
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.app_release.test_app_release import create_test_app_release
-from jcloude.jcloude.doctype.app_source.test_app_source import create_test_app_source
-from jcloude.jcloude.doctype.bench.bench import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob, poll_pending_jobs
+from jcloude.jcloude.pagetype.agent_job.test_agent_job import fake_agent_job
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.app_release.test_app_release import create_test_app_release
+from jcloude.jcloude.pagetype.app_source.test_app_source import create_test_app_source
+from jcloude.jcloude.pagetype.bench.bench import (
 	EMPTY_BENCH_COURTESY_DAYS,
 	MAX_BACKGROUND_WORKERS,
 	MAX_GUNICORN_WORKERS,
@@ -27,32 +27,32 @@ from jcloude.jcloude.doctype.bench.bench import (
 	archive_obsolete_benches,
 	archive_obsolete_benches_for_server,
 )
-from jcloude.jcloude.doctype.deploy_candidate_difference.test_deploy_candidate_difference import (
+from jcloude.jcloude.pagetype.deploy_candidate_difference.test_deploy_candidate_difference import (
 	create_test_deploy_candidate_differences,
 )
-from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.server.server import Server, scale_workers
-from jcloude.jcloude.doctype.site.test_site import create_test_bench, create_test_site
-from jcloude.jcloude.doctype.site_plan.test_site_plan import create_test_plan
-from jcloude.jcloude.doctype.site_update.test_site_update import create_test_site_update
-from jcloude.jcloude.doctype.subscription.test_subscription import create_test_subscription
-from jcloude.jcloude.doctype.version_upgrade.test_version_upgrade import (
+from jcloude.jcloude.pagetype.server.server import Server, scale_workers
+from jcloude.jcloude.pagetype.site.test_site import create_test_bench, create_test_site
+from jcloude.jcloude.pagetype.site_plan.test_site_plan import create_test_plan
+from jcloude.jcloude.pagetype.site_update.test_site_update import create_test_site_update
+from jcloude.jcloude.pagetype.subscription.test_subscription import create_test_subscription
+from jcloude.jcloude.pagetype.version_upgrade.test_version_upgrade import (
 	create_test_version_upgrade,
 )
 from jcloude.utils import get_current_team
 from jcloude.utils.test import foreground_enqueue, foreground_enqueue_pg
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.jcloude_settings.jcloude_settings import PressSettings
-	from jcloude.jcloude.doctype.team.team import Team
+	from jcloude.jcloude.pagetype.jcloude_settings.jcloude_settings import PressSettings
+	from jcloude.jcloude.pagetype.team.team import Team
 
 
 @patch.object(AgentJob, "enqueue_http_request", new=Mock())
-@patch("jcloude.jcloude.doctype.bench.bench.jingrow.db.commit", new=MagicMock)
-@patch("jcloude.jcloude.doctype.server.server.jingrow.db.commit", new=MagicMock)
+@patch("jcloude.jcloude.pagetype.bench.bench.jingrow.db.commit", new=MagicMock)
+@patch("jcloude.jcloude.pagetype.server.server.jingrow.db.commit", new=MagicMock)
 @patch("jcloude.api.bench.jingrow.db.commit", new=MagicMock)
 class TestStagingSite(FrappeTestCase):
 	def tearDown(self):
@@ -71,9 +71,9 @@ class TestStagingSite(FrappeTestCase):
 
 
 @patch.object(AgentJob, "after_insert", new=Mock())
-@patch("jcloude.jcloude.doctype.server.server.jingrow.enqueue_pg", new=foreground_enqueue_pg)
-@patch("jcloude.jcloude.doctype.server.server.jingrow.db.commit", new=MagicMock)
-@patch("jcloude.jcloude.doctype.bench.bench.jingrow.db.commit", new=MagicMock)
+@patch("jcloude.jcloude.pagetype.server.server.jingrow.enqueue_pg", new=foreground_enqueue_pg)
+@patch("jcloude.jcloude.pagetype.server.server.jingrow.db.commit", new=MagicMock)
+@patch("jcloude.jcloude.pagetype.bench.bench.jingrow.db.commit", new=MagicMock)
 @patch("jcloude.api.bench.jingrow.db.commit", new=MagicMock)
 class TestBench(FrappeTestCase):
 	def tearDown(self):
@@ -359,7 +359,7 @@ class TestBench(FrappeTestCase):
 		self.assertFalse(bench2.memory_max)
 		self.assertFalse(bench2.memory_swap)
 
-	@patch("jcloude.jcloude.doctype.team.team.jingrow.enqueue_pg", new=foreground_enqueue_pg)
+	@patch("jcloude.jcloude.pagetype.team.team.jingrow.enqueue_pg", new=foreground_enqueue_pg)
 	def test_workers_reallocated_on_site_unsuspend(self):
 		bench1 = self._create_bench_with_n_sites_with_cpu_time(3, 5)  # current team
 		bench2 = self._create_bench_with_n_sites_with_cpu_time(3, 5)
@@ -388,8 +388,8 @@ class TestBench(FrappeTestCase):
 		self.assertGreater(bench2.gunicorn_workers, 2)
 
 
-@patch("jcloude.jcloude.doctype.bench.bench.jingrow.db.commit", new=MagicMock)
-@patch("jcloude.jcloude.doctype.server.server.jingrow.db.commit", new=MagicMock)
+@patch("jcloude.jcloude.pagetype.bench.bench.jingrow.db.commit", new=MagicMock)
+@patch("jcloude.jcloude.pagetype.server.server.jingrow.db.commit", new=MagicMock)
 @patch("jcloude.api.bench.jingrow.db.commit", new=MagicMock)
 class TestArchiveObsoleteBenches(FrappeTestCase):
 	def tearDown(self):
@@ -472,7 +472,7 @@ class TestArchiveObsoleteBenches(FrappeTestCase):
 		benches_after = jingrow.db.count("Bench", {"status": "Active"})
 		self.assertEqual(benches_after, benches_before)
 
-	@patch("jcloude.jcloude.doctype.bench.bench.jingrow.enqueue", new=foreground_enqueue)
+	@patch("jcloude.jcloude.pagetype.bench.bench.jingrow.enqueue", new=foreground_enqueue)
 	def test_if_fatal_site_update_with_source_bench_blocks_archival(self):
 		version = "Version 15"
 		app = create_test_app()
@@ -517,10 +517,10 @@ class TestArchiveObsoleteBenches(FrappeTestCase):
 		self.assertEqual(benches_after, benches_before - 1)
 
 	@patch(
-		"jcloude.jcloude.doctype.bench.bench.archive_obsolete_benches_for_server",
+		"jcloude.jcloude.pagetype.bench.bench.archive_obsolete_benches_for_server",
 		wraps=archive_obsolete_benches_for_server,
 	)
-	@patch("jcloude.jcloude.doctype.bench.bench.jingrow.enqueue", new=foreground_enqueue)
+	@patch("jcloude.jcloude.pagetype.bench.bench.jingrow.enqueue", new=foreground_enqueue)
 	def test_benches_archived_for_multiple_servers_via_multiple_jobs(self, mock_archive_by_server: MagicMock):
 		with fake_agent_job("New Bench", "Success"):
 			priv_group = create_test_release_group(apps=[create_test_app()], public=False)
@@ -563,7 +563,7 @@ class TestArchiveObsoleteBenches(FrappeTestCase):
 		bench.reload()
 		self.assertEqual(bench.status, "Pending")
 
-	@patch("jcloude.jcloude.doctype.bench.bench.jingrow.enqueue", new=foreground_enqueue)
+	@patch("jcloude.jcloude.pagetype.bench.bench.jingrow.enqueue", new=foreground_enqueue)
 	def test_check_for_any_unarchived_sites_on_bench(self):
 		with fake_agent_job("New Bench", "Success"):
 			priv_group = create_test_release_group(apps=[create_test_app()], public=False)
diff --git a/press/press/doctype/bench_app/bench_app.json b/press/press/doctype/bench_app/bench_app.json
index 3b67c0bb..abba0377 100644
--- a/press/press/doctype/bench_app/bench_app.json
+++ b/press/press/doctype/bench_app/bench_app.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2019-12-09 15:15:36.057080",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "app",
diff --git a/press/press/doctype/bench_app/bench_app.py b/press/press/doctype/bench_app/bench_app.py
index b26bb628..2326fb1c 100644
--- a/press/press/doctype/bench_app/bench_app.py
+++ b/press/press/doctype/bench_app/bench_app.py
@@ -29,10 +29,10 @@ class BenchApp(Document):
 		if not filters or not (parent := filters.get("parent")):
 			return query
 
-		AppSource = jingrow.qb.DocType("App Source")
-		AppRelease = jingrow.qb.DocType("App Release")
-		Bench = jingrow.qb.DocType("Bench")
-		BenchApp = jingrow.qb.DocType("Bench App")
+		AppSource = jingrow.qb.PageType("App Source")
+		AppRelease = jingrow.qb.PageType("App Release")
+		Bench = jingrow.qb.PageType("Bench")
+		BenchApp = jingrow.qb.PageType("Bench App")
 
 		q = (
 			jingrow.qb.from_(BenchApp)
diff --git a/press/press/doctype/bench_dependency/bench_dependency.json b/press/press/doctype/bench_dependency/bench_dependency.json
index cb99da89..13f366bf 100644
--- a/press/press/doctype/bench_dependency/bench_dependency.json
+++ b/press/press/doctype/bench_dependency/bench_dependency.json
@@ -4,7 +4,7 @@
  "autoname": "prompt",
  "creation": "2023-09-26 12:24:30.572783",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/bench_dependency/bench_dependency.py b/press/press/doctype/bench_dependency/bench_dependency.py
index f8a03704..9d158524 100644
--- a/press/press/doctype/bench_dependency/bench_dependency.py
+++ b/press/press/doctype/bench_dependency/bench_dependency.py
@@ -14,7 +14,7 @@ class BenchDependency(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.bench_dependency_version.bench_dependency_version import (
+		from jcloude.jcloude.pagetype.bench_dependency_version.bench_dependency_version import (
 			BenchDependencyVersion,
 		)
 
diff --git a/press/press/doctype/bench_dependency_version/bench_dependency_version.json b/press/press/doctype/bench_dependency_version/bench_dependency_version.json
index 1cfd0cb2..70f31775 100644
--- a/press/press/doctype/bench_dependency_version/bench_dependency_version.json
+++ b/press/press/doctype/bench_dependency_version/bench_dependency_version.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2023-09-26 12:22:19.339438",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/bench_get_app_cache/bench_get_app_cache.json b/press/press/doctype/bench_get_app_cache/bench_get_app_cache.json
index c475b3bf..745b1717 100644
--- a/press/press/doctype/bench_get_app_cache/bench_get_app_cache.json
+++ b/press/press/doctype/bench_get_app_cache/bench_get_app_cache.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2024-02-01 16:42:30.143539",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/bench_get_app_cache/bench_get_app_cache.py b/press/press/doctype/bench_get_app_cache/bench_get_app_cache.py
index b5e04eb0..da713fa6 100644
--- a/press/press/doctype/bench_get_app_cache/bench_get_app_cache.py
+++ b/press/press/doctype/bench_get_app_cache/bench_get_app_cache.py
@@ -6,7 +6,7 @@ from datetime import datetime
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.deploy_candidate.cache_utils import run_command_in_docker_cache
+from jcloude.jcloude.pagetype.deploy_candidate.cache_utils import run_command_in_docker_cache
 from jcloude.utils import ttl_cache
 
 
diff --git a/press/press/doctype/bench_mount/bench_mount.json b/press/press/doctype/bench_mount/bench_mount.json
index e202dea6..a7282f55 100644
--- a/press/press/doctype/bench_mount/bench_mount.json
+++ b/press/press/doctype/bench_mount/bench_mount.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2023-12-13 15:05:23.962806",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "is_absolute_path",
diff --git a/press/press/doctype/bench_shell/bench_shell.js b/press/press/doctype/bench_shell/bench_shell.js
index fed66ab7..26a90320 100644
--- a/press/press/doctype/bench_shell/bench_shell.js
+++ b/press/press/doctype/bench_shell/bench_shell.js
@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 // Most of the code here imitates the code from
-// jingrow/app/doctype/system_console/system_console.js
+// jingrow/app/pagetype/system_console/system_console.js
 jingrow.ui.form.on('Bench Shell', {
 	onload(frm) {
 		jingrow.ui.keys.add_shortcut({
diff --git a/press/press/doctype/bench_shell/bench_shell.json b/press/press/doctype/bench_shell/bench_shell.json
index 4b7f2125..9945266b 100644
--- a/press/press/doctype/bench_shell/bench_shell.json
+++ b/press/press/doctype/bench_shell/bench_shell.json
@@ -6,14 +6,14 @@
    "label": "Bench Shell Logs"
   },
   {
-   "action": "jcloude.jcloude.doctype.bench_shell.bench_shell.run_command",
+   "action": "jcloude.jcloude.pagetype.bench_shell.bench_shell.run_command",
    "action_type": "Server Action",
    "hidden": 1,
    "label": "Run"
   }
  ],
  "creation": "2024-03-21 10:17:17.616121",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "section_break_grqb",
diff --git a/press/press/doctype/bench_shell/bench_shell.py b/press/press/doctype/bench_shell/bench_shell.py
index e723dcc5..508afbcf 100644
--- a/press/press/doctype/bench_shell/bench_shell.py
+++ b/press/press/doctype/bench_shell/bench_shell.py
@@ -8,7 +8,7 @@ import jingrow
 from jingrow.model.document import Document
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.bench.bench import Bench
+	from jcloude.jcloude.pagetype.bench.bench import Bench
 
 
 class BenchShell(Document):
diff --git a/press/press/doctype/bench_shell_log/bench_shell_log.json b/press/press/doctype/bench_shell_log/bench_shell_log.json
index ba3cfbb0..75bb0fb2 100644
--- a/press/press/doctype/bench_shell_log/bench_shell_log.json
+++ b/press/press/doctype/bench_shell_log/bench_shell_log.json
@@ -2,7 +2,7 @@
 	"actions": [],
 	"allow_rename": 1,
 	"creation": "2024-03-19 13:34:04.955886",
-	"doctype": "DocType",
+	"pagetype": "PageType",
 	"engine": "InnoDB",
 	"field_order": [
 		"command",
diff --git a/press/press/doctype/bench_shell_log/bench_shell_log.py b/press/press/doctype/bench_shell_log/bench_shell_log.py
index 9de0155b..077aa7e3 100644
--- a/press/press/doctype/bench_shell_log/bench_shell_log.py
+++ b/press/press/doctype/bench_shell_log/bench_shell_log.py
@@ -54,7 +54,7 @@ def create_bench_shell_log(
 	save_output: bool,
 ) -> None:
 	pg_dict = {
-		"doctype": "Bench Shell Log",
+		"pagetype": "Bench Shell Log",
 		"cmd": cmd,
 		"bench": bench,
 		"subdir": subdir,
diff --git a/press/press/doctype/bench_site_update/bench_site_update.json b/press/press/doctype/bench_site_update/bench_site_update.json
index bec164a9..ddd65191 100644
--- a/press/press/doctype/bench_site_update/bench_site_update.json
+++ b/press/press/doctype/bench_site_update/bench_site_update.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-06-16 18:26:31.546918",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/bench_update/bench_update.json b/press/press/doctype/bench_update/bench_update.json
index 80c3fb3b..9c7e5337 100644
--- a/press/press/doctype/bench_update/bench_update.json
+++ b/press/press/doctype/bench_update/bench_update.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-06-16 18:29:22.245007",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/bench_update/bench_update.py b/press/press/doctype/bench_update/bench_update.py
index 31beb13f..cac2ab81 100644
--- a/press/press/doctype/bench_update/bench_update.py
+++ b/press/press/doctype/bench_update/bench_update.py
@@ -11,8 +11,8 @@ from jingrow.model.document import Document
 from jcloude.utils import get_current_team
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.bench.bench import Bench
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.bench.bench import Bench
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
 
 
 class BenchUpdate(Document):
@@ -24,9 +24,9 @@ class BenchUpdate(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.bench_site_update.bench_site_update import BenchSiteUpdate
-		from jcloude.jcloude.doctype.bench_update_app.bench_update_app import BenchUpdateApp
-		from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
+		from jcloude.jcloude.pagetype.bench_site_update.bench_site_update import BenchSiteUpdate
+		from jcloude.jcloude.pagetype.bench_update_app.bench_update_app import BenchUpdateApp
+		from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
 
 		apps: DF.Table[BenchUpdateApp]
 		bench: DF.Link | None
@@ -171,7 +171,7 @@ def get_bench_update(
 
 	bench_update: "BenchUpdate" = jingrow.get_pg(
 		{
-			"doctype": "Bench Update",
+			"pagetype": "Bench Update",
 			"group": name,
 			"apps": apps,
 			"sites": [
diff --git a/press/press/doctype/bench_update_app/bench_update_app.json b/press/press/doctype/bench_update_app/bench_update_app.json
index 1cfde951..9e9f2d28 100644
--- a/press/press/doctype/bench_update_app/bench_update_app.json
+++ b/press/press/doctype/bench_update_app/bench_update_app.json
@@ -2,7 +2,7 @@
  "actions": [],
  "creation": "2023-10-05 11:21:42.353413",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "app",
diff --git a/press/press/doctype/bench_variable/bench_variable.json b/press/press/doctype/bench_variable/bench_variable.json
index 5b1dedde..bd01e9f9 100644
--- a/press/press/doctype/bench_variable/bench_variable.json
+++ b/press/press/doctype/bench_variable/bench_variable.json
@@ -2,7 +2,7 @@
  "actions": [],
  "creation": "2023-06-13 16:17:11.965308",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/blocked_domain/blocked_domain.json b/press/press/doctype/blocked_domain/blocked_domain.json
index b2170bb5..ab399417 100644
--- a/press/press/doctype/blocked_domain/blocked_domain.json
+++ b/press/press/doctype/blocked_domain/blocked_domain.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "Prompt",
  "creation": "2021-09-21 16:46:44.313395",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/build_cache_shell/build_cache_shell.json b/press/press/doctype/build_cache_shell/build_cache_shell.json
index 29b1c8e8..5b9ee3c7 100644
--- a/press/press/doctype/build_cache_shell/build_cache_shell.json
+++ b/press/press/doctype/build_cache_shell/build_cache_shell.json
@@ -1,7 +1,7 @@
 {
  "actions": [
   {
-   "action": "jcloude.jcloude.doctype.build_cache_shell.build_cache_shell.run_command",
+   "action": "jcloude.jcloude.pagetype.build_cache_shell.build_cache_shell.run_command",
    "action_type": "Server Action",
    "hidden": 1,
    "label": "Run"
@@ -9,7 +9,7 @@
  ],
  "allow_rename": 1,
  "creation": "2024-04-18 11:55:45.595311",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "command",
diff --git a/press/press/doctype/build_metric/build_metric.json b/press/press/doctype/build_metric/build_metric.json
index 248941aa..f7ebbb88 100644
--- a/press/press/doctype/build_metric/build_metric.json
+++ b/press/press/doctype/build_metric/build_metric.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "hash",
  "creation": "2025-04-25 20:55:25.031408",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "start_from",
diff --git a/press/press/doctype/build_metric/build_metric.py b/press/press/doctype/build_metric/build_metric.py
index 22aff719..3fcae43d 100644
--- a/press/press/doctype/build_metric/build_metric.py
+++ b/press/press/doctype/build_metric/build_metric.py
@@ -16,7 +16,7 @@ from jingrow.model.document import Document
 if typing.TYPE_CHECKING:
 	from jingrow.utils import DateTimeLikeObject
 
-	from jcloude.jcloude.doctype.build_metric.build_metric_types import (
+	from jcloude.jcloude.pagetype.build_metric.build_metric_types import (
 		ContextDurationType,
 		DeployCandidateBuildType,
 		DurationType,
@@ -145,8 +145,8 @@ class GenerateBuildMetric:
 
 	def get_context_durations(self) -> ContextDurationType:
 		"""Compute median, p90, and p99 for package/upload durations."""
-		deploy_candidate_build = jingrow.qb.DocType("Deploy Candidate Build")
-		deploy_candidate_build_step = jingrow.qb.DocType("Deploy Candidate Build Step")
+		deploy_candidate_build = jingrow.qb.PageType("Deploy Candidate Build")
+		deploy_candidate_build_step = jingrow.qb.PageType("Deploy Candidate Build Step")
 
 		context_durations = (
 			jingrow.qb.from_(deploy_candidate_build_step)
diff --git a/press/press/doctype/certificate_authority/certificate_authority.json b/press/press/doctype/certificate_authority/certificate_authority.json
index ab1053e4..b8d41d51 100644
--- a/press/press/doctype/certificate_authority/certificate_authority.json
+++ b/press/press/doctype/certificate_authority/certificate_authority.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "field:common_name",
  "creation": "2020-09-17 10:43:35.055591",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/certificate_authority/certificate_authority.py b/press/press/doctype/certificate_authority/certificate_authority.py
index 17a10c79..29e88dfc 100644
--- a/press/press/doctype/certificate_authority/certificate_authority.py
+++ b/press/press/doctype/certificate_authority/certificate_authority.py
@@ -66,7 +66,7 @@ class CertificateAuthority(Document):
 			f.write(f"{secrets.randbits(16*8):0{32}x}\n")
 
 		template = "root.conf" if self.is_root_ca else "intermediate.conf"
-		template = f"jcloude/jcloude/doctype/certificate_authority/{template}"
+		template = f"jcloude/jcloude/pagetype/certificate_authority/{template}"
 		with open(self.openssl_config_file, "w") as f:
 			openssl_config = jingrow.render_template(template, {"pg": self}, is_path=True)
 			f.write(openssl_config)
@@ -94,7 +94,7 @@ class CertificateAuthority(Document):
 		os.chmod(self.certificate_signing_request_file, 444)
 
 	def sign_certificate_signing_request(self):
-		parent = jingrow.get_pg(self.doctype, self.parent_authority)
+		parent = jingrow.get_pg(self.pagetype, self.parent_authority)
 		self.run(
 			f"openssl ca -batch -notext -days {self.validity_days} -config"
 			f" {parent.openssl_config_file} -extensions v3_intermediate_ca -in"
@@ -103,7 +103,7 @@ class CertificateAuthority(Document):
 		os.chmod(self.certificate_file, 444)
 
 	def generate_chain_certificate(self):
-		parent = jingrow.get_pg(self.doctype, self.parent_authority)
+		parent = jingrow.get_pg(self.pagetype, self.parent_authority)
 		with open(self.certificate_file) as f:
 			certificate = f.read()
 		with open(parent.certificate_file) as f:
@@ -127,9 +127,9 @@ class CertificateAuthority(Document):
 	def on_trash(self):
 		if os.path.exists(self.directory):
 			shutil.rmtree(self.directory)
-		children = jingrow.get_all(self.doctype, {"parent_authority": self.name})
+		children = jingrow.get_all(self.pagetype, {"parent_authority": self.name})
 		for child in children:
-			jingrow.delete_pg(self.doctype, child.name)
+			jingrow.delete_pg(self.pagetype, child.name)
 
 	@property
 	def certificate_chain_file(self):
diff --git a/press/press/doctype/child_team_member/child_team_member.json b/press/press/doctype/child_team_member/child_team_member.json
index ed78d304..f78715db 100644
--- a/press/press/doctype/child_team_member/child_team_member.json
+++ b/press/press/doctype/child_team_member/child_team_member.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2023-04-22 10:27:26.970665",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/cloud_region/cloud_region.json b/press/press/doctype/cloud_region/cloud_region.json
index 33423213..3ee2500b 100644
--- a/press/press/doctype/cloud_region/cloud_region.json
+++ b/press/press/doctype/cloud_region/cloud_region.json
@@ -3,7 +3,7 @@
  "autoname": "field:region_name",
  "creation": "2023-08-08 10:48:41.639117",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/cluster/cluster.json b/press/press/doctype/cluster/cluster.json
index 9eaf2e80..ce07d211 100644
--- a/press/press/doctype/cluster/cluster.json
+++ b/press/press/doctype/cluster/cluster.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "Prompt",
  "creation": "2022-01-28 20:07:41.240327",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -309,32 +309,32 @@
  "links": [
   {
    "group": "Servers",
-   "link_doctype": "Server",
+   "link_pagetype": "Server",
    "link_fieldname": "cluster"
   },
   {
    "group": "Servers",
-   "link_doctype": "Database Server",
+   "link_pagetype": "Database Server",
    "link_fieldname": "cluster"
   },
   {
    "group": "Servers",
-   "link_doctype": "Proxy Server",
+   "link_pagetype": "Proxy Server",
    "link_fieldname": "cluster"
   },
   {
    "group": "Servers",
-   "link_doctype": "Log Server",
+   "link_pagetype": "Log Server",
    "link_fieldname": "cluster"
   },
   {
    "group": "Servers",
-   "link_doctype": "Monitor Server",
+   "link_pagetype": "Monitor Server",
    "link_fieldname": "cluster"
   },
   {
    "group": "Billing",
-   "link_doctype": "Subscription",
+   "link_pagetype": "Subscription",
    "link_fieldname": "document_name"
   }
  ],
diff --git a/press/press/doctype/cluster/cluster.py b/press/press/doctype/cluster/cluster.py
index b835e8d6..34ca0fd0 100644
--- a/press/press/doctype/cluster/cluster.py
+++ b/press/press/doctype/cluster/cluster.py
@@ -32,7 +32,7 @@ from oci.core.models import (
 )
 from oci.identity import IdentityClient
 
-from jcloude.jcloude.doctype.virtual_machine_image.virtual_machine_image import (
+from jcloude.jcloude.pagetype.virtual_machine_image.virtual_machine_image import (
 	VirtualMachineImage,
 )
 from jcloude.utils import get_current_team, unique
@@ -40,13 +40,13 @@ from jcloude.utils import get_current_team, unique
 if typing.TYPE_CHECKING:
 	from collections.abc import Generator
 
-	from jcloude.jcloude.doctype.log_server.log_server import LogServer
-	from jcloude.jcloude.doctype.monitor_server.monitor_server import MonitorServer
-	from jcloude.jcloude.doctype.jcloude_job.jcloude_job import PressJob
-	from jcloude.jcloude.doctype.jcloude_settings.jcloude_settings import PressSettings
-	from jcloude.jcloude.doctype.server.server import BaseServer
-	from jcloude.jcloude.doctype.server_plan.server_plan import ServerPlan
-	from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+	from jcloude.jcloude.pagetype.log_server.log_server import LogServer
+	from jcloude.jcloude.pagetype.monitor_server.monitor_server import MonitorServer
+	from jcloude.jcloude.pagetype.jcloude_job.jcloude_job import PressJob
+	from jcloude.jcloude.pagetype.jcloude_settings.jcloude_settings import PressSettings
+	from jcloude.jcloude.pagetype.server.server import BaseServer
+	from jcloude.jcloude.pagetype.server_plan.server_plan import ServerPlan
+	from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 
 DEFAULT_SERVER_TITLE = "First"
 
@@ -234,7 +234,7 @@ class Cluster(Document):
 				"Images for required series not available in other regions. Create Images from server docs.",
 				jingrow.ValidationError,
 			)
-		jingrow.enqueue_pg(self.doctype, self.name, "_add_images", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_add_images", queue="long", timeout=1200)
 
 	def _add_images(self):
 		"""Copies VMIs required for the cluster"""
@@ -761,22 +761,22 @@ class Cluster(Document):
 		if self.status != "Active":
 			jingrow.throw("Cluster is not active", jingrow.ValidationError)
 
-		for doctype, _ in self.base_servers.items():
+		for pagetype, _ in self.base_servers.items():
 			# TODO: remove Test title #
 			server, _ = self.create_server(
-				doctype,
+				pagetype,
 				DEFAULT_SERVER_TITLE,
 			)
-			match doctype:  # for populating Server pg's fields; assume the trio is created together
+			match pagetype:  # for populating Server pg's fields; assume the trio is created together
 				case "Database Server":
 					self.database_server = server.name
 				case "Proxy Server":
 					self.proxy_server = server.name
 		if self.public:
 			return
-		for doctype, _ in self.private_servers.items():
+		for pagetype, _ in self.private_servers.items():
 			self.create_server(
-				doctype,
+				pagetype,
 				DEFAULT_SERVER_TITLE,
 				create_subscription=False,
 			)
@@ -834,7 +834,7 @@ class Cluster(Document):
 		"""
 		return jingrow.get_pg(
 			{
-				"doctype": "Virtual Machine",
+				"pagetype": "Virtual Machine",
 				"cluster": self.name,
 				"domain": domain,
 				"series": "t" if temporary_server else series,
@@ -863,7 +863,7 @@ class Cluster(Document):
 			return jingrow.get_pg("Server Plan", f"Basic Cluster - {server_type}")
 		return jingrow.get_pg(
 			{
-				"doctype": "Server Plan",
+				"pagetype": "Server Plan",
 				"name": f"Basic Cluster - {server_type}",
 				"title": f"Basic Cluster - {server_type}",
 				"instance_type": self.get_default_instance_type(),
@@ -877,7 +877,7 @@ class Cluster(Document):
 
 	def create_server(  # noqa: C901
 		self,
-		doctype: str,
+		pagetype: str,
 		title: str,
 		plan: ServerPlan | None = None,
 		domain: str | None = None,
@@ -905,7 +905,7 @@ class Cluster(Document):
 			jcloude_job_arguments = {}
 
 		if setup_db_replication:
-			if doctype != "Database Server":
+			if pagetype != "Database Server":
 				jingrow.throw(
 					"Replication can only be set up for Database Servers",
 					jingrow.ValidationError,
@@ -923,20 +923,20 @@ class Cluster(Document):
 		domain = domain or jingrow.db.get_single_value("Jcloude Settings", "domain")
 		server_series = {**self.base_servers, **self.private_servers}
 		team = team or get_current_team()
-		plan = plan or self.get_or_create_basic_plan(doctype)
+		plan = plan or self.get_or_create_basic_plan(pagetype)
 		vm = self.create_vm(
 			plan.instance_type,
 			plan.platform,
 			plan.disk,
 			domain,
-			server_series[doctype] if not is_secondary else self.secondary_server_series,
+			server_series[pagetype] if not is_secondary else self.secondary_server_series,
 			team,
 			data_disk_snapshot=data_disk_snapshot,
 			temporary_server=temporary_server,
 			kms_key_id=kms_key_id,
 		)
 		server: BaseServer | MonitorServer | LogServer | None = None
-		match doctype:
+		match pagetype:
 			case "Database Server":
 				server = vm.create_database_server()
 				server.ram = plan.memory
diff --git a/press/press/doctype/cluster/patches/rename_aws_fields.py b/press/press/doctype/cluster/patches/rename_aws_fields.py
index 961f6e38..92961b66 100644
--- a/press/press/doctype/cluster/patches/rename_aws_fields.py
+++ b/press/press/doctype/cluster/patches/rename_aws_fields.py
@@ -6,7 +6,7 @@ from jingrow.model.utils.rename_field import rename_field
 
 
 def execute():
-	jingrow.reload_doctype("Cluster")
+	jingrow.reload_pagetype("Cluster")
 	rename_field("Cluster", "aws_vpc_id", "vpc_id")
 	rename_field("Cluster", "aws_subnet_id", "subnet_id")
 	rename_field("Cluster", "aws_proxy_security_group_id", "proxy_security_group_id")
diff --git a/press/press/doctype/cluster/test_cluster.py b/press/press/doctype/cluster/test_cluster.py
index dc28a5c8..cff12281 100644
--- a/press/press/doctype/cluster/test_cluster.py
+++ b/press/press/doctype/cluster/test_cluster.py
@@ -9,19 +9,19 @@ import jingrow
 from jingrow.tests.utils import FrappeTestCase
 from moto import mock_aws
 
-from jcloude.jcloude.doctype.cluster.cluster import Cluster
-from jcloude.jcloude.doctype.proxy_server.proxy_server import ProxyServer
-from jcloude.jcloude.doctype.root_domain.test_root_domain import create_test_root_domain
-from jcloude.jcloude.doctype.server.server import BaseServer
-from jcloude.jcloude.doctype.ssh_key.test_ssh_key import create_test_ssh_key
-from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
-from jcloude.jcloude.doctype.virtual_machine_image.virtual_machine_image import (
+from jcloude.jcloude.pagetype.cluster.cluster import Cluster
+from jcloude.jcloude.pagetype.proxy_server.proxy_server import ProxyServer
+from jcloude.jcloude.pagetype.root_domain.test_root_domain import create_test_root_domain
+from jcloude.jcloude.pagetype.server.server import BaseServer
+from jcloude.jcloude.pagetype.ssh_key.test_ssh_key import create_test_ssh_key
+from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
+from jcloude.jcloude.pagetype.virtual_machine_image.virtual_machine_image import (
 	VirtualMachineImage,
 )
 from jcloude.utils.test import foreground_enqueue_pg
 
 
-@patch("jcloude.jcloude.doctype.cluster.cluster.boto3.client", new=MagicMock())
+@patch("jcloude.jcloude.pagetype.cluster.cluster.boto3.client", new=MagicMock())
 def create_test_cluster(
 	name: str = "Mumbai",
 	region: str = "ap-south-1",
@@ -35,7 +35,7 @@ def create_test_cluster(
 		return jingrow.get_pg("Cluster", name)
 	cluster = jingrow.get_pg(
 		{
-			"doctype": "Cluster",
+			"pagetype": "Cluster",
 			"name": name,
 			"region": region,
 			"availability_zone": "ap-south-1a",
@@ -58,7 +58,7 @@ def create_test_cluster(
 class TestCluster(FrappeTestCase):
 	@mock_aws
 	def _setup_fake_vmis(self, series: list[str], cluster: Cluster | None = None):
-		from jcloude.jcloude.doctype.virtual_machine_image.test_virtual_machine_image import (
+		from jcloude.jcloude.pagetype.virtual_machine_image.test_virtual_machine_image import (
 			create_test_virtual_machine_image,
 		)
 
@@ -77,7 +77,7 @@ class TestCluster(FrappeTestCase):
 		"""Simulate creation of cluster without AWS credentials"""
 		cluster: Cluster = jingrow.get_pg(
 			{
-				"doctype": "Cluster",
+				"pagetype": "Cluster",
 				"name": "Mumbai 2",
 				"region": "ap-south-1",
 				"availability_zone": "ap-south-1a",
@@ -102,8 +102,8 @@ class TestCluster(FrappeTestCase):
 @patch.object(VirtualMachine, "get_latest_ubuntu_image", new=lambda x: "ami-123")
 @patch.object(VirtualMachineImage, "wait_for_availability", new=MagicMock())
 @patch.object(VirtualMachineImage, "after_insert", new=MagicMock())
-@patch("jcloude.jcloude.doctype.cluster.cluster.jingrow.enqueue_pg", new=foreground_enqueue_pg)
-@patch("jcloude.jcloude.doctype.cluster.cluster.jingrow.db.commit", new=MagicMock())
+@patch("jcloude.jcloude.pagetype.cluster.cluster.jingrow.enqueue_pg", new=foreground_enqueue_pg)
+@patch("jcloude.jcloude.pagetype.cluster.cluster.jingrow.db.commit", new=MagicMock())
 class TestPrivateCluster(TestCluster):
 	@mock_aws
 	def test_add_images_copies_VMIs_from_other_region(self):
@@ -175,8 +175,8 @@ class TestPrivateCluster(TestCluster):
 
 @patch.object(BaseServer, "run_jcloude_job", new=MagicMock())
 @patch.object(VirtualMachineImage, "wait_for_availability", new=MagicMock())
-@patch("jcloude.jcloude.doctype.cluster.cluster.jingrow.db.commit", new=MagicMock())
-@patch("jcloude.jcloude.doctype.cluster.cluster.jingrow.enqueue_pg", new=foreground_enqueue_pg)
+@patch("jcloude.jcloude.pagetype.cluster.cluster.jingrow.db.commit", new=MagicMock())
+@patch("jcloude.jcloude.pagetype.cluster.cluster.jingrow.enqueue_pg", new=foreground_enqueue_pg)
 @patch.object(VirtualMachineImage, "after_insert", new=MagicMock())
 class TestPublicCluster(TestCluster):
 	@mock_aws
@@ -230,7 +230,7 @@ class TestPublicCluster(TestCluster):
 	@mock_aws
 	@patch.object(Cluster, "after_insert", new=MagicMock())  # don't create vms/servers
 	def test_creation_of_public_cluster_uses_keys_from_jcloude_settings(self):
-		from jcloude.jcloude.doctype.jcloude_settings.test_jcloude_settings import (
+		from jcloude.jcloude.pagetype.jcloude_settings.test_jcloude_settings import (
 			create_test_jcloude_settings,
 		)
 
diff --git a/press/press/doctype/cluster_plan/cluster_plan.json b/press/press/doctype/cluster_plan/cluster_plan.json
index 49082000..fd016517 100644
--- a/press/press/doctype/cluster_plan/cluster_plan.json
+++ b/press/press/doctype/cluster_plan/cluster_plan.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "prompt",
  "creation": "2024-03-14 18:20:49.264170",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "enabled",
diff --git a/press/press/doctype/cluster_plan/cluster_plan.py b/press/press/doctype/cluster_plan/cluster_plan.py
index 351533b2..ca44b65b 100644
--- a/press/press/doctype/cluster_plan/cluster_plan.py
+++ b/press/press/doctype/cluster_plan/cluster_plan.py
@@ -3,7 +3,7 @@
 
 import jingrow
 
-from jcloude.jcloude.doctype.site_plan.plan import Plan
+from jcloude.jcloude.pagetype.site_plan.plan import Plan
 
 
 class ClusterPlan(Plan):
@@ -13,7 +13,7 @@ class ClusterPlan(Plan):
 	from typing import TYPE_CHECKING
 
 	if TYPE_CHECKING:
-		from jingrow.core.doctype.has_role.has_role import HasRole
+		from jingrow.core.pagetype.has_role.has_role import HasRole
 		from jingrow.types import DF
 
 		enabled: DF.Check
diff --git a/press/press/doctype/code_server/code_server.json b/press/press/doctype/code_server/code_server.json
index 2b93ffcc..934c2309 100644
--- a/press/press/doctype/code_server/code_server.json
+++ b/press/press/doctype/code_server/code_server.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-07-20 20:41:32.167249",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -97,7 +97,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Agent Job",
+   "link_pagetype": "Agent Job",
    "link_fieldname": "code_server"
   }
  ],
diff --git a/press/press/doctype/common_site_config/common_site_config.json b/press/press/doctype/common_site_config/common_site_config.json
index 16c3d85c..24a4fca7 100644
--- a/press/press/doctype/common_site_config/common_site_config.json
+++ b/press/press/doctype/common_site_config/common_site_config.json
@@ -2,7 +2,7 @@
  "actions": [],
  "creation": "2023-07-02 11:23:36.999759",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/common_site_config/common_site_config.py b/press/press/doctype/common_site_config/common_site_config.py
index 6f9cc6ae..914a46b5 100644
--- a/press/press/doctype/common_site_config/common_site_config.py
+++ b/press/press/doctype/common_site_config/common_site_config.py
@@ -3,7 +3,7 @@
 
 import jingrow
 
-from jcloude.jcloude.doctype.site_config.site_config import Config
+from jcloude.jcloude.pagetype.site_config.site_config import Config
 
 
 class CommonSiteConfig(Config):
@@ -26,7 +26,7 @@ class CommonSiteConfig(Config):
 
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
-		Config = jingrow.qb.DocType("Common Site Config")
+		Config = jingrow.qb.PageType("Common Site Config")
 		query = query.where(Config.internal == 0).orderby(Config.key, order=jingrow.qb.asc)
 		configs = query.run(as_dict=True)
 		return CommonSiteConfig.format_config_for_list(configs)
diff --git a/press/press/doctype/communication_info/communication_info.json b/press/press/doctype/communication_info/communication_info.json
index 004d1fda..9afe9b92 100644
--- a/press/press/doctype/communication_info/communication_info.json
+++ b/press/press/doctype/communication_info/communication_info.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2021-12-28 19:21:57.514933",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/communication_info/communication_info.py b/press/press/doctype/communication_info/communication_info.py
index b28ff590..b7ea66bb 100644
--- a/press/press/doctype/communication_info/communication_info.py
+++ b/press/press/doctype/communication_info/communication_info.py
@@ -202,7 +202,7 @@ def update_communication_infos(  # noqa: C901
 	for value in to_add:
 		pg = jingrow.get_pg(
 			{
-				"doctype": "Communication Info",
+				"pagetype": "Communication Info",
 				"parenttype": resource_type,
 				"parent": resource_name,
 				"channel": value.get("channel"),
diff --git a/press/press/doctype/cookie_preference_log/cookie_preference_log.json b/press/press/doctype/cookie_preference_log/cookie_preference_log.json
index ec1203fb..a32e60a3 100644
--- a/press/press/doctype/cookie_preference_log/cookie_preference_log.json
+++ b/press/press/doctype/cookie_preference_log/cookie_preference_log.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2021-11-24 14:21:26.131280",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/currency_exchange/currency_exchange.json b/press/press/doctype/currency_exchange/currency_exchange.json
index 8226bedc..26dcabd3 100644
--- a/press/press/doctype/currency_exchange/currency_exchange.json
+++ b/press/press/doctype/currency_exchange/currency_exchange.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format:{date}-{from_currency}-{to_currency}",
  "creation": "2025-01-18 10:54:45.521101",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "date",
diff --git a/press/press/doctype/dashboard_banner/dashboard_banner.json b/press/press/doctype/dashboard_banner/dashboard_banner.json
index 5d49c9a7..4f74c273 100644
--- a/press/press/doctype/dashboard_banner/dashboard_banner.json
+++ b/press/press/doctype/dashboard_banner/dashboard_banner.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "hash",
  "creation": "2024-06-24 09:20:47.114289",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "content_section",
diff --git a/press/press/doctype/dashboard_banner/dashboard_banner.py b/press/press/doctype/dashboard_banner/dashboard_banner.py
index 710cdb9a..ad7f33ab 100644
--- a/press/press/doctype/dashboard_banner/dashboard_banner.py
+++ b/press/press/doctype/dashboard_banner/dashboard_banner.py
@@ -13,7 +13,7 @@ class DashboardBanner(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.dashboard_banner_dismissal.dashboard_banner_dismissal import (
+		from jcloude.jcloude.pagetype.dashboard_banner_dismissal.dashboard_banner_dismissal import (
 			DashboardBannerDismissal,
 		)
 
diff --git a/press/press/doctype/dashboard_banner_dismissal/dashboard_banner_dismissal.json b/press/press/doctype/dashboard_banner_dismissal/dashboard_banner_dismissal.json
index 2c214f1d..f3cfbaa4 100644
--- a/press/press/doctype/dashboard_banner_dismissal/dashboard_banner_dismissal.json
+++ b/press/press/doctype/dashboard_banner_dismissal/dashboard_banner_dismissal.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-10-06 15:31:51.849959",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/database_server/database_server.json b/press/press/doctype/database_server/database_server.json
index df390116..017fde04 100644
--- a/press/press/doctype/database_server/database_server.json
+++ b/press/press/doctype/database_server/database_server.json
@@ -1,7 +1,7 @@
 {
   "actions": [],
   "creation": "2020-10-02 17:33:00.453792",
-  "doctype": "DocType",
+  "pagetype": "PageType",
   "editable_grid": 1,
   "engine": "InnoDB",
   "field_order": [
@@ -765,12 +765,12 @@
   "links": [
     {
       "group": "Analytics",
-      "link_doctype": "Disk Performance",
+      "link_pagetype": "Disk Performance",
       "link_fieldname": "server"
     },
     {
       "group": "Logs",
-      "link_doctype": "MariaDB Binlog",
+      "link_pagetype": "MariaDB Binlog",
       "link_fieldname": "database_server"
     }
   ],
diff --git a/press/press/doctype/database_server/database_server.py b/press/press/doctype/database_server/database_server.py
index 9459dccb..20350b74 100644
--- a/press/press/doctype/database_server/database_server.py
+++ b/press/press/doctype/database_server/database_server.py
@@ -10,24 +10,24 @@ from typing import TYPE_CHECKING, Any, Literal
 import jingrow
 import jingrow.utils
 import rq
-from jingrow.core.doctype.version.version import get_diff
+from jingrow.core.pagetype.version.version import get_diff
 from jingrow.core.utils import find
 from jingrow.utils.password import get_decrypted_password
 
 from jcloude.api.client import dashboard_whitelist
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.ansible_console.ansible_console import AnsibleAdHoc
-from jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable import (
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.ansible_console.ansible_console import AnsibleAdHoc
+from jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable import (
 	DatabaseServerMariaDBVariable,
 )
-from jcloude.jcloude.doctype.server.server import PUBLIC_SERVER_AUTO_ADD_STORAGE_MIN, Agent, BaseServer
+from jcloude.jcloude.pagetype.server.server import PUBLIC_SERVER_AUTO_ADD_STORAGE_MIN, Agent, BaseServer
 from jcloude.runner import Ansible
 from jcloude.utils import log_error
 from jcloude.utils.database import find_db_disk_info, parse_du_output_of_mysql_directory
 from jcloude.utils.jobs import has_job_timeout_exceeded
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
 
 
 class DatabaseServer(BaseServer):
@@ -39,12 +39,12 @@ class DatabaseServer(BaseServer):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.communication_info.communication_info import CommunicationInfo
-		from jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable import (
+		from jcloude.jcloude.pagetype.communication_info.communication_info import CommunicationInfo
+		from jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable import (
 			DatabaseServerMariaDBVariable,
 		)
-		from jcloude.jcloude.doctype.resource_tag.resource_tag import ResourceTag
-		from jcloude.jcloude.doctype.server_mount.server_mount import ServerMount
+		from jcloude.jcloude.pagetype.resource_tag.resource_tag import ResourceTag
+		from jcloude.jcloude.pagetype.server_mount.server_mount import ServerMount
 
 		agent_password: DF.Password | None
 		auto_add_storage_max: DF.Int
@@ -233,7 +233,7 @@ class DatabaseServer(BaseServer):
 			if subscription := jingrow.db.get_value(
 				"Subscription",
 				{
-					"document_type": self.doctype,
+					"document_type": self.pagetype,
 					"document_name": self.name,
 					"team": self.team,
 					"plan": self.plan,
@@ -255,7 +255,7 @@ class DatabaseServer(BaseServer):
 			if existing_subscription := jingrow.db.get_value(
 				"Subscription",
 				filters={
-					"document_type": self.doctype,
+					"document_type": self.pagetype,
 					"document_name": self.name,
 					"team": self.team,
 					"plan_type": "Server Storage Plan",
@@ -384,13 +384,13 @@ class DatabaseServer(BaseServer):
 		]
 
 		for action in actions:
-			action["server_doctype"] = self.doctype
+			action["server_pagetype"] = self.pagetype
 			action["server_name"] = self.name
 
 		return [action for action in actions if action.get("condition", True)] + server_actions
 
 	def update_memory_limits(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_update_memory_limits", enqueue_after_commit=True)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_update_memory_limits", enqueue_after_commit=True)
 
 	def _update_memory_limits(self):
 		self.memory_swap_max = self.memory_swap_max or 0.1
@@ -417,7 +417,7 @@ class DatabaseServer(BaseServer):
 		if not variables_to_update:
 			return
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_update_mariadb_system_variables",
 			queue="long",
@@ -445,7 +445,7 @@ class DatabaseServer(BaseServer):
 
 	def get_newly_added_variables(self, added) -> list[DatabaseServerMariaDBVariable]:
 		return [
-			DatabaseServerMariaDBVariable(row[1].doctype, row[1].name)
+			DatabaseServerMariaDBVariable(row[1].pagetype, row[1].name)
 			for row in added
 			if row[0] == "mariadb_system_variables"
 		]
@@ -472,7 +472,7 @@ class DatabaseServer(BaseServer):
 
 	@jingrow.whitelist()
 	def restart_mariadb(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_restart_mariadb")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_restart_mariadb")
 
 	def _restart_mariadb(self):
 		ansible = Ansible(
@@ -490,7 +490,7 @@ class DatabaseServer(BaseServer):
 
 	@jingrow.whitelist()
 	def stop_mariadb(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_stop_mariadb", timeout=1800)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_stop_mariadb", timeout=1800)
 
 	def _stop_mariadb(self):
 		ansible = Ansible(
@@ -512,7 +512,7 @@ class DatabaseServer(BaseServer):
 
 	@jingrow.whitelist()
 	def upgrade_mariadb(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_upgrade_mariadb", timeout=1800)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_upgrade_mariadb", timeout=1800)
 
 	def _upgrade_mariadb(self):
 		ansible = Ansible(
@@ -530,7 +530,7 @@ class DatabaseServer(BaseServer):
 
 	@jingrow.whitelist()
 	def update_mariadb(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_update_mariadb", timeout=1800)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_update_mariadb", timeout=1800)
 
 	def _update_mariadb(self):
 		ansible = Ansible(
@@ -548,7 +548,7 @@ class DatabaseServer(BaseServer):
 
 	@jingrow.whitelist()
 	def upgrade_mariadb_patched(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_upgrade_mariadb_patched", timeout=1800)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_upgrade_mariadb_patched", timeout=1800)
 
 	def _upgrade_mariadb_patched(self):
 		ansible = Ansible(
@@ -722,7 +722,7 @@ class DatabaseServer(BaseServer):
 				user=self.ssh_user or "root",
 				port=self.ssh_port or 22,
 				variables={
-					"server_type": self.doctype,
+					"server_type": self.pagetype,
 					"server": self.name,
 					"workers": "2",
 					"agent_password": config.agent_password,
@@ -826,7 +826,7 @@ class DatabaseServer(BaseServer):
 
 	def setup_binlog_indexes_folder(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_setup_binlog_indexes_folder",
 			queue="short",
@@ -847,7 +847,7 @@ class DatabaseServer(BaseServer):
 
 	def setup_user_lingering(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_setup_user_lingering",
 			queue="short",
@@ -948,14 +948,14 @@ class DatabaseServer(BaseServer):
 			return
 		self.status = "Installing"
 		self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_replication", queue="long", timeout=18000)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_replication", queue="long", timeout=18000)
 
 	@jingrow.whitelist()
 	def perform_physical_backup(self, path):
 		if not path:
 			jingrow.throw("Provide a path to store the physical backup")
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_perform_physical_backup",
 			queue="long",
@@ -1019,7 +1019,7 @@ class DatabaseServer(BaseServer):
 			return
 		self.status = "Installing"
 		self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_trigger_failover", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_trigger_failover", queue="long", timeout=1200)
 
 	def _convert_from_jingrow_server(self):
 		mariadb_root_password = self.get_password("mariadb_root_password")
@@ -1053,7 +1053,7 @@ class DatabaseServer(BaseServer):
 	def convert_from_jingrow_server(self):
 		self.status = "Installing"
 		self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_convert_from_jingrow_server", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_convert_from_jingrow_server", queue="long", timeout=1200)
 
 	def _install_exporters(self):
 		mariadb_root_password = self.get_password("mariadb_root_password")
@@ -1160,7 +1160,7 @@ class DatabaseServer(BaseServer):
 		It will prepare the replica by setting up the necessary configurations.
 		"""
 		jingrow.enqueue_pg(
-			self.doctype, self.name, "_prepare_mariadb_replica", queue="long", timeout=1200, at_front=True
+			self.pagetype, self.name, "_prepare_mariadb_replica", queue="long", timeout=1200, at_front=True
 		)
 
 	def _prepare_mariadb_replica(self):
@@ -1241,7 +1241,7 @@ class DatabaseServer(BaseServer):
 
 	@jingrow.whitelist()
 	def setup_deadlock_logger(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_deadlock_logger", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_deadlock_logger", queue="long", timeout=1200)
 
 	def _setup_deadlock_logger(self):
 		try:
@@ -1261,7 +1261,7 @@ class DatabaseServer(BaseServer):
 			log_error("Deadlock Logger Setup Exception", server=self.as_dict())
 
 	def capture_process_list(self) -> None:
-		jingrow.enqueue_pg(self.doctype, self.name, "_capture_process_list")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_capture_process_list")
 
 	def _capture_process_list(self) -> str | None:
 		"""Capture full process list on the database server"""
@@ -1278,7 +1278,7 @@ class DatabaseServer(BaseServer):
 
 	@jingrow.whitelist()
 	def setup_pt_stalk(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_pt_stalk", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_pt_stalk", queue="long", timeout=1200)
 
 	def _setup_pt_stalk(self):
 		extra_port_variable = find(
@@ -1315,7 +1315,7 @@ class DatabaseServer(BaseServer):
 
 	@jingrow.whitelist()
 	def setup_logrotate(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_logrotate", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_logrotate", queue="long", timeout=1200)
 
 	def _setup_logrotate(self):
 		try:
@@ -1329,7 +1329,7 @@ class DatabaseServer(BaseServer):
 	@jingrow.whitelist()
 	def provide_jingrow_user_du_and_find_permission(self):
 		jingrow.enqueue_pg(
-			self.doctype, self.name, "_provide_jingrow_user_du_and_find_permission", queue="long", timeout=1200
+			self.pagetype, self.name, "_provide_jingrow_user_du_and_find_permission", queue="long", timeout=1200
 		)
 
 	def _provide_jingrow_user_du_and_find_permission(self):
@@ -1347,7 +1347,7 @@ class DatabaseServer(BaseServer):
 	@jingrow.whitelist()
 	def setup_mariadb_debug_symbols(self):
 		jingrow.enqueue_pg(
-			self.doctype, self.name, "_setup_mariadb_debug_symbols", queue="long", timeout=1200
+			self.pagetype, self.name, "_setup_mariadb_debug_symbols", queue="long", timeout=1200
 		)
 
 	def _setup_mariadb_debug_symbols(self):
@@ -1365,7 +1365,7 @@ class DatabaseServer(BaseServer):
 	@jingrow.whitelist()
 	def fetch_stalks(self):
 		jingrow.enqueue(
-			"jcloude.jcloude.doctype.mariadb_stalk.mariadb_stalk.fetch_server_stalks",
+			"jcloude.jcloude.pagetype.mariadb_stalk.mariadb_stalk.fetch_server_stalks",
 			server=self.name,
 			job_id=f"fetch_mariadb_stalk:{self.name}",
 			deduplicate=True,
@@ -1405,7 +1405,7 @@ class DatabaseServer(BaseServer):
 				playbook="database_rename.yml",
 				server=self,
 				variables={
-					"server_type": self.doctype,
+					"server_type": self.pagetype,
 					"server": self.name,
 					"workers": "2",
 					"agent_password": agent_password,
@@ -1609,7 +1609,7 @@ class DatabaseServer(BaseServer):
 	@jingrow.whitelist()
 	def reconfigure_mariadb_exporter(self):
 		jingrow.enqueue_pg(
-			self.doctype, self.name, "_reconfigure_mariadb_exporter", queue="long", timeout=1200
+			self.pagetype, self.name, "_reconfigure_mariadb_exporter", queue="long", timeout=1200
 		)
 
 	def _reconfigure_mariadb_exporter(self):
@@ -1632,7 +1632,7 @@ class DatabaseServer(BaseServer):
 	@jingrow.whitelist()
 	def update_memory_allocator(self, memory_allocator):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_update_memory_allocator",
 			memory_allocator=memory_allocator,
@@ -1828,7 +1828,7 @@ Latest binlog : {latest_binlog.get("name", "")} - {last_binlog_size_mb} MB {last
 			return
 
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_sync_binlogs_info",
 			timeout=600,
@@ -1858,7 +1858,7 @@ Latest binlog : {latest_binlog.get("name", "")} - {last_binlog_size_mb} MB {last
 			):
 				jingrow.get_pg(
 					{
-						"doctype": "MariaDB Binlog",
+						"pagetype": "MariaDB Binlog",
 						"database_server": self.name,
 						"file_name": binlog["name"],
 						"size_mb": size_mb,
@@ -2223,7 +2223,7 @@ Latest binlog : {latest_binlog.get("name", "")} - {last_binlog_size_mb} MB {last
 	def set_mariadb_mount_dependency(self):
 		if not self.mariadb_depends_on_mounts:
 			return
-		jingrow.enqueue_pg(self.doctype, self.name, "_set_mariadb_mount_dependency", timeout=1800)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_set_mariadb_mount_dependency", timeout=1800)
 
 	def _set_mariadb_mount_dependency(self):
 		try:
@@ -2242,7 +2242,7 @@ Latest binlog : {latest_binlog.get("name", "")} - {last_binlog_size_mb} MB {last
 		self.agent.update_database_schema_sizes()
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Database Server")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Database Server")
 
 PERFORMANCE_SCHEMA_VARIABLES = {
 	"performance_schema": "1",
@@ -2266,7 +2266,7 @@ def monitor_disk_performance():
 		pluck="name",
 	)
 	jingrow.enqueue(
-		"jcloude.jcloude.doctype.disk_performance.disk_performance.check_disk_read_write_latency",
+		"jcloude.jcloude.pagetype.disk_performance.disk_performance.check_disk_read_write_latency",
 		servers=databases,
 		server_type="db",
 		deduplicate=True,
diff --git a/press/press/doctype/database_server/test_database_server.py b/press/press/doctype/database_server/test_database_server.py
index 6a3f5dac..3464a059 100644
--- a/press/press/doctype/database_server/test_database_server.py
+++ b/press/press/doctype/database_server/test_database_server.py
@@ -9,9 +9,9 @@ from jingrow.core.utils import find
 from jingrow.model.naming import make_autoname
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.database_server.database_server import DatabaseServer
-from jcloude.jcloude.doctype.server.server import BaseServer
-from jcloude.jcloude.doctype.virtual_machine.test_virtual_machine import create_test_virtual_machine
+from jcloude.jcloude.pagetype.database_server.database_server import DatabaseServer
+from jcloude.jcloude.pagetype.server.server import BaseServer
+from jcloude.jcloude.pagetype.virtual_machine.test_virtual_machine import create_test_virtual_machine
 from jcloude.runner import Ansible
 from jcloude.utils.test import foreground_enqueue_pg
 
@@ -23,7 +23,7 @@ def create_test_database_server(ip=None, cluster="Default") -> DatabaseServer:
 		ip = jingrow.mock("ipv4")
 	server = jingrow.get_pg(
 		{
-			"doctype": "Database Server",
+			"pagetype": "Database Server",
 			"status": "Active",
 			"ip": ip,
 			"private_ip": jingrow.mock("ipv4_private"),
@@ -46,10 +46,10 @@ class TestDatabaseServer(FrappeTestCase):
 		jingrow.db.rollback()
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.Ansible",
+		"jcloude.jcloude.pagetype.database_server.database_server.Ansible",
 	)
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_mariadb_service_restarted_on_restart_mariadb_fn_call(self, Mock_Ansible: Mock):
@@ -67,10 +67,10 @@ class TestDatabaseServer(FrappeTestCase):
 		)
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.Ansible",
+		"jcloude.jcloude.pagetype.database_server.database_server.Ansible",
 	)
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_memory_limits_updated_on_update_of_corresponding_fields(self, Mock_Ansible: MagicMock):
@@ -96,10 +96,10 @@ class TestDatabaseServer(FrappeTestCase):
 		)
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.Ansible",
+		"jcloude.jcloude.pagetype.database_server.database_server.Ansible",
 	)
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_reconfigure_mariadb_exporter_play_runs_on_reconfigure_fn_call(self, Mock_Ansible: Mock):
@@ -118,10 +118,10 @@ class TestDatabaseServer(FrappeTestCase):
 		)
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.Ansible",
+		"jcloude.jcloude.pagetype.database_server.database_server.Ansible",
 	)
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_exception_on_failed_reconfigure_fn_call(self, Mock_Ansible: Mock):
@@ -129,9 +129,9 @@ class TestDatabaseServer(FrappeTestCase):
 		server = create_test_database_server()
 		self.assertRaises(Exception, server.reconfigure_mariadb_exporter)  # noqa
 
-	@patch("jcloude.jcloude.doctype.database_server.database_server.Ansible", new=Mock())
+	@patch("jcloude.jcloude.pagetype.database_server.database_server.Ansible", new=Mock())
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_adjust_memory_config_sets_memory_limits_with_some_buffer(self):
diff --git a/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.json b/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.json
index e6da4580..a002cb38 100644
--- a/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.json
+++ b/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-05-30 15:28:55.572163",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.py b/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.py
index 7142be9c..2c9e72ab 100644
--- a/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.py
+++ b/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.py
@@ -144,5 +144,5 @@ class DatabaseServerMariaDBVariable(Document):
 			log_error("MariaDB System Variable Update Error", server=server.name)
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	jingrow.db.add_unique("Database Server MariaDB Variable", ("mariadb_variable", "parent"))
diff --git a/press/press/doctype/database_server_mariadb_variable/patches/add_unique_constraint.py b/press/press/doctype/database_server_mariadb_variable/patches/add_unique_constraint.py
index 9c5456fa..cf3cc6a4 100644
--- a/press/press/doctype/database_server_mariadb_variable/patches/add_unique_constraint.py
+++ b/press/press/doctype/database_server_mariadb_variable/patches/add_unique_constraint.py
@@ -6,7 +6,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "database_server_mariadb_variable")
-	jingrow.get_pg("DocType", "Database Server MariaDB Variable").run_module_method(
-		"on_doctype_update"
+	jingrow.reload_pg("jcloude", "pagetype", "database_server_mariadb_variable")
+	jingrow.get_pg("PageType", "Database Server MariaDB Variable").run_module_method(
+		"on_pagetype_update"
 	)
diff --git a/press/press/doctype/database_server_mariadb_variable/test_database_server_mariadb_variable.py b/press/press/doctype/database_server_mariadb_variable/test_database_server_mariadb_variable.py
index 0c891e7c..47a8b047 100644
--- a/press/press/doctype/database_server_mariadb_variable/test_database_server_mariadb_variable.py
+++ b/press/press/doctype/database_server_mariadb_variable/test_database_server_mariadb_variable.py
@@ -5,7 +5,7 @@ from unittest.mock import Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.database_server.test_database_server import (
+from jcloude.jcloude.pagetype.database_server.test_database_server import (
 	create_test_database_server,
 )
 from jcloude.runner import Ansible
@@ -98,11 +98,11 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 			self.fail("Should be able to skip skippable variables")
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+		"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 		wraps=Ansible,
 	)
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_skip_implies_persist_and_not_dynamic(self, Mock_Ansible):
@@ -136,11 +136,11 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		self.assertEqual(server.mariadb_system_variables[0].value_str, default_value)
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+		"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 		wraps=Ansible,
 	)
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		wraps=foreground_enqueue_pg,
 	)
 	def test_ansible_playbook_triggered_with_correct_input_on_update_of_child_table(
@@ -175,14 +175,14 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		server.save()
 		server.status = "Broken"
 		with patch(
-			"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+			"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 			wraps=Ansible,
 		) as Mock_Ansible:
 			server.save()
 		Mock_Ansible.assert_not_called()
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_playbook_run_on_update_of_child_table(self):
@@ -194,18 +194,18 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		server.save()
 		server.mariadb_system_variables[0].value_int = 2000
 		with patch(
-			"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+			"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 			wraps=Ansible,
 		) as Mock_Ansible:
 			server.save()
 		Mock_Ansible.assert_called_once()
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+		"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 		wraps=Ansible,
 	)
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		wraps=foreground_enqueue_pg,
 	)
 	def test_multiple_playbooks_triggered_for_multiple_variables(self, mock_enqueue_pg, Mock_Ansible):
@@ -222,11 +222,11 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		self.assertEqual(2, Mock_Ansible.call_count)
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+		"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 		wraps=Ansible,
 	)
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_persist_check_passes_option_to_playbook_run(self, Mock_Ansible):
@@ -244,7 +244,7 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		self.assertTrue(kwargs["variables"]["persist"])
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_playbook_run_on_addition_of_variable_and_only_that_variable(self):
@@ -255,7 +255,7 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		)
 		server.save()
 		with patch(
-			"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+			"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 			wraps=Ansible,
 		) as Mock_Ansible:
 			server.append(
@@ -266,7 +266,7 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		Mock_Ansible.assert_called_once()
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_playbook_run_only_for_variable_changed(self):
@@ -281,7 +281,7 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		)
 		server.save()
 		with patch(
-			"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+			"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 			wraps=Ansible,
 		) as Mock_Ansible:
 			server.mariadb_system_variables[0].value_int = 2000
@@ -289,7 +289,7 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		Mock_Ansible.assert_called_once()
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_playbooks_triggered_for_added_and_changed_variables_in_one_save(self):
@@ -300,7 +300,7 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		)
 		server.save()
 		with patch(
-			"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+			"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 			wraps=Ansible,
 		) as Mock_Ansible:
 			server.append(
@@ -315,7 +315,7 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 			self.assertIn(kwargs["variables"]["variable"], ["innodb_buffer_pool_size", "log_bin"])
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		wraps=foreground_enqueue_pg,
 	)
 	def test_background_jobs_not_created_for_new_server_pg(self, mock_enqueue_pg):
@@ -323,7 +323,7 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		mock_enqueue_pg.assert_not_called()
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		wraps=foreground_enqueue_pg,
 	)
 	def test_update_of_pg_with_member_that_is_not_a_field_works(self, mock_enqueue_pg):
@@ -336,14 +336,14 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 			self.fail("Update of pg without variables failed")
 
 	@patch(
-		"jcloude.jcloude.doctype.database_server.database_server.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.database_server.database_server.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_add_variable_method_adds_and_updates_variables(self):
 		server = create_test_database_server()
 
 		with patch(
-			"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+			"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 			wraps=Ansible,
 		) as Mock_Ansible:
 			server.add_or_update_mariadb_variable("tmp_disk_table_size", "value_int", value=10241)
@@ -355,7 +355,7 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		self.assertEqual(10241, server.mariadb_system_variables[0].value_int)
 
 		with patch(
-			"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+			"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 			wraps=Ansible,
 		) as Mock_Ansible:
 			server.add_or_update_mariadb_variable("tmp_disk_table_size", "value_int", value=10242)
@@ -366,7 +366,7 @@ class TestDatabaseServerMariaDBVariable(FrappeTestCase):
 		self.assertEqual(10242, server.mariadb_system_variables[0].value_int)
 
 		with patch(
-			"jcloude.jcloude.doctype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
+			"jcloude.jcloude.pagetype.database_server_mariadb_variable.database_server_mariadb_variable.Ansible",
 			wraps=Ansible,
 		) as Mock_Ansible:
 			server.add_or_update_mariadb_variable("tmp_disk_table_size", "value_int", 10242)  # no change
diff --git a/press/press/doctype/deploy/deploy.json b/press/press/doctype/deploy/deploy.json
index efa34b15..263a5545 100644
--- a/press/press/doctype/deploy/deploy.json
+++ b/press/press/doctype/deploy/deploy.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-04-06 12:08:13.396131",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/deploy/deploy.py b/press/press/doctype/deploy/deploy.py
index 031b220e..ed99861d 100644
--- a/press/press/doctype/deploy/deploy.py
+++ b/press/press/doctype/deploy/deploy.py
@@ -9,12 +9,12 @@ import jingrow
 from jingrow.model.document import Document
 from jingrow.model.naming import append_number_if_name_exists
 
-from jcloude.overrides import get_permission_query_conditions_for_doctype
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
 from jcloude.utils import log_error
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-	from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
 
 
 class Deploy(Document):
@@ -26,7 +26,7 @@ class Deploy(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.deploy_bench.deploy_bench import DeployBench
+		from jcloude.jcloude.pagetype.deploy_bench.deploy_bench import DeployBench
 
 		benches: DF.Table[DeployBench]
 		candidate: DF.Link
@@ -75,7 +75,7 @@ class Deploy(Document):
 
 			new = jingrow.get_pg(
 				{
-					"doctype": "Bench",
+					"pagetype": "Bench",
 					"server": bench.server,
 					"build": build.name,
 					"docker_image": image,
@@ -90,7 +90,7 @@ class Deploy(Document):
 			bench.bench = new.name
 
 		jingrow.enqueue(
-			"jcloude.jcloude.doctype.deploy.deploy.create_deploy_candidate_differences",
+			"jcloude.jcloude.pagetype.deploy.deploy.create_deploy_candidate_differences",
 			destination=self.candidate,
 			enqueue_after_commit=True,
 		)
@@ -127,7 +127,7 @@ def create_deploy_candidate_differences(destination):
 					continue
 				jingrow.get_pg(
 					{
-						"doctype": "Deploy Candidate Difference",
+						"pagetype": "Deploy Candidate Difference",
 						"group": group,
 						"source": source,
 						"destination": destination.name,
@@ -143,4 +143,4 @@ def create_deploy_candidate_differences(destination):
 			)
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Deploy")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Deploy")
diff --git a/press/press/doctype/deploy_bench/deploy_bench.json b/press/press/doctype/deploy_bench/deploy_bench.json
index 8fdbea02..cfe4c5dd 100644
--- a/press/press/doctype/deploy_bench/deploy_bench.json
+++ b/press/press/doctype/deploy_bench/deploy_bench.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-04-06 12:10:28.479712",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/deploy_candidate/deploy_candidate.js b/press/press/doctype/deploy_candidate/deploy_candidate.js
index 5cc25afa..c1566291 100644
--- a/press/press/doctype/deploy_candidate/deploy_candidate.js
+++ b/press/press/doctype/deploy_candidate/deploy_candidate.js
@@ -5,7 +5,7 @@ jingrow.ui.form.on('Deploy Candidate', {
 	refresh: function (frm) {
 		frm.fields_dict['apps'].grid.get_field('app').get_query = function (pg) {
 			return {
-				query: 'jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.desk_app',
+				query: 'jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.desk_app',
 				filters: { release_group: pg.group },
 			};
 		};
diff --git a/press/press/doctype/deploy_candidate/deploy_candidate.json b/press/press/doctype/deploy_candidate/deploy_candidate.json
index d6176bce..04726b49 100644
--- a/press/press/doctype/deploy_candidate/deploy_candidate.json
+++ b/press/press/doctype/deploy_candidate/deploy_candidate.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2022-01-28 20:07:29.425024",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -223,15 +223,15 @@
  ],
  "links": [
   {
-   "link_doctype": "Error Log",
+   "link_pagetype": "Error Log",
    "link_fieldname": "reference_name"
   },
   {
-   "link_doctype": "Jcloude Notification",
+   "link_pagetype": "Jcloude Notification",
    "link_fieldname": "document_name"
   },
   {
-   "link_doctype": "Deploy Candidate Build",
+   "link_pagetype": "Deploy Candidate Build",
    "link_fieldname": "deploy_candidate"
   }
  ],
diff --git a/press/press/doctype/deploy_candidate/deploy_candidate.py b/press/press/doctype/deploy_candidate/deploy_candidate.py
index 73ab28c1..9913518c 100644
--- a/press/press/doctype/deploy_candidate/deploy_candidate.py
+++ b/press/press/doctype/deploy_candidate/deploy_candidate.py
@@ -22,12 +22,12 @@ from jingrow.model.naming import make_autoname
 from jingrow.utils import now_datetime as now
 from jingrow.utils import rounded
 
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.app_release.app_release import (
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.app_release.app_release import (
 	AppReleasePair,
 	get_changed_files_between_hashes,
 )
-from jcloude.jcloude.doctype.deploy_candidate.utils import (
+from jcloude.jcloude.pagetype.deploy_candidate.utils import (
 	PackageManagerFiles,
 	is_suspended,
 )
@@ -41,8 +41,8 @@ RESTING_STATES = ["Draft", "Success", "Failure"]
 DISTUTILS_SUPPORTED_VERSION = semantic_version.SimpleSpec("<3.12")
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
 
 
 class DeployCandidate(Document):
@@ -54,14 +54,14 @@ class DeployCandidate(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.deploy_candidate_app.deploy_candidate_app import DeployCandidateApp
-		from jcloude.jcloude.doctype.deploy_candidate_dependency.deploy_candidate_dependency import (
+		from jcloude.jcloude.pagetype.deploy_candidate_app.deploy_candidate_app import DeployCandidateApp
+		from jcloude.jcloude.pagetype.deploy_candidate_dependency.deploy_candidate_dependency import (
 			DeployCandidateDependency,
 		)
-		from jcloude.jcloude.doctype.deploy_candidate_package.deploy_candidate_package import (
+		from jcloude.jcloude.pagetype.deploy_candidate_package.deploy_candidate_package import (
 			DeployCandidatePackage,
 		)
-		from jcloude.jcloude.doctype.deploy_candidate_variable.deploy_candidate_variable import (
+		from jcloude.jcloude.pagetype.deploy_candidate_variable.deploy_candidate_variable import (
 			DeployCandidateVariable,
 		)
 
@@ -164,7 +164,7 @@ class DeployCandidate(Document):
 	def on_trash(self):
 		jingrow.db.delete(
 			"Jcloude Notification",
-			{"document_type": self.doctype, "document_name": self.name},
+			{"document_type": self.pagetype, "document_name": self.name},
 		)
 
 	@property
@@ -212,7 +212,7 @@ class DeployCandidate(Document):
 			jingrow.throw("Deployments on this server are currently halted!")
 
 		kwargs.update(
-			{"doctype": "Deploy Candidate Build", "deploy_candidate": self.name},
+			{"pagetype": "Deploy Candidate Build", "deploy_candidate": self.name},
 		)
 		return jingrow.get_pg(kwargs)
 
@@ -660,7 +660,7 @@ def ansi_escape(text):
 
 
 @jingrow.whitelist()
-def desk_app(doctype, txt, searchfield, start, page_len, filters):
+def desk_app(pagetype, txt, searchfield, start, page_len, filters):
 	return jingrow.get_all(
 		"Release Group App",
 		filters={"parent": filters["release_group"]},
@@ -669,7 +669,7 @@ def desk_app(doctype, txt, searchfield, start, page_len, filters):
 	)
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Deploy Candidate")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Deploy Candidate")
 
 
 @jingrow.whitelist()
diff --git a/press/press/doctype/deploy_candidate/deploy_candidate_list.js b/press/press/doctype/deploy_candidate/deploy_candidate_list.js
index 5c16b3ff..6401f1b4 100644
--- a/press/press/doctype/deploy_candidate/deploy_candidate_list.js
+++ b/press/press/doctype/deploy_candidate/deploy_candidate_list.js
@@ -14,7 +14,7 @@ function show_toggle_builds_button(list_view) {
 			list_view.page.add_inner_button(label, () => {
 				jingrow
 					.xcall(
-						'jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.toggle_builds',
+						'jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.toggle_builds',
 						{ suspend: !suspend_builds },
 					)
 					.then(() => {
diff --git a/press/press/doctype/deploy_candidate/deploy_notifications.py b/press/press/doctype/deploy_candidate/deploy_notifications.py
index 04322332..1dd9d2be 100644
--- a/press/press/doctype/deploy_candidate/deploy_notifications.py
+++ b/press/press/doctype/deploy_candidate/deploy_notifications.py
@@ -10,7 +10,7 @@ from typing import Protocol, TypedDict
 
 import jingrow
 
-from jcloude.jcloude.doctype.deploy_candidate.utils import (
+from jcloude.jcloude.pagetype.deploy_candidate.utils import (
 	BuildValidationError,
 	get_error_key,
 )
@@ -42,11 +42,11 @@ MatchStrings = str | list[str]
 if typing.TYPE_CHECKING:
 	from jingrow import Document
 
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-	from jcloude.jcloude.doctype.deploy_candidate_app.deploy_candidate_app import (
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.deploy_candidate_app.deploy_candidate_app import (
 		DeployCandidateApp,
 	)
-	from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+	from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
 
 	# TYPE_CHECKING guard for code below cause DeployCandidate
 	# might cause circular import.
@@ -263,10 +263,10 @@ def create_build_warning_notification(
 	"""Create a warning notification for build"""
 	warning_details = {"title": title, "message": message}
 	pg_dict = {
-		"doctype": "Jcloude Notification",
+		"pagetype": "Jcloude Notification",
 		"team": dc.team,
 		"type": "Bench Deploy",
-		"document_type": dcb.doctype,
+		"document_type": dcb.pagetype,
 		"document_name": dcb.name,
 		"class": "Warning",
 		**warning_details,
@@ -275,7 +275,7 @@ def create_build_warning_notification(
 	pg.insert()
 	jingrow.db.commit()
 
-	jingrow.publish_realtime("jcloude_notification", doctype="Jcloude Notification", message={"team": dc.team})
+	jingrow.publish_realtime("jcloude_notification", pagetype="Jcloude Notification", message={"team": dc.team})
 
 	return True
 
@@ -299,10 +299,10 @@ def create_build_failed_notification(
 
 	details = get_details(deploy_candidate=dc, deploy_candidate_build=dcb, exc=exc)
 	pg_dict = {
-		"doctype": "Jcloude Notification",
+		"pagetype": "Jcloude Notification",
 		"team": dc.team,
 		"type": "Bench Deploy",
-		"document_type": dcb.doctype,
+		"document_type": dcb.pagetype,
 		"document_name": dcb.name,
 		"class": "Error",
 		**details,
@@ -311,7 +311,7 @@ def create_build_failed_notification(
 	pg.insert()
 	jingrow.db.commit()
 
-	jingrow.publish_realtime("jcloude_notification", doctype="Jcloude Notification", message={"team": dc.team})
+	jingrow.publish_realtime("jcloude_notification", pagetype="Jcloude Notification", message={"team": dc.team})
 
 	return details["is_actionable"]
 
diff --git a/press/press/doctype/deploy_candidate/docker_output_parsers.py b/press/press/doctype/deploy_candidate/docker_output_parsers.py
index ae0fc493..295513a3 100644
--- a/press/press/doctype/deploy_candidate/docker_output_parsers.py
+++ b/press/press/doctype/deploy_candidate/docker_output_parsers.py
@@ -17,8 +17,8 @@ done_check_rx = re.compile(r"#\d+\sDONE\s\d+\.\d+")
 if typing.TYPE_CHECKING:
 	from typing import Any, Generator
 
-	from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
-	from jcloude.jcloude.doctype.deploy_candidate_build_step.deploy_candidate_build_step import (
+	from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+	from jcloude.jcloude.pagetype.deploy_candidate_build_step.deploy_candidate_build_step import (
 		DeployCandidateBuildStep,
 	)
 
diff --git a/press/press/doctype/deploy_candidate/test_deploy_candidate.py b/press/press/doctype/deploy_candidate/test_deploy_candidate.py
index 95bb25d6..e564ec81 100644
--- a/press/press/doctype/deploy_candidate/test_deploy_candidate.py
+++ b/press/press/doctype/deploy_candidate/test_deploy_candidate.py
@@ -10,17 +10,17 @@ from unittest.mock import Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.app_release.test_app_release import create_test_app_release
-from jcloude.jcloude.doctype.app_source.test_app_source import create_test_app_source
-from jcloude.jcloude.doctype.bench.test_bench import create_test_bench
-from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.app_release.test_app_release import create_test_app_release
+from jcloude.jcloude.pagetype.app_source.test_app_source import create_test_app_source
+from jcloude.jcloude.pagetype.bench.test_bench import create_test_bench
+from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.server.test_server import create_test_server
-from jcloude.jcloude.doctype.team.test_team import (
+from jcloude.jcloude.pagetype.server.test_server import create_test_server
+from jcloude.jcloude.pagetype.team.test_team import (
 	create_test_jcloude_admin_team,
 	create_test_team,
 )
@@ -29,12 +29,12 @@ from jcloude.utils.test import foreground_enqueue_pg
 if typing.TYPE_CHECKING:
 	from typing import TypedDict
 
-	from jcloude.jcloude.doctype.app.app import App
-	from jcloude.jcloude.doctype.app_release.app_release import AppRelease
-	from jcloude.jcloude.doctype.app_source.app_source import AppSource
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
-	from jcloude.jcloude.doctype.team.team import Team
+	from jcloude.jcloude.pagetype.app.app import App
+	from jcloude.jcloude.pagetype.app_release.app_release import AppRelease
+	from jcloude.jcloude.pagetype.app_source.app_source import AppSource
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.team.team import Team
 
 	AppInfo = TypedDict(  # noqa: UP013
 		"AppInfo",
@@ -60,7 +60,7 @@ def create_test_deploy_candidate_build(
 ) -> DeployCandidateBuild:
 	deploy_candidate_build: DeployCandidateBuild = jingrow.get_pg(
 		{
-			"doctype": "Deploy Candidate Build",
+			"pagetype": "Deploy Candidate Build",
 			"deploy_candidate": deploy_candidate.name,
 			"no_build": no_build,
 			"no_push": no_push,
@@ -72,7 +72,7 @@ def create_test_deploy_candidate_build(
 	return deploy_candidate_build
 
 
-@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.db.commit")
+@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.db.commit")
 @patch.object(AgentJob, "enqueue_http_request", new=Mock())
 class TestDeployCandidate(FrappeTestCase):
 	def setUp(self):
@@ -85,7 +85,7 @@ class TestDeployCandidate(FrappeTestCase):
 		jingrow.db.rollback()
 		jingrow.set_user("Administrator")
 
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
 	@patch.object(DeployCandidateBuild, "_build", new=Mock())
 	def test_if_new_jcloude_admin_team_can_pre_build(self, mock_enqueue_pg, mock_commit):
 		"""
@@ -104,7 +104,7 @@ class TestDeployCandidate(FrappeTestCase):
 		except jingrow.PermissionError:
 			self.fail("PermissionError raised in pre_build")
 
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
 	@patch.object(DeployCandidateBuild, "_build", new=Mock())
 	def test_old_style_jcloude_admin_team_can_pre_build(self, mock_enqueue_pg, mock_commit):
 		"""
@@ -124,7 +124,7 @@ class TestDeployCandidate(FrappeTestCase):
 		except jingrow.PermissionError:
 			self.fail("PermissionError raised in pre_build")
 
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
 	def test_deploy_with_empty_apps_creates_deploy_candidate_with_same_release(
 		self, mock_enqueue_pg, mock_commit
 	):
@@ -140,7 +140,7 @@ class TestDeployCandidate(FrappeTestCase):
 		second_candidate = group.create_deploy_candidate([])
 		self.assertEqual(first_candidate.apps[0].release, second_candidate.apps[0].release)
 
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
 	def test_deploy_with_no_arguments_creates_deploy_candidate_with_newer_release(
 		self, mock_enqueue_pg, mock_commit
 	):
@@ -157,7 +157,7 @@ class TestDeployCandidate(FrappeTestCase):
 		self.assertNotEqual(first_candidate.apps[0].release, second_candidate.apps[0].release)
 		self.assertEqual(second_candidate.apps[0].release, release.name)
 
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
 	def test_deploy_with_specific_release_creates_deploy_candidate_with_that_release(
 		self, mock_enqueue_pg, mock_commit
 	):
@@ -174,7 +174,7 @@ class TestDeployCandidate(FrappeTestCase):
 		self.assertEqual(candidate.apps[0].release, second_release.name)
 		self.assertNotEqual(candidate.apps[0].release, third_release.name)
 
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg")
 	def test_deploy_with_new_app_creates_deploy_candidate_with_new_app(self, mock_enqueue_pg, mock_commit):
 		"""
 		Test if another deploy with new app creates Deploy Candidate with new app
@@ -191,10 +191,10 @@ class TestDeployCandidate(FrappeTestCase):
 		self.assertEqual(candidate.apps[1].release, release.name)
 
 	@patch(
-		"jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg", new=foreground_enqueue_pg
+		"jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg", new=foreground_enqueue_pg
 	)
 	@patch(
-		"jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.DeployCandidate.schedule_build_and_deploy",
+		"jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.DeployCandidate.schedule_build_and_deploy",
 		new=Mock(),
 	)
 	def test_creating_new_app_release_with_auto_deploy_deploys_that_app(self, mock_enqueue_pg):
@@ -231,7 +231,7 @@ class TestDeployCandidate(FrappeTestCase):
 
 	@skip("Docker Build broken with `duplicate cache exports [gha]`")
 	@patch(
-		"jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg",
+		"jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg",
 		new=foreground_enqueue_pg,
 	)
 	def test_app_cache_usage_on_subsequent_build(self):
@@ -249,7 +249,7 @@ class TestDeployCandidate(FrappeTestCase):
 		from jcloude.api.tests.test_bench import (
 			set_jcloude_settings_for_docker_build,
 		)
-		from jcloude.jcloude.doctype.bench_get_app_cache.bench_get_app_cache import (
+		from jcloude.jcloude.pagetype.bench_get_app_cache.bench_get_app_cache import (
 			BenchGetAppCache,
 		)
 
@@ -371,7 +371,7 @@ class TestDeployCandidate(FrappeTestCase):
 def create_cache_test_release_group(app_info_list: list["AppInfo"], team: "Team") -> "ReleaseGroup":
 	title = f"Test App Cache RG {random.getrandbits(20):x}"
 	pg_dict = {
-		"doctype": "Release Group",
+		"pagetype": "Release Group",
 		"version": "Nightly",
 		"enabled": True,
 		"title": title,
diff --git a/press/press/doctype/deploy_candidate/utils.py b/press/press/doctype/deploy_candidate/utils.py
index ce16ff02..7ed1403a 100644
--- a/press/press/doctype/deploy_candidate/utils.py
+++ b/press/press/doctype/deploy_candidate/utils.py
@@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, Any, TypedDict
 import jingrow
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
 
 
 class BuildWarning(Warning):
@@ -126,7 +126,7 @@ def get_error_key(error_substring: str | list[str]) -> str:
 
 
 def get_will_fail_checker(error_key: str):
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_notifications import handlers
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_notifications import handlers
 
 	for error_substring, _, will_fail_checker in handlers():
 		if get_error_key(error_substring) == error_key:
diff --git a/press/press/doctype/deploy_candidate/validations.py b/press/press/doctype/deploy_candidate/validations.py
index 1f17eb59..377140aa 100644
--- a/press/press/doctype/deploy_candidate/validations.py
+++ b/press/press/doctype/deploy_candidate/validations.py
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING
 import jingrow
 import semantic_version as sv
 
-from jcloude.jcloude.doctype.deploy_candidate.utils import (
+from jcloude.jcloude.pagetype.deploy_candidate.utils import (
 	BuildWarning,
 	PackageManagerFiles,
 	PackageManagers,
@@ -17,8 +17,8 @@ from jcloude.jcloude.doctype.deploy_candidate.utils import (
 from jcloude.utils import get_filepath, log_error
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
 
 
 class PreBuildValidations:
diff --git a/press/press/doctype/deploy_candidate_app/deploy_candidate_app.json b/press/press/doctype/deploy_candidate_app/deploy_candidate_app.json
index 0de51f49..f5de1245 100644
--- a/press/press/doctype/deploy_candidate_app/deploy_candidate_app.json
+++ b/press/press/doctype/deploy_candidate_app/deploy_candidate_app.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-01-13 16:20:49.495751",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "app",
diff --git a/press/press/doctype/deploy_candidate_app/patches/set_app_name_to_app.py b/press/press/doctype/deploy_candidate_app/patches/set_app_name_to_app.py
index 1ee5cc3c..50c0df98 100644
--- a/press/press/doctype/deploy_candidate_app/patches/set_app_name_to_app.py
+++ b/press/press/doctype/deploy_candidate_app/patches/set_app_name_to_app.py
@@ -4,7 +4,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "deploy_candidate_app")
+	jingrow.reload_pg("jcloude", "pagetype", "deploy_candidate_app")
 	jingrow.db.sql(
 		"""
 		UPDATE `tabDeploy Candidate App`
diff --git a/press/press/doctype/deploy_candidate_build/deploy_candidate_build.js b/press/press/doctype/deploy_candidate_build/deploy_candidate_build.js
index a0ab004e..008845cf 100644
--- a/press/press/doctype/deploy_candidate_build/deploy_candidate_build.js
+++ b/press/press/doctype/deploy_candidate_build/deploy_candidate_build.js
@@ -52,21 +52,21 @@ jingrow.ui.form.on('Deploy Candidate Build', {
 					() => {
 						if (label === 'Stop And Fail') {
 							jingrow.call(
-								'jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build.stop_and_fail',
+								'jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build.stop_and_fail',
 								{
 									dn: frm.pg.name,
 								},
 							);
 						} else if (label == 'Fail Remote Job') {
 							jingrow.call(
-								'jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build.fail_remote_job',
+								'jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build.fail_remote_job',
 								{
 									dn: frm.pg.name,
 								},
 							);
 						} else if (label == 'Fail And Redeploy') {
 							jingrow.call(
-								'jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build.fail_and_redeploy',
+								'jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build.fail_and_redeploy',
 								{
 									dn: frm.pg.name,
 								},
diff --git a/press/press/doctype/deploy_candidate_build/deploy_candidate_build.json b/press/press/doctype/deploy_candidate_build/deploy_candidate_build.json
index 2faf5443..d1c5046e 100644
--- a/press/press/doctype/deploy_candidate_build/deploy_candidate_build.json
+++ b/press/press/doctype/deploy_candidate_build/deploy_candidate_build.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-04-07 23:10:49.524879",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "deploy_candidate",
@@ -298,19 +298,19 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Agent Job",
+   "link_pagetype": "Agent Job",
    "link_fieldname": "reference_name"
   },
   {
-   "link_doctype": "Error Log",
+   "link_pagetype": "Error Log",
    "link_fieldname": "reference_name"
   },
   {
-   "link_doctype": "Jcloude Notification",
+   "link_pagetype": "Jcloude Notification",
    "link_fieldname": "document_name"
   },
   {
-   "link_doctype": "Bench",
+   "link_pagetype": "Bench",
    "link_fieldname": "build"
   }
  ],
diff --git a/press/press/doctype/deploy_candidate_build/deploy_candidate_build.py b/press/press/doctype/deploy_candidate_build/deploy_candidate_build.py
index 842aa9d0..0f5f9787 100644
--- a/press/press/doctype/deploy_candidate_build/deploy_candidate_build.py
+++ b/press/press/doctype/deploy_candidate_build/deploy_candidate_build.py
@@ -30,15 +30,15 @@ from tenacity import retry, stop_after_attempt, wait_fixed
 
 from jcloude.agent import Agent
 from jcloude.exceptions import ImageNotFoundInRegistry
-from jcloude.jcloude.doctype.deploy_candidate.deploy_notifications import (
+from jcloude.jcloude.pagetype.deploy_candidate.deploy_notifications import (
 	create_build_failed_notification,
 	create_build_warning_notification,
 )
-from jcloude.jcloude.doctype.deploy_candidate.docker_output_parsers import (
+from jcloude.jcloude.pagetype.deploy_candidate.docker_output_parsers import (
 	DockerBuildOutputParser,
 	UploadStepUpdater,
 )
-from jcloude.jcloude.doctype.deploy_candidate.utils import (
+from jcloude.jcloude.pagetype.deploy_candidate.utils import (
 	BuildWarning,
 	get_arm_build_server_with_least_active_builds,
 	get_build_server,
@@ -47,7 +47,7 @@ from jcloude.jcloude.doctype.deploy_candidate.utils import (
 	is_suspended,
 	load_pyproject,
 )
-from jcloude.jcloude.doctype.deploy_candidate.validations import PreBuildValidations
+from jcloude.jcloude.pagetype.deploy_candidate.validations import PreBuildValidations
 from jcloude.utils import get_current_team, log_error
 from jcloude.utils.jobs import get_background_jobs, stop_background_job
 from jcloude.utils.webhook import create_webhook_event
@@ -57,13 +57,13 @@ if typing.TYPE_CHECKING:
 
 	from rq.job import Job
 
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.app_release.app_release import AppRelease
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-	from jcloude.jcloude.doctype.deploy_candidate_app.deploy_candidate_app import (
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.app_release.app_release import AppRelease
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.deploy_candidate_app.deploy_candidate_app import (
 		DeployCandidateApp,
 	)
-	from jcloude.jcloude.doctype.release_group_server.release_group_server import ReleaseGroupServer
+	from jcloude.jcloude.pagetype.release_group_server.release_group_server import ReleaseGroupServer
 
 # build_duration, pending_duration are Time fields, >= 1 day is invalid
 MAX_DURATION = timedelta(hours=23, minutes=59, seconds=59)
@@ -190,7 +190,7 @@ class DeployCandidateBuild(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.deploy_candidate_build_step.deploy_candidate_build_step import (
+		from jcloude.jcloude.pagetype.deploy_candidate_build_step.deploy_candidate_build_step import (
 			DeployCandidateBuildStep,
 		)
 
@@ -246,9 +246,9 @@ class DeployCandidateBuild(Document):
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
 		DeployCandidate, DeployCandidateBuild, DeployCandidateApp = (
-			jingrow.qb.DocType("Deploy Candidate"),
-			jingrow.qb.DocType("Deploy Candidate Build"),
-			jingrow.qb.DocType("Deploy Candidate App"),
+			jingrow.qb.PageType("Deploy Candidate"),
+			jingrow.qb.PageType("Deploy Candidate Build"),
+			jingrow.qb.PageType("Deploy Candidate App"),
 		)
 		query = (
 			query.left_join(DeployCandidate)
@@ -772,7 +772,7 @@ class DeployCandidateBuild(Document):
 		requires_intel_build = self.candidate.requires_intel_build and not self.candidate.intel_build
 
 		build_meta = {
-			"doctype": "Deploy Candidate Build",
+			"pagetype": "Deploy Candidate Build",
 			"deploy_candidate": self.candidate.name,
 			"no_build": self.no_build,
 			"no_cache": self.no_cache,
@@ -1160,7 +1160,7 @@ class DeployCandidateBuild(Document):
 		queue = "default" if jingrow.conf.developer_mode else "build"
 
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_build",
 			queue=queue,
@@ -1176,14 +1176,14 @@ class DeployCandidateBuild(Document):
 		if self.status == "Running":
 			jingrow.publish_realtime(
 				f"bench_deploy:{self.name}:steps",
-				doctype=self.doctype,
+				pagetype=self.pagetype,
 				docname=self.name,
 				message={"steps": self.build_steps, "name": self.name},
 			)
 		else:
 			jingrow.publish_realtime(
 				f"bench_deploy:{self.name}:finished",
-				doctype=self.doctype,
+				pagetype=self.pagetype,
 				docname=self.name,
 			)
 
@@ -1201,7 +1201,7 @@ class DeployCandidateBuild(Document):
 
 	def _stop_and_fail(self):
 		self.manually_failed = True
-		for job in get_background_jobs(self.doctype, self.name, status="started"):
+		for job in get_background_jobs(self.pagetype, self.name, status="started"):
 			if is_build_job(job):
 				stop_background_job(job)
 
@@ -1231,7 +1231,7 @@ class DeployCandidateBuild(Document):
 
 		return jingrow.get_pg(
 			{
-				"doctype": "Deploy",
+				"pagetype": "Deploy",
 				"group": self.group,
 				"candidate": self.deploy_candidate,
 				"benches": [{"server": server} for server in servers],
@@ -1302,7 +1302,7 @@ def redeploy(dn: str) -> dict[str, str | bool]:
 @jingrow.whitelist()
 def fail_remote_job(dn: str) -> bool:
 	agent_job: "AgentJob" = jingrow.get_pg(
-		"Agent Job", {"reference_doctype": "Deploy Candidate Build", "reference_name": dn}
+		"Agent Job", {"reference_pagetype": "Deploy Candidate Build", "reference_name": dn}
 	)
 
 	agent_job.get_status()
@@ -1427,7 +1427,7 @@ def create_platform_build_and_deploy(deploy_candidate: str, server: str, platfor
 	"""Create an arm / intel build and trigger a deploy on the given server"""
 	deploy_candidate_build: DeployCandidateBuild = jingrow.get_pg(
 		{
-			"doctype": "Deploy Candidate Build",
+			"pagetype": "Deploy Candidate Build",
 			"deploy_candidate": deploy_candidate,
 			"no_build": False,
 			"no_cache": False,
@@ -1594,7 +1594,7 @@ def _create_arm_build(deploy_candidate: str) -> DeployCandidateBuild:
 
 	deploy_candidate_build: DeployCandidateBuild = jingrow.get_pg(
 		{
-			"doctype": "Deploy Candidate Build",
+			"pagetype": "Deploy Candidate Build",
 			"deploy_candidate": deploy_candidate,
 			"no_build": False,
 			"no_cache": False,
diff --git a/press/press/doctype/deploy_candidate_build/patches/migrate_to_separate_build.py b/press/press/doctype/deploy_candidate_build/patches/migrate_to_separate_build.py
index ec5e58e5..f276ef24 100644
--- a/press/press/doctype/deploy_candidate_build/patches/migrate_to_separate_build.py
+++ b/press/press/doctype/deploy_candidate_build/patches/migrate_to_separate_build.py
@@ -17,11 +17,11 @@ import typing
 import jingrow
 from jingrow.query_builder import Order
 
-DeployCandidate = jingrow.qb.DocType("Deploy Candidate")
-DeployCandidateBuild = jingrow.qb.DocType("Deploy Candidate Build")
-Bench = jingrow.qb.DocType("Bench")
-Deploy = jingrow.qb.DocType("Deploy")
-DeployCandidateBuildStep = jingrow.qb.DocType("Deploy Candidate Build Step")
+DeployCandidate = jingrow.qb.PageType("Deploy Candidate")
+DeployCandidateBuild = jingrow.qb.PageType("Deploy Candidate Build")
+Bench = jingrow.qb.PageType("Bench")
+Deploy = jingrow.qb.PageType("Deploy")
+DeployCandidateBuildStep = jingrow.qb.PageType("Deploy Candidate Build Step")
 
 
 class CandidateInfo(typing.TypedDict):
diff --git a/press/press/doctype/deploy_candidate_build/test_deploy_candidate_build.py b/press/press/doctype/deploy_candidate_build/test_deploy_candidate_build.py
index b04ef0bd..b0fcc9d8 100644
--- a/press/press/doctype/deploy_candidate_build/test_deploy_candidate_build.py
+++ b/press/press/doctype/deploy_candidate_build/test_deploy_candidate_build.py
@@ -8,26 +8,26 @@ from unittest.mock import Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.bench.bench import Bench
-from jcloude.jcloude.doctype.deploy_candidate.test_deploy_candidate import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.bench.bench import Bench
+from jcloude.jcloude.pagetype.deploy_candidate.test_deploy_candidate import (
 	create_test_deploy_candidate,
 	create_test_deploy_candidate_build,
 	create_test_jcloude_admin_team,
 )
-from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.server.test_server import create_test_server
+from jcloude.jcloude.pagetype.server.test_server import create_test_server
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.deploy.deploy import Deploy
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.deploy.deploy import Deploy
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
 
 
-@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.db.commit")
+@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.db.commit")
 @patch.object(AgentJob, "enqueue_http_request", new=Mock())
 class TestDeployCandidateBuild(FrappeTestCase):
 	def setUp(self):
@@ -52,8 +52,8 @@ class TestDeployCandidateBuild(FrappeTestCase):
 		self.x86_build_server = create_test_server(platform="x86_64", use_for_build=True)
 		self.arm_build_server = create_test_server(platform="arm64", use_for_build=True)
 
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg", new=Mock())
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg", new=Mock())
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
 	@patch.object(DeployCandidateBuild, "_process_run_build", new=Mock())
 	@patch.object(Bench, "after_insert", new=Mock())
 	def test_correct_build_flow(self, mock_enqueue):
@@ -108,8 +108,8 @@ class TestDeployCandidateBuild(FrappeTestCase):
 		)
 		self.assertEqual(test_build.name, newly_created_build.name)
 
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg", new=Mock())
-	@patch("jcloude.jcloude.doctype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.enqueue_pg", new=Mock())
+	@patch("jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate.jingrow.db.commit", new=Mock())
 	@patch.object(Bench, "after_insert", new=Mock())
 	@patch.object(DeployCandidateBuild, "_process_run_build", new=Mock())
 	def test_multi_server_deploy(self, mock_enqueue):
diff --git a/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.json b/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.json
index ac82db59..dc82a5ad 100644
--- a/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.json
+++ b/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-11-26 10:03:32.946618",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.py b/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.py
index 8659d8d4..06c3b9ce 100644
--- a/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.py
+++ b/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.py
@@ -36,7 +36,7 @@ class DeployCandidateBuildStep(Document):
 	pass
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	jingrow.db.add_index("Deploy Candidate Build Step", ["stage_slug", "step_slug"])
 	jingrow.db.add_index("Deploy Candidate Build Step", ["creation"])
 	jingrow.db.add_index("Deploy Candidate Build Step", ["cached"])
diff --git a/press/press/doctype/deploy_candidate_dependency/deploy_candidate_dependency.json b/press/press/doctype/deploy_candidate_dependency/deploy_candidate_dependency.json
index c22623bb..461dfd63 100644
--- a/press/press/doctype/deploy_candidate_dependency/deploy_candidate_dependency.json
+++ b/press/press/doctype/deploy_candidate_dependency/deploy_candidate_dependency.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-05-18 18:28:47.923629",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.json b/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.json
index c991ce5d..caf2ea2f 100644
--- a/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.json
+++ b/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-04-06 13:24:05.363904",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.py b/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.py
index 86ef80ae..2ca945a1 100644
--- a/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.py
+++ b/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.py
@@ -6,7 +6,7 @@ import jingrow
 from jingrow.core.utils import find
 from jingrow.model.document import Document
 
-from jcloude.overrides import get_permission_query_conditions_for_doctype
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
 
 
 class DeployCandidateDifference(Document):
@@ -18,7 +18,7 @@ class DeployCandidateDifference(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.deploy_candidate_difference_app.deploy_candidate_difference_app import (
+		from jcloude.jcloude.pagetype.deploy_candidate_difference_app.deploy_candidate_difference_app import (
 			DeployCandidateDifferenceApp,
 		)
 
@@ -78,7 +78,7 @@ class DeployCandidateDifference(Document):
 			if not differences:
 				difference = jingrow.get_pg(
 					{
-						"doctype": "App Release Difference",
+						"pagetype": "App Release Difference",
 						"app": destination.app,
 						"source": destination.source,
 						"source_release": source.release,
@@ -106,4 +106,4 @@ class DeployCandidateDifference(Document):
 				self.deploy_type = "Migrate"
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Deploy Candidate Difference")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Deploy Candidate Difference")
diff --git a/press/press/doctype/deploy_candidate_difference/test_deploy_candidate_difference.py b/press/press/doctype/deploy_candidate_difference/test_deploy_candidate_difference.py
index bab1dd34..455b2b06 100644
--- a/press/press/doctype/deploy_candidate_difference/test_deploy_candidate_difference.py
+++ b/press/press/doctype/deploy_candidate_difference/test_deploy_candidate_difference.py
@@ -6,10 +6,10 @@ from unittest.mock import Mock, patch
 
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.deploy.deploy import create_deploy_candidate_differences
+from jcloude.jcloude.pagetype.deploy.deploy import create_deploy_candidate_differences
 
 
-@patch("jcloude.jcloude.doctype.deploy.deploy.jingrow.db.commit", new=Mock())
+@patch("jcloude.jcloude.pagetype.deploy.deploy.jingrow.db.commit", new=Mock())
 def create_test_deploy_candidate_differences(*args, **kwargs):
 	return create_deploy_candidate_differences(*args, **kwargs)
 
diff --git a/press/press/doctype/deploy_candidate_difference_app/deploy_candidate_difference_app.json b/press/press/doctype/deploy_candidate_difference_app/deploy_candidate_difference_app.json
index 90b68c79..7448757c 100644
--- a/press/press/doctype/deploy_candidate_difference_app/deploy_candidate_difference_app.json
+++ b/press/press/doctype/deploy_candidate_difference_app/deploy_candidate_difference_app.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-04-06 13:23:22.345482",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "app",
diff --git a/press/press/doctype/deploy_candidate_package/deploy_candidate_package.json b/press/press/doctype/deploy_candidate_package/deploy_candidate_package.json
index 8f66188f..13f85da2 100644
--- a/press/press/doctype/deploy_candidate_package/deploy_candidate_package.json
+++ b/press/press/doctype/deploy_candidate_package/deploy_candidate_package.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-05-12 15:27:48.023378",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/deploy_candidate_variable/deploy_candidate_variable.json b/press/press/doctype/deploy_candidate_variable/deploy_candidate_variable.json
index 03b5b11b..f712cf5d 100644
--- a/press/press/doctype/deploy_candidate_variable/deploy_candidate_variable.json
+++ b/press/press/doctype/deploy_candidate_variable/deploy_candidate_variable.json
@@ -2,7 +2,7 @@
  "actions": [],
  "creation": "2023-06-13 16:16:51.962602",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "key",
diff --git a/press/press/doctype/disk_performance/disk_performance.json b/press/press/doctype/disk_performance/disk_performance.json
index 24d38bfa..6a1abfc0 100644
--- a/press/press/doctype/disk_performance/disk_performance.json
+++ b/press/press/doctype/disk_performance/disk_performance.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-03-21 13:23:38.463106",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "target_section",
diff --git a/press/press/doctype/disk_performance/disk_performance.py b/press/press/doctype/disk_performance/disk_performance.py
index 97957427..7f95da39 100644
--- a/press/press/doctype/disk_performance/disk_performance.py
+++ b/press/press/doctype/disk_performance/disk_performance.py
@@ -37,7 +37,7 @@ def check_disk_read_write_latency(servers: list[str], server_type: typing.Litera
 		Database Server : /var/lib/mysql
 		App Server: /home/jingrow
 	"""
-	from jcloude.jcloude.doctype.ansible_console.ansible_console import AnsibleAdHoc
+	from jcloude.jcloude.pagetype.ansible_console.ansible_console import AnsibleAdHoc
 
 	if not servers:
 		return
@@ -65,7 +65,7 @@ def check_disk_read_write_latency(servers: list[str], server_type: typing.Litera
 		with contextlib.suppress(Exception):
 			if result["status"] == "Success":
 				new_pg_data = {
-					"doctype": "Disk Performance",
+					"pagetype": "Disk Performance",
 					"server": result["host"],
 					"server_type": "Server" if server_type == "app" else "Database Server",
 				}
diff --git a/press/press/doctype/downtime_analysis/downtime_analysis.json b/press/press/doctype/downtime_analysis/downtime_analysis.json
index e8bb533d..5739d2b4 100644
--- a/press/press/doctype/downtime_analysis/downtime_analysis.json
+++ b/press/press/doctype/downtime_analysis/downtime_analysis.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-09-23 11:48:50.039942",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "report_details_tab",
diff --git a/press/press/doctype/downtime_analysis/downtime_analysis.py b/press/press/doctype/downtime_analysis/downtime_analysis.py
index 5a54c051..8725b3e5 100644
--- a/press/press/doctype/downtime_analysis/downtime_analysis.py
+++ b/press/press/doctype/downtime_analysis/downtime_analysis.py
@@ -8,7 +8,7 @@ from jingrow.model.document import Document
 from jingrow.utils.background_jobs import get_job_status
 from jingrow.utils.password import get_decrypted_password
 
-from jcloude.jcloude.doctype.downtime_analysis.generate_metrics import (
+from jcloude.jcloude.pagetype.downtime_analysis.generate_metrics import (
 	generate_server_downtime_report,
 	generate_site_downtime_report,
 	get_data_for_all_clusters,
@@ -61,7 +61,7 @@ class DowntimeAnalysis(Document):
 			return
 
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			method="generate_and_prepare_report",
 			queue="default",
diff --git a/press/press/doctype/downtime_analysis/test_downtime_analysis.py b/press/press/doctype/downtime_analysis/test_downtime_analysis.py
index 7adff647..f7cce18d 100644
--- a/press/press/doctype/downtime_analysis/test_downtime_analysis.py
+++ b/press/press/doctype/downtime_analysis/test_downtime_analysis.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/drip_email/drip_email.js b/press/press/doctype/drip_email/drip_email.js
index 4911d4aa..791b8728 100644
--- a/press/press/doctype/drip_email/drip_email.js
+++ b/press/press/doctype/drip_email/drip_email.js
@@ -4,7 +4,7 @@
 jingrow.ui.form.on('Drip Email', {
 	refresh: function (frm) {
 		const pg = frm.pg;
-		const can_write = jingrow.boot.user.can_write.includes(pg.doctype);
+		const can_write = jingrow.boot.user.can_write.includes(pg.pagetype);
 		if (!frm.is_new() && !frm.is_dirty() && !pg.email_sent && can_write) {
 			frm.add_custom_button('Send a test email', () => {
 				frm.events.send_test_email(frm);
diff --git a/press/press/doctype/drip_email/drip_email.json b/press/press/doctype/drip_email/drip_email.json
index 4c840be2..6b962425 100644
--- a/press/press/doctype/drip_email/drip_email.json
+++ b/press/press/doctype/drip_email/drip_email.json
@@ -4,7 +4,7 @@
  "allow_rename": 1,
  "autoname": "drip_email.####",
  "creation": "2016-02-29 04:37:05.108042",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "document_type": "Setup",
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/drip_email/drip_email.py b/press/press/doctype/drip_email/drip_email.py
index 292027f3..a1f7cc7b 100644
--- a/press/press/doctype/drip_email/drip_email.py
+++ b/press/press/doctype/drip_email/drip_email.py
@@ -26,7 +26,7 @@ class DripEmail(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.module_setup_guide.module_setup_guide import ModuleSetupGuide
+		from jcloude.jcloude.pagetype.module_setup_guide.module_setup_guide import ModuleSetupGuide
 
 		condition: DF.Code | None
 		content_type: DF.Literal["Rich Text", "Markdown", "HTML"]
@@ -95,10 +95,10 @@ class DripEmail(Document):
 			recipients=[recipient],
 			sender=f"{self.sender_name} <{self.sender}>",
 			reply_to=self.reply_to,
-			reference_doctype="Drip Email",
+			reference_pagetype="Drip Email",
 			reference_name=self.name,
 			unsubscribe_message="Unsubscribe",
-			unsubscribe_method="api/method/jcloude.jcloude.doctype.drip_email.drip_email.unsubscribe",
+			unsubscribe_method="api/method/jcloude.jcloude.pagetype.drip_email.drip_email.unsubscribe",
 			unsubscribe_params={"account_request": account_request.name},
 			attachments=self.get_setup_guides(account_request),
 			template="product_trial_email",
diff --git a/press/press/doctype/drip_email/patches/migrate_to_product_trial_field.py b/press/press/doctype/drip_email/patches/migrate_to_product_trial_field.py
index 570e9763..42d1e5a9 100644
--- a/press/press/doctype/drip_email/patches/migrate_to_product_trial_field.py
+++ b/press/press/doctype/drip_email/patches/migrate_to_product_trial_field.py
@@ -5,5 +5,5 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("Drip Email")
+	jingrow.reload_pagetype("Drip Email")
 	jingrow.db.sql("UPDATE `tabDrip Email` SET product_trial = saas_app")
diff --git a/press/press/doctype/drip_email/patches/set_correct_field_for_html.py b/press/press/doctype/drip_email/patches/set_correct_field_for_html.py
index 2e514acd..16e86917 100644
--- a/press/press/doctype/drip_email/patches/set_correct_field_for_html.py
+++ b/press/press/doctype/drip_email/patches/set_correct_field_for_html.py
@@ -5,5 +5,5 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("Drip Email")
+	jingrow.reload_pagetype("Drip Email")
 	jingrow.db.sql("UPDATE `tabDrip Email` SET message_html = message, content_type = 'HTML'")
diff --git a/press/press/doctype/drip_email/test_drip_email.py b/press/press/doctype/drip_email/test_drip_email.py
index 9bbc2e43..ab435124 100644
--- a/press/press/doctype/drip_email/test_drip_email.py
+++ b/press/press/doctype/drip_email/test_drip_email.py
@@ -10,16 +10,16 @@ from unittest.mock import patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.account_request.test_account_request import (
+from jcloude.jcloude.pagetype.account_request.test_account_request import (
 	create_test_account_request,
 )
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.site_plan_change.test_site_plan_change import create_test_plan
-from jcloude.saas.doctype.product_trial.test_product_trial import create_test_product_trial
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.site_plan_change.test_site_plan_change import create_test_plan
+from jcloude.saas.pagetype.product_trial.test_product_trial import create_test_product_trial
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.drip_email.drip_email import DripEmail
+	from jcloude.jcloude.pagetype.drip_email.drip_email import DripEmail
 
 
 def create_test_drip_email(
@@ -30,7 +30,7 @@ def create_test_drip_email(
 ) -> DripEmail:
 	drip_email = jingrow.get_pg(
 		{
-			"doctype": "Drip Email",
+			"pagetype": "Drip Email",
 			"enabled": 1,
 			"sender": "test@test.com",
 			"sender_name": "Test User",
@@ -129,7 +129,7 @@ class TestDripEmail(FrappeTestCase):
 		self.assertEqual(drip_email.sites_to_send_drip, [site1.name, site3.name])
 
 	def test_welcome_mail_is_sent_for_new_signups(self):
-		from jcloude.jcloude.doctype.drip_email.drip_email import DripEmail, send_welcome_email
+		from jcloude.jcloude.pagetype.drip_email.drip_email import DripEmail, send_welcome_email
 
 		test_app = create_test_app("wiki", "Wiki")
 		test_product_trial = create_test_product_trial(test_app)
diff --git a/press/press/doctype/erpnext_app/erpnext_app.json b/press/press/doctype/erpnext_app/erpnext_app.json
index 5f28ee3a..8efed61d 100644
--- a/press/press/doctype/erpnext_app/erpnext_app.json
+++ b/press/press/doctype/erpnext_app/erpnext_app.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-03-31 11:08:26.860569",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/erpnext_consultant/erpnext_consultant.json b/press/press/doctype/erpnext_consultant/erpnext_consultant.json
index 60fe2725..bec20e88 100644
--- a/press/press/doctype/erpnext_consultant/erpnext_consultant.json
+++ b/press/press/doctype/erpnext_consultant/erpnext_consultant.json
@@ -3,7 +3,7 @@
  "allow_import": 1,
  "autoname": "field:user",
  "creation": "2019-01-23 14:20:56.285285",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/erpnext_consultant/erpnext_consultant.py b/press/press/doctype/erpnext_consultant/erpnext_consultant.py
index ae9c2fe1..42ec6296 100644
--- a/press/press/doctype/erpnext_consultant/erpnext_consultant.py
+++ b/press/press/doctype/erpnext_consultant/erpnext_consultant.py
@@ -17,7 +17,7 @@ class ERPNextConsultant(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.erpnext_consultant_region.erpnext_consultant_region import (
+		from jcloude.jcloude.pagetype.erpnext_consultant_region.erpnext_consultant_region import (
 			ERPNextConsultantRegion,
 		)
 
diff --git a/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.json b/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.json
index 38e0ca63..bcebe6a1 100644
--- a/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.json
+++ b/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-04-29 20:25:56.246263",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/erpnext_site_settings/erpnext_site_settings.json b/press/press/doctype/erpnext_site_settings/erpnext_site_settings.json
index a94b1342..161a7084 100644
--- a/press/press/doctype/erpnext_site_settings/erpnext_site_settings.json
+++ b/press/press/doctype/erpnext_site_settings/erpnext_site_settings.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "field:site",
  "creation": "2022-06-03 14:33:04.239124",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/frappe_version/frappe_version.json b/press/press/doctype/frappe_version/frappe_version.json
index 24603b31..fb30ecd1 100644
--- a/press/press/doctype/frappe_version/frappe_version.json
+++ b/press/press/doctype/frappe_version/frappe_version.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "Prompt",
  "creation": "2020-10-19 17:58:10.458990",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -68,7 +68,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Release Group",
+   "link_pagetype": "Release Group",
    "link_fieldname": "version"
   }
  ],
diff --git a/press/press/doctype/frappe_version/frappe_version.py b/press/press/doctype/frappe_version/frappe_version.py
index 1825c636..2b1744a2 100644
--- a/press/press/doctype/frappe_version/frappe_version.py
+++ b/press/press/doctype/frappe_version/frappe_version.py
@@ -25,7 +25,7 @@ class FrappeVersion(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.jingrow_version_dependency.jingrow_version_dependency import (
+		from jcloude.jcloude.pagetype.jingrow_version_dependency.jingrow_version_dependency import (
 			FrappeVersionDependency,
 		)
 
diff --git a/press/press/doctype/frappe_version/test_frappe_version.py b/press/press/doctype/frappe_version/test_frappe_version.py
index dc3af1f4..64a98746 100644
--- a/press/press/doctype/frappe_version/test_frappe_version.py
+++ b/press/press/doctype/frappe_version/test_frappe_version.py
@@ -11,7 +11,7 @@ class TestFrappeVersion(FrappeTestCase):
 		number = 99  # version with no fixtures
 		jingrow_version = jingrow.get_pg(
 			{
-				"doctype": "Jingrow Version",
+				"pagetype": "Jingrow Version",
 				"name": f"Version {number}",
 				"number": number,
 			}
diff --git a/press/press/doctype/frappe_version_dependency/frappe_version_dependency.json b/press/press/doctype/frappe_version_dependency/frappe_version_dependency.json
index d6887f2e..464f4c04 100644
--- a/press/press/doctype/frappe_version_dependency/frappe_version_dependency.json
+++ b/press/press/doctype/frappe_version_dependency/frappe_version_dependency.json
@@ -2,7 +2,7 @@
  "actions": [],
  "creation": "2023-07-13 12:18:06.259601",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/github_webhook_log/github_webhook_log.json b/press/press/doctype/github_webhook_log/github_webhook_log.json
index a39d0773..7cf1c12e 100644
--- a/press/press/doctype/github_webhook_log/github_webhook_log.json
+++ b/press/press/doctype/github_webhook_log/github_webhook_log.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "Prompt",
  "creation": "2020-05-25 18:47:51.890465",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/github_webhook_log/github_webhook_log.py b/press/press/doctype/github_webhook_log/github_webhook_log.py
index 00d2838c..e93724b9 100644
--- a/press/press/doctype/github_webhook_log/github_webhook_log.py
+++ b/press/press/doctype/github_webhook_log/github_webhook_log.py
@@ -15,7 +15,7 @@ from jingrow.query_builder.functions import Now
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app_source.app_source import AppSource
+	from jcloude.jcloude.pagetype.app_source.app_source import AppSource
 
 
 class GitHubWebhookLog(Document):
@@ -179,7 +179,7 @@ class GitHubWebhookLog(Document):
 
 		tag = jingrow.get_pg(
 			{
-				"doctype": "App Tag",
+				"pagetype": "App Tag",
 				"tag": self.tag,
 				"hash": commit.get("id"),
 				"timestamp": commit.get("timestamp"),
@@ -196,7 +196,7 @@ class GitHubWebhookLog(Document):
 
 	@staticmethod
 	def clear_old_logs(days=30):
-		table = jingrow.qb.DocType("GitHub Webhook Log")
+		table = jingrow.qb.PageType("GitHub Webhook Log")
 		jingrow.db.delete(table, filters=(table.creation < (Now() - Interval(days=days))))
 
 
@@ -238,7 +238,7 @@ def get_repository_details_from_payload(payload: dict):
 def create_app_release(source: str, app: str, commit: dict):
 	release = jingrow.get_pg(
 		{
-			"doctype": "App Release",
+			"pagetype": "App Release",
 			"app": app,
 			"source": source,
 			"hash": commit.get("id"),
diff --git a/press/press/doctype/incident/incident.json b/press/press/doctype/incident/incident.json
index 063b87e0..6c6aae51 100644
--- a/press/press/doctype/incident/incident.json
+++ b/press/press/doctype/incident/incident.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-10-16 18:45:05.744563",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -167,7 +167,7 @@
    "fieldname": "resource_type",
    "fieldtype": "Link",
    "label": "Resource Type",
-   "options": "DocType"
+   "options": "PageType"
   },
   {
    "fieldname": "resource",
diff --git a/press/press/doctype/incident/incident.py b/press/press/doctype/incident/incident.py
index 18ee9aae..cc29a6e8 100644
--- a/press/press/doctype/incident/incident.py
+++ b/press/press/doctype/incident/incident.py
@@ -22,29 +22,29 @@ from tenacity.retry import retry_if_not_result
 from twilio.base.exceptions import TwilioRestException
 
 from jcloude.api.server import prometheus_query
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.bench.bench import Bench
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
-from jcloude.jcloude.doctype.database_server.database_server import DatabaseServer
-from jcloude.jcloude.doctype.server.server import MARIADB_DATA_MNT_POINT
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.bench.bench import Bench
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.database_server.database_server import DatabaseServer
+from jcloude.jcloude.pagetype.server.server import MARIADB_DATA_MNT_POINT
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
 	from jingrow.types import DF
 	from twilio.rest.api.v2010.account.call import CallInstance
 
-	from jcloude.jcloude.doctype.alertmanager_webhook_log.alertmanager_webhook_log import AlertmanagerWebhookLog
-	from jcloude.jcloude.doctype.incident_settings.incident_settings import IncidentSettings
-	from jcloude.jcloude.doctype.incident_settings_self_hosted_user.incident_settings_self_hosted_user import (
+	from jcloude.jcloude.pagetype.alertmanager_webhook_log.alertmanager_webhook_log import AlertmanagerWebhookLog
+	from jcloude.jcloude.pagetype.incident_settings.incident_settings import IncidentSettings
+	from jcloude.jcloude.pagetype.incident_settings_self_hosted_user.incident_settings_self_hosted_user import (
 		IncidentSettingsSelfHostedUser,
 	)
-	from jcloude.jcloude.doctype.incident_settings_user.incident_settings_user import (
+	from jcloude.jcloude.pagetype.incident_settings_user.incident_settings_user import (
 		IncidentSettingsUser,
 	)
-	from jcloude.jcloude.doctype.monitor_server.monitor_server import MonitorServer
-	from jcloude.jcloude.doctype.jcloude_settings.jcloude_settings import PressSettings
-	from jcloude.jcloude.doctype.server.server import Server
+	from jcloude.jcloude.pagetype.monitor_server.monitor_server import MonitorServer
+	from jcloude.jcloude.pagetype.jcloude_settings.jcloude_settings import PressSettings
+	from jcloude.jcloude.pagetype.server.server import Server
 
 INCIDENT_ALERT = "Sites Down"  # TODO: make it a field or child table somewhere #
 INCIDENT_SCOPE = (
@@ -78,9 +78,9 @@ class Incident(WebsiteGenerator):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.incident_alerts.incident_alerts import IncidentAlerts
-		from jcloude.jcloude.doctype.incident_suggestion.incident_suggestion import IncidentSuggestion
-		from jcloude.jcloude.doctype.incident_updates.incident_updates import IncidentUpdates
+		from jcloude.jcloude.pagetype.incident_alerts.incident_alerts import IncidentAlerts
+		from jcloude.jcloude.pagetype.incident_suggestion.incident_suggestion import IncidentSuggestion
+		from jcloude.jcloude.pagetype.incident_updates.incident_updates import IncidentUpdates
 
 		acknowledged_by: DF.Link | None
 		alert: DF.Link | None
@@ -134,7 +134,7 @@ class Incident(WebsiteGenerator):
 		"""
 		try:
 			incident_investigator = jingrow.get_pg(
-				{"doctype": "Incident Investigator", "incident": self.name, "server": self.server}
+				{"pagetype": "Incident Investigator", "incident": self.name, "server": self.server}
 			)
 			incident_investigator.insert(ignore_permissions=True)
 			self.investigation = incident_investigator.name
@@ -449,7 +449,7 @@ class Incident(WebsiteGenerator):
 
 	def call_humans(self):
 		enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_call_humans",
 			queue="default",
@@ -590,7 +590,7 @@ Likely due to insufficient balance or incorrect credentials""",
 			jingrow.sendmail(
 				recipients=get_communication_info("Email", "Server Activity", "Server", self.server),
 				subject=subject,
-				reference_doctype=self.doctype,
+				reference_pagetype=self.pagetype,
 				reference_name=self.name,
 				template="incident",
 				args={
@@ -638,7 +638,7 @@ Likely due to insufficient balance or incorrect credentials""",
 
 	def call_customers(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_call_customers",
 			queue="default",
@@ -658,7 +658,7 @@ Likely due to insufficient balance or incorrect credentials""",
 
 		for phone_no in phone_nos:
 			jingrow.enqueue_pg(
-				self.doctype,
+				self.pagetype,
 				self.name,
 				"_call_customer",
 				queue="default",
@@ -865,7 +865,7 @@ def resolve_incidents():
 
 
 def notify_ignored_servers():
-	servers = jingrow.qb.DocType("Server")
+	servers = jingrow.qb.PageType("Server")
 	if not (
 		ignored_servers := jingrow.qb.from_(servers)
 		.select(servers.name, servers.ignore_incidents_till)
@@ -882,5 +882,5 @@ def notify_ignored_servers():
 	TelegramMessage.enqueue(message)
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	jingrow.db.add_index("Incident", ["alert", "server", "status"])
diff --git a/press/press/doctype/incident/test_incident.py b/press/press/doctype/incident/test_incident.py
index adf78e33..35bb8278 100644
--- a/press/press/doctype/incident/test_incident.py
+++ b/press/press/doctype/incident/test_incident.py
@@ -14,14 +14,14 @@ from hypothesis import given, settings
 from hypothesis import strategies as st
 from twilio.base.exceptions import TwilioRestException
 
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.alertmanager_webhook_log.alertmanager_webhook_log import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.alertmanager_webhook_log.alertmanager_webhook_log import (
 	AlertmanagerWebhookLog,
 )
-from jcloude.jcloude.doctype.alertmanager_webhook_log.test_alertmanager_webhook_log import (
+from jcloude.jcloude.pagetype.alertmanager_webhook_log.test_alertmanager_webhook_log import (
 	create_test_alertmanager_webhook_log,
 )
-from jcloude.jcloude.doctype.incident.incident import (
+from jcloude.jcloude.pagetype.incident.incident import (
 	CALL_REPEAT_INTERVAL_NIGHT,
 	CALL_THRESHOLD_SECONDS_NIGHT,
 	CONFIRMATION_THRESHOLD_SECONDS_NIGHT,
@@ -31,12 +31,12 @@ from jcloude.jcloude.doctype.incident.incident import (
 	resolve_incidents,
 	validate_incidents,
 )
-from jcloude.jcloude.doctype.prometheus_alert_rule.test_prometheus_alert_rule import (
+from jcloude.jcloude.pagetype.prometheus_alert_rule.test_prometheus_alert_rule import (
 	create_test_prometheus_alert_rule,
 )
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.team.test_team import create_test_jcloude_admin_team
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.team.test_team import create_test_jcloude_admin_team
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 from jcloude.utils.test import foreground_enqueue_pg
 
 
@@ -119,16 +119,16 @@ def get_total_firing_and_resolved_for_resolved_incident(draw) -> tuple[int, int,
 
 
 @patch(
-	"jcloude.jcloude.doctype.alertmanager_webhook_log.alertmanager_webhook_log.enqueue_pg",
+	"jcloude.jcloude.pagetype.alertmanager_webhook_log.alertmanager_webhook_log.enqueue_pg",
 	new=foreground_enqueue_pg,
 )
 @patch.object(AlertmanagerWebhookLog, "send_telegram_notification", new=Mock())
 @patch.object(AlertmanagerWebhookLog, "react", new=Mock())
-@patch("jcloude.jcloude.doctype.incident.incident.jingrow.db.commit", new=Mock())
+@patch("jcloude.jcloude.pagetype.incident.incident.jingrow.db.commit", new=Mock())
 @patch.object(AgentJob, "enqueue_http_request", new=Mock())
-@patch("jcloude.jcloude.doctype.site.site._change_dns_record", new=Mock())
-@patch("jcloude.jcloude.doctype.jcloude_settings.jcloude_settings.Client", new=MockTwilioClient)
-@patch("jcloude.jcloude.doctype.incident.incident.enqueue_pg", new=foreground_enqueue_pg)
+@patch("jcloude.jcloude.pagetype.site.site._change_dns_record", new=Mock())
+@patch("jcloude.jcloude.pagetype.jcloude_settings.jcloude_settings.Client", new=MockTwilioClient)
+@patch("jcloude.jcloude.pagetype.incident.incident.enqueue_pg", new=foreground_enqueue_pg)
 @patch("tenacity.nap.time", new=Mock())  # no sleep
 @patch.object(Incident, "sites_down", new=[])
 class TestIncident(FrappeTestCase):
@@ -158,7 +158,7 @@ class TestIncident(FrappeTestCase):
 
 		jingrow.get_pg(
 			{
-				"doctype": "Incident Settings",
+				"pagetype": "Incident Settings",
 				"users": [
 					{
 						"user": user1,
@@ -173,7 +173,7 @@ class TestIncident(FrappeTestCase):
 		).insert()
 
 	@patch(
-		"jcloude.jcloude.doctype.incident.test_incident.MockTwilioCallList.create",
+		"jcloude.jcloude.pagetype.incident.test_incident.MockTwilioCallList.create",
 		wraps=MockTwilioCallList("busy").create,
 	)
 	def test_incident_creation_places_phone_call_to_all_humans_in_incident_team_if_no_one_picks_up(
@@ -181,7 +181,7 @@ class TestIncident(FrappeTestCase):
 	):
 		jingrow.get_pg(
 			{
-				"doctype": "Incident",
+				"pagetype": "Incident",
 				"alertname": "Test Alert",
 			}
 		).insert().call_humans()
@@ -198,26 +198,26 @@ class TestIncident(FrappeTestCase):
 		)
 
 	@patch(
-		"jcloude.jcloude.doctype.incident.test_incident.MockTwilioCallList.create",
+		"jcloude.jcloude.pagetype.incident.test_incident.MockTwilioCallList.create",
 		wraps=MockTwilioCallList("completed").create,
 	)
 	def test_incident_calls_only_one_person_if_first_person_picks_up(self, mock_calls_create: Mock):
 		jingrow.get_pg(
 			{
-				"doctype": "Incident",
+				"pagetype": "Incident",
 				"alertname": "Test Alert",
 			}
 		).insert().call_humans()
 		self.assertEqual(mock_calls_create.call_count, 1)
 
 	@patch(
-		"jcloude.jcloude.doctype.incident.test_incident.MockTwilioCallList.create",
+		"jcloude.jcloude.pagetype.incident.test_incident.MockTwilioCallList.create",
 		wraps=MockTwilioCallList("completed").create,
 	)
 	def test_incident_calls_stop_for_in_progress_state(self, mock_calls_create):
 		incident = jingrow.get_pg(
 			{
-				"doctype": "Incident",
+				"pagetype": "Incident",
 				"alertname": "Test Alert",
 			}
 		).insert()
@@ -227,19 +227,19 @@ class TestIncident(FrappeTestCase):
 		self.assertEqual(len(incident.updates), 1)
 
 	@patch(
-		"jcloude.jcloude.doctype.incident.test_incident.MockTwilioCallList.create",
+		"jcloude.jcloude.pagetype.incident.test_incident.MockTwilioCallList.create",
 		wraps=MockTwilioCallList("ringing").create,
 	)
 	def test_incident_calls_next_person_after_retry_limit(self, mock_calls_create):
 		jingrow.get_pg(
 			{
-				"doctype": "Incident",
+				"pagetype": "Incident",
 				"alertname": "Test Alert",
 			}
 		).insert().call_humans()
 		self.assertEqual(mock_calls_create.call_count, 2)
 
-	@patch("jcloude.jcloude.doctype.incident.incident.Incident.wait_for_pickup", new=Mock())
+	@patch("jcloude.jcloude.pagetype.incident.incident.Incident.wait_for_pickup", new=Mock())
 	def test_incident_gets_created_on_alert_that_meets_conditions(self):
 		incident_count = jingrow.db.count("Incident")
 		create_test_alertmanager_webhook_log()
@@ -269,7 +269,7 @@ class TestIncident(FrappeTestCase):
 		with patch.object(MockTwilioCallList, "create", new=MockTwilioCallList("completed").create):
 			incident = jingrow.get_pg(
 				{
-					"doctype": "Incident",
+					"pagetype": "Incident",
 					"alertname": "Test Alert",
 				}
 			).insert()
@@ -280,7 +280,7 @@ class TestIncident(FrappeTestCase):
 		with patch.object(MockTwilioCallList, "create", new=MockTwilioCallList("no-answer").create):
 			incident = jingrow.get_pg(
 				{
-					"doctype": "Incident",
+					"pagetype": "Incident",
 					"alertname": "Test Alert",
 				}
 			).insert()
@@ -289,21 +289,21 @@ class TestIncident(FrappeTestCase):
 			self.assertEqual(len(incident.updates), 2)
 
 	@patch(
-		"jcloude.jcloude.doctype.incident.test_incident.MockTwilioCallList.create",
+		"jcloude.jcloude.pagetype.incident.test_incident.MockTwilioCallList.create",
 		wraps=MockTwilioCallList("completed").create,
 	)
 	def test_global_phone_call_alerts_disabled_wont_create_phone_calls(self, mock_calls_create):
 		jingrow.db.set_single_value("Incident Settings", "phone_call_alerts", 0)
 		jingrow.get_pg(
 			{
-				"doctype": "Incident",
+				"pagetype": "Incident",
 				"alertname": "Test Alert",
 			}
 		).insert().call_humans()
 		mock_calls_create.assert_not_called()
 		jingrow.get_pg(
 			{
-				"doctype": "Incident",
+				"pagetype": "Incident",
 				"alertname": "Test Alert",
 				"phone_call": False,
 			}
@@ -312,7 +312,7 @@ class TestIncident(FrappeTestCase):
 		jingrow.db.set_single_value("Incident Settings", "phone_call_alerts", 1)
 		jingrow.get_pg(
 			{
-				"doctype": "Incident",
+				"pagetype": "Incident",
 				"alertname": "Test Alert",
 				"phone_call": False,
 			}
@@ -331,13 +331,13 @@ class TestIncident(FrappeTestCase):
 		self.assertEqual(jingrow.db.count("Incident") - 2, incident_count_before)
 
 	@patch(
-		"jcloude.jcloude.doctype.incident.test_incident.MockTwilioMessageList.create",
+		"jcloude.jcloude.pagetype.incident.test_incident.MockTwilioMessageList.create",
 		wraps=MockTwilioMessageList().create,
 	)
 	def test_incident_creation_sends_text_message(self, mock_messages_create: Mock):
 		jingrow.get_pg(
 			{
-				"doctype": "Incident",
+				"pagetype": "Incident",
 				"alertname": "Test Alert",
 			}
 		).insert()
@@ -438,7 +438,7 @@ class TestIncident(FrappeTestCase):
 		self.assertEqual(incident.status, "Validating")
 
 	@patch(
-		"jcloude.jcloude.doctype.incident.test_incident.MockTwilioCallList.create",
+		"jcloude.jcloude.pagetype.incident.test_incident.MockTwilioCallList.create",
 		wraps=MockTwilioCallList("completed").create,
 	)
 	def test_calls_repeated_for_acknowledged_incidents(self, mock_calls_create):
@@ -471,7 +471,7 @@ class TestIncident(FrappeTestCase):
 		)
 
 		with patch(
-			"jcloude.jcloude.doctype.incident.test_incident.MockTwilioCallList.create",
+			"jcloude.jcloude.pagetype.incident.test_incident.MockTwilioCallList.create",
 			side_effect=[
 				MockTwilioCallList("busy").create(),
 				MockTwilioCallList("completed").create(),
@@ -486,7 +486,7 @@ class TestIncident(FrappeTestCase):
 			update_modified=False,
 		)
 		with patch(
-			"jcloude.jcloude.doctype.incident.test_incident.MockTwilioCallList.create",
+			"jcloude.jcloude.pagetype.incident.test_incident.MockTwilioCallList.create",
 			wraps=MockTwilioCallList("completed").create,
 		) as mock_calls_create:
 			resolve_incidents()
@@ -528,7 +528,7 @@ class TestIncident(FrappeTestCase):
 		create_test_alertmanager_webhook_log()
 		incident: Incident = jingrow.get_last_pg("Incident")
 		with patch(
-			"jcloude.jcloude.doctype.incident.incident.prometheus_query",
+			"jcloude.jcloude.pagetype.incident.incident.prometheus_query",
 			side_effect=[
 				self.get_5_min_load_avg_prometheus_response(2.0),
 				self.get_5_min_load_avg_prometheus_response(32.0),
diff --git a/press/press/doctype/incident_alerts/incident_alerts.json b/press/press/doctype/incident_alerts/incident_alerts.json
index 312be114..444a461c 100644
--- a/press/press/doctype/incident_alerts/incident_alerts.json
+++ b/press/press/doctype/incident_alerts/incident_alerts.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-10-17 13:25:42.597749",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/incident_settings/incident_settings.json b/press/press/doctype/incident_settings/incident_settings.json
index 1c3b30c1..7e578795 100644
--- a/press/press/doctype/incident_settings/incident_settings.json
+++ b/press/press/doctype/incident_settings/incident_settings.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-12-14 09:23:55.912233",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/incident_settings/incident_settings.py b/press/press/doctype/incident_settings/incident_settings.py
index 55e82c76..3f57fa4b 100644
--- a/press/press/doctype/incident_settings/incident_settings.py
+++ b/press/press/doctype/incident_settings/incident_settings.py
@@ -16,10 +16,10 @@ class IncidentSettings(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.incident_settings_self_hosted_user.incident_settings_self_hosted_user import (
+		from jcloude.jcloude.pagetype.incident_settings_self_hosted_user.incident_settings_self_hosted_user import (
 			IncidentSettingsSelfHostedUser,
 		)
-		from jcloude.jcloude.doctype.incident_settings_user.incident_settings_user import IncidentSettingsUser
+		from jcloude.jcloude.pagetype.incident_settings_user.incident_settings_user import IncidentSettingsUser
 
 		call_repeat_interval_day: DF.Duration | None
 		call_repeat_interval_night: DF.Duration | None
diff --git a/press/press/doctype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.json b/press/press/doctype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.json
index 574b18b8..df3fbe65 100644
--- a/press/press/doctype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.json
+++ b/press/press/doctype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-01-11 19:05:21.521739",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/incident_settings_user/incident_settings_user.json b/press/press/doctype/incident_settings_user/incident_settings_user.json
index 767a71dc..857688d3 100644
--- a/press/press/doctype/incident_settings_user/incident_settings_user.json
+++ b/press/press/doctype/incident_settings_user/incident_settings_user.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-12-14 09:27:19.932797",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/incident_suggestion/incident_suggestion.json b/press/press/doctype/incident_suggestion/incident_suggestion.json
index 3c7b0f5f..a2b56d53 100644
--- a/press/press/doctype/incident_suggestion/incident_suggestion.json
+++ b/press/press/doctype/incident_suggestion/incident_suggestion.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-01-17 18:18:35.669380",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/incident_updates/incident_updates.json b/press/press/doctype/incident_updates/incident_updates.json
index 35d83c54..f0f79c33 100644
--- a/press/press/doctype/incident_updates/incident_updates.json
+++ b/press/press/doctype/incident_updates/incident_updates.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2023-10-17 18:01:33.787818",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/inspect_trace_id/inspect_trace_id.json b/press/press/doctype/inspect_trace_id/inspect_trace_id.json
index bef92997..f839ec1e 100644
--- a/press/press/doctype/inspect_trace_id/inspect_trace_id.json
+++ b/press/press/doctype/inspect_trace_id/inspect_trace_id.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-05-12 18:24:34.545167",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "trace_id",
diff --git a/press/press/doctype/invoice/fixtures/stripe_payment_intent_succeeded_webhook.json b/press/press/doctype/invoice/fixtures/stripe_payment_intent_succeeded_webhook.json
index fdcb9a50..981971b4 100644
--- a/press/press/doctype/invoice/fixtures/stripe_payment_intent_succeeded_webhook.json
+++ b/press/press/doctype/invoice/fixtures/stripe_payment_intent_succeeded_webhook.json
@@ -1,6 +1,6 @@
 {
 	"api_version": "2020-03-02",
-	"cmd": "jcloude.jcloude.doctype.stripe_webhook_log.stripe_webhook_log.stripe_webhook_handler",
+	"cmd": "jcloude.jcloude.pagetype.stripe_webhook_log.stripe_webhook_log.stripe_webhook_handler",
 	"created": 1606748869,
 	"data": {
 		"object": {
diff --git a/press/press/doctype/invoice/invoice.json b/press/press/doctype/invoice/invoice.json
index 911b6101..181a55c8 100644
--- a/press/press/doctype/invoice/invoice.json
+++ b/press/press/doctype/invoice/invoice.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "format:INV-{YYYY}-{#####}",
  "creation": "2020-07-17 18:05:24.317258",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -530,22 +530,22 @@
  "links": [
   {
    "group": "Documents",
-   "link_doctype": "Usage Record",
+   "link_pagetype": "Usage Record",
    "link_fieldname": "invoice"
   },
   {
    "group": "Documents",
-   "link_doctype": "Balance Transaction",
+   "link_pagetype": "Balance Transaction",
    "link_fieldname": "invoice"
   },
   {
    "group": "Documents",
-   "link_doctype": "Stripe Payment Event",
+   "link_pagetype": "Stripe Payment Event",
    "link_fieldname": "invoice"
   },
   {
    "group": "Webhook Logs",
-   "link_doctype": "Stripe Webhook Log",
+   "link_pagetype": "Stripe Webhook Log",
    "link_fieldname": "invoice"
   }
  ],
diff --git a/press/press/doctype/invoice/invoice.py b/press/press/doctype/invoice/invoice.py
index a40991da..bb99f286 100644
--- a/press/press/doctype/invoice/invoice.py
+++ b/press/press/doctype/invoice/invoice.py
@@ -13,8 +13,8 @@ from jingrow.utils.data import fmt_money
 
 from jcloude.api.billing import get_stripe
 from jcloude.api.client import dashboard_whitelist
-from jcloude.jcloude.doctype.auto_scale_record.auto_scale_record import calculate_secondary_server_price
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.auto_scale_record.auto_scale_record import calculate_secondary_server_price
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
 from jcloude.utils import log_error
 from jcloude.utils.billing import (
 	convert_stripe_money,
@@ -25,7 +25,7 @@ from jcloude.utils.billing import (
 )
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.usage_record.usage_record import UsageRecord
+	from jcloude.jcloude.pagetype.usage_record.usage_record import UsageRecord
 
 
 class Invoice(Document):
@@ -37,12 +37,12 @@ class Invoice(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.invoice_credit_allocation.invoice_credit_allocation import (
+		from jcloude.jcloude.pagetype.invoice_credit_allocation.invoice_credit_allocation import (
 			InvoiceCreditAllocation,
 		)
-		from jcloude.jcloude.doctype.invoice_discount.invoice_discount import InvoiceDiscount
-		from jcloude.jcloude.doctype.invoice_item.invoice_item import InvoiceItem
-		from jcloude.jcloude.doctype.invoice_transaction_fee.invoice_transaction_fee import InvoiceTransactionFee
+		from jcloude.jcloude.pagetype.invoice_discount.invoice_discount import InvoiceDiscount
+		from jcloude.jcloude.pagetype.invoice_item.invoice_item import InvoiceItem
+		from jcloude.jcloude.pagetype.invoice_transaction_fee.invoice_transaction_fee import InvoiceTransactionFee
 
 		amended_from: DF.Link | None
 		amount_due: DF.Currency
@@ -136,8 +136,8 @@ class Invoice(Document):
 
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
-		StripeWebhookLog = jingrow.qb.DocType("Stripe Webhook Log")
-		Invoice = jingrow.qb.DocType("Invoice")
+		StripeWebhookLog = jingrow.qb.PageType("Stripe Webhook Log")
+		Invoice = jingrow.qb.PageType("Invoice")
 
 		partner_customer = filters.get("partner_customer")
 		if partner_customer:
@@ -738,7 +738,7 @@ class Invoice(Document):
 		# make reverse entries for credit allocations
 		for transaction in self.credit_allocations:
 			pg = jingrow.get_pg(
-				doctype="Balance Transaction",
+				pagetype="Balance Transaction",
 				team=self.team,
 				type="Adjustment",
 				source=transaction.source,
@@ -796,7 +796,7 @@ class Invoice(Document):
 			total_allocated += allocated
 
 		balance_transaction = jingrow.get_pg(
-			doctype="Balance Transaction",
+			pagetype="Balance Transaction",
 			team=self.team,
 			type="Applied To Invoice",
 			amount=total_allocated * -1,
@@ -823,12 +823,12 @@ class Invoice(Document):
 		if already_exists:
 			return None
 
-		return jingrow.get_pg(doctype="Invoice", team=self.team, period_start=next_start).insert()
+		return jingrow.get_pg(pagetype="Invoice", team=self.team, period_start=next_start).insert()
 
 	def get_pdf(self):
 		print_format = self.meta.default_print_format
 		return jingrow.utils.get_url(
-			f"/api/method/jingrow.utils.print_format.download_pdf?doctype=Invoice&name={self.name}&format={print_format}&no_letterhead=0"
+			f"/api/method/jingrow.utils.print_format.download_pdf?pagetype=Invoice&name={self.name}&format={print_format}&no_letterhead=0"
 		)
 
 	@jingrow.whitelist()
@@ -906,7 +906,7 @@ class Invoice(Document):
 			print_format = jingrow.db.get_single_value("Jcloude Settings", "print_format")
 			params = urlencode(
 				{
-					"doctype": "Sales Invoice",
+					"pagetype": "Sales Invoice",
 					"name": self.jingrow_invoice,
 					"format": print_format,
 					"no_letterhead": 0,
@@ -918,8 +918,8 @@ class Invoice(Document):
 				r.raise_for_status()
 				ret = jingrow.get_pg(
 					{
-						"doctype": "File",
-						"attached_to_doctype": "Invoice",
+						"pagetype": "File",
+						"attached_to_pagetype": "Invoice",
 						"attached_to_name": self.name,
 						"attached_to_field": "invoice_pdf",
 						"folder": "Home/Attachments",
@@ -1005,7 +1005,7 @@ class Invoice(Document):
 
 			params = urlencode(
 				{
-					"doctype": "Sales Invoice",
+					"pagetype": "Sales Invoice",
 					"name": self.mpesa_invoice,
 					"format": print_format,
 					"no_letterhead": 0,
@@ -1017,8 +1017,8 @@ class Invoice(Document):
 				r.raise_for_status()
 				file_pg = jingrow.get_pg(
 					{
-						"doctype": "File",
-						"attached_to_doctype": "Invoice",
+						"pagetype": "File",
+						"attached_to_pagetype": "Invoice",
 						"attached_to_name": self.name,
 						"attached_to_field": "mpesa_invoice_pdf",
 						"folder": "Home/Attachments",
diff --git a/press/press/doctype/invoice/patches/set_free_credits.py b/press/press/doctype/invoice/patches/set_free_credits.py
index 67493061..3b12b403 100644
--- a/press/press/doctype/invoice/patches/set_free_credits.py
+++ b/press/press/doctype/invoice/patches/set_free_credits.py
@@ -7,7 +7,7 @@ from jingrow.utils import update_progress_bar
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "invoice")
+	jingrow.reload_pg("jcloude", "pagetype", "invoice")
 	# only apply to invoices that has credits applied
 	invoices = jingrow.db.get_all(
 		"Invoice", {"docstatus": 1, "applied_credits": (">", 0)}, pluck="name"
diff --git a/press/press/doctype/invoice/patches/set_transaction_details.py b/press/press/doctype/invoice/patches/set_transaction_details.py
index 470b6191..9c19e82c 100644
--- a/press/press/doctype/invoice/patches/set_transaction_details.py
+++ b/press/press/doctype/invoice/patches/set_transaction_details.py
@@ -6,7 +6,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "invoice")
+	jingrow.reload_pg("jcloude", "pagetype", "invoice")
 	invoices = jingrow.db.get_all(
 		"Invoice",
 		{"status": "Paid", "docstatus": 1, "amount_paid": (">", 0), "transaction_amount": 0},
diff --git a/press/press/doctype/invoice/stripe_webhook_handler.py b/press/press/doctype/invoice/stripe_webhook_handler.py
index 71697466..cfb400c6 100644
--- a/press/press/doctype/invoice/stripe_webhook_handler.py
+++ b/press/press/doctype/invoice/stripe_webhook_handler.py
@@ -36,7 +36,7 @@ class StripeWebhookHandler:
 			try:
 				jingrow.get_pg(
 					{
-						"doctype": "Payment Dispute",
+						"pagetype": "Payment Dispute",
 						"event_type": DISPUTE_EVENT_TYPE_MAP[self.webhook_log.event_type],
 						"dispute_id": id,
 						"payment_intent": payment_intent,
@@ -70,7 +70,7 @@ class StripeWebhookHandler:
 		try:
 			jingrow.get_pg(
 				{
-					"doctype": "Stripe Payment Event",
+					"pagetype": "Stripe Payment Event",
 					"invoice": self.invoice.name,
 					"team": self.invoice.team,
 					"event_type": EVENT_TYPE_MAP[event_type],
diff --git a/press/press/doctype/invoice/test_invoice.py b/press/press/doctype/invoice/test_invoice.py
index 68511148..fc96a2e7 100644
--- a/press/press/doctype/invoice/test_invoice.py
+++ b/press/press/doctype/invoice/test_invoice.py
@@ -8,7 +8,7 @@ import jingrow
 from jingrow.tests.utils import FrappeTestCase
 from jingrow.utils.data import add_days, today
 
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 from .invoice import Invoice
 
@@ -25,14 +25,14 @@ class TestInvoice(FrappeTestCase):
 
 	def test_invoice_add_usage_record(self):
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=today(),
 			period_end=add_days(today(), 10),
 		).insert()
 
 		for amount in [10, 20, 30]:
-			usage_record = jingrow.get_pg(doctype="Usage Record", team=self.team.name, amount=amount)
+			usage_record = jingrow.get_pg(pagetype="Usage Record", team=self.team.name, amount=amount)
 			usage_record.insert()
 			usage_record.submit()
 
@@ -48,7 +48,7 @@ class TestInvoice(FrappeTestCase):
 
 	def test_invoice_cancel_usage_record(self):
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=today(),
 			period_end=add_days(today(), 10),
@@ -56,7 +56,7 @@ class TestInvoice(FrappeTestCase):
 
 		usage_records = []
 		for amount in [10, 20, 30, 40]:
-			usage_record = jingrow.get_pg(doctype="Usage Record", team=self.team.name, amount=amount)
+			usage_record = jingrow.get_pg(pagetype="Usage Record", team=self.team.name, amount=amount)
 			usage_record.insert()
 			usage_record.submit()
 			usage_records.append(usage_record)
@@ -76,14 +76,14 @@ class TestInvoice(FrappeTestCase):
 
 	def test_invoice_with_credits_less_than_total(self):
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=today(),
 			period_end=add_days(today(), 10),
 		).insert()
 
 		for amount in [10, 20, 30]:
-			usage_record = jingrow.get_pg(doctype="Usage Record", team=self.team.name, amount=amount)
+			usage_record = jingrow.get_pg(pagetype="Usage Record", team=self.team.name, amount=amount)
 			usage_record.insert()
 			usage_record.submit()
 
@@ -109,14 +109,14 @@ class TestInvoice(FrappeTestCase):
 
 	def test_invoice_with_credits_more_than_total(self):
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=today(),
 			period_end=add_days(today(), 10),
 		).insert()
 
 		for amount in [10, 20, 30]:
-			usage_record = jingrow.get_pg(doctype="Usage Record", team=self.team.name, amount=amount)
+			usage_record = jingrow.get_pg(pagetype="Usage Record", team=self.team.name, amount=amount)
 			usage_record.insert()
 			usage_record.submit()
 
@@ -140,7 +140,7 @@ class TestInvoice(FrappeTestCase):
 		# Team has 100 Free Credits and 1000 Prepaid Credits
 		# Invoice can be paid using credits
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=today(),
 			period_end=add_days(today(), 10),
@@ -172,7 +172,7 @@ class TestInvoice(FrappeTestCase):
 		# Team has 500 Credits left after the first invoice
 		# Invoice due should be 200
 		invoice2 = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=add_days(today(), 11),
 			items=[{"quantity": 1, "rate": 700}],
@@ -206,7 +206,7 @@ class TestInvoice(FrappeTestCase):
 		self.assertEqual(self.team.get_balance(), 1100)
 
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=today(),
 			period_end=add_days(today(), 10),
@@ -234,35 +234,35 @@ class TestInvoice(FrappeTestCase):
 
 	def test_intersecting_invoices(self):
 		invoice1 = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=jingrow.utils.today(),
 			period_end=jingrow.utils.add_days(jingrow.utils.today(), 5),
 		).insert()
 
 		invoice2 = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=jingrow.utils.add_days(jingrow.utils.today(), 1),
 			period_end=jingrow.utils.add_days(jingrow.utils.today(), 6),
 		)
 
 		invoice3 = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=jingrow.utils.today(),
 			period_end=jingrow.utils.add_days(jingrow.utils.today(), 5),
 		)
 
 		invoice4 = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=jingrow.utils.add_days(jingrow.utils.today(), -2),
 			period_end=jingrow.utils.add_days(jingrow.utils.today(), 3),
 		)
 
 		invoice5 = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=jingrow.utils.add_days(invoice1.period_end, 1),
 		)
@@ -276,7 +276,7 @@ class TestInvoice(FrappeTestCase):
 	def test_prepaid_credits(self):
 		from pathlib import Path
 
-		from jcloude.jcloude.doctype.team.team import process_stripe_webhook
+		from jcloude.jcloude.pagetype.team.team import process_stripe_webhook
 
 		self.team.db_set("stripe_customer_id", "cus_H3L4w6RXJPKLQs")
 		# initial balance is 0
@@ -295,7 +295,7 @@ class TestInvoice(FrappeTestCase):
 
 	def test_discount_amount(self):
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=today(),
 			period_end=add_days(today(), 10),
@@ -312,7 +312,7 @@ class TestInvoice(FrappeTestCase):
 
 	def test_discount_percentage(self):
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=today(),
 			period_end=add_days(today(), 10),
@@ -329,7 +329,7 @@ class TestInvoice(FrappeTestCase):
 
 	def test_finalize_invoice_with_total_zero(self):
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=today(),
 			period_end=add_days(today(), 10),
@@ -352,7 +352,7 @@ class TestInvoice(FrappeTestCase):
 		self.team.save()
 
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			period_start=today(),
 			period_end=add_days(today(), 10),
@@ -369,7 +369,7 @@ class TestInvoice(FrappeTestCase):
 	@patch("jcloude.api.billing.get_stripe")
 	def test_create_stripe_invoice_with_prepaid_credits(self, mock_stripe):
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.team.name,
 			type="Prepaid Credits",
 			period_start=today(),
@@ -389,7 +389,7 @@ class TestInvoice(FrappeTestCase):
 		team.save()
 
 		# consume 10 credits
-		invoice = jingrow.get_pg(doctype="Invoice", team=team.name)
+		invoice = jingrow.get_pg(pagetype="Invoice", team=team.name)
 		invoice.append("items", {"quantity": 1, "rate": 10, "amount": 10})
 		invoice.insert()
 
@@ -402,7 +402,7 @@ class TestInvoice(FrappeTestCase):
 		team = create_test_team("test22@example.com")
 		team.allocate_credit_amount(10, source="Prepaid Credits")
 
-		invoice = jingrow.get_pg(doctype="Invoice", team=team.name)
+		invoice = jingrow.get_pg(pagetype="Invoice", team=team.name)
 		invoice.append("items", {"quantity": 1, "rate": 8, "amount": 8})
 		invoice.insert()
 		invoice.finalize_invoice()
@@ -489,7 +489,7 @@ class TestInvoice(FrappeTestCase):
 		team = create_test_team("tax_without_credits@example.com")
 		jingrow.db.set_single_value("Jcloude Settings", "gst_percentage", 0.18)
 
-		invoice = jingrow.get_pg(doctype="Invoice", team=team.name)
+		invoice = jingrow.get_pg(pagetype="Invoice", team=team.name)
 		invoice.append("items", {"quantity": 1, "rate": 10, "amount": 10})
 		invoice.insert()
 
@@ -503,7 +503,7 @@ class TestInvoice(FrappeTestCase):
 		team.allocate_credit_amount(5, source="Prepaid Credits")
 		jingrow.db.set_single_value("Jcloude Settings", "gst_percentage", 0.18)
 
-		invoice = jingrow.get_pg(doctype="Invoice", team=team.name)
+		invoice = jingrow.get_pg(pagetype="Invoice", team=team.name)
 		invoice.append("items", {"quantity": 1, "rate": 10, "amount": 10})
 		invoice.insert()
 
@@ -522,7 +522,7 @@ class TestInvoice(FrappeTestCase):
 		# team.reload()
 		jingrow.db.set_single_value("Jcloude Settings", "gst_percentage", 0.18)
 
-		invoice = jingrow.get_pg(doctype="Invoice", team=team.name)
+		invoice = jingrow.get_pg(pagetype="Invoice", team=team.name)
 		invoice.append("items", {"quantity": 1, "rate": 10, "amount": 10})
 		invoice.insert()
 
@@ -536,7 +536,7 @@ class TestInvoice(FrappeTestCase):
 		team = create_test_team("tax_for_usd_accounts@example.com", "United States")
 		jingrow.db.set_single_value("Jcloude Settings", "gst_percentage", 0.18)
 
-		invoice = jingrow.get_pg(doctype="Invoice", team=team.name)
+		invoice = jingrow.get_pg(pagetype="Invoice", team=team.name)
 		invoice.append("items", {"quantity": 1, "rate": 10, "amount": 10})
 		invoice.insert()
 
@@ -551,7 +551,7 @@ class TestInvoice(FrappeTestCase):
 		team.save()
 		jingrow.db.set_single_value("Jcloude Settings", "npo_discount", 10)
 
-		invoice = jingrow.get_pg(doctype="Invoice", team=team.name)
+		invoice = jingrow.get_pg(pagetype="Invoice", team=team.name)
 		invoice.append("items", {"quantity": 1, "rate": 100, "amount": 100})
 		invoice.insert()
 
diff --git a/press/press/doctype/invoice_credit_allocation/invoice_credit_allocation.json b/press/press/doctype/invoice_credit_allocation/invoice_credit_allocation.json
index 773e4f5e..6d7ca3aa 100644
--- a/press/press/doctype/invoice_credit_allocation/invoice_credit_allocation.json
+++ b/press/press/doctype/invoice_credit_allocation/invoice_credit_allocation.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-11-12 21:19:25.038731",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/invoice_discount/invoice_discount.json b/press/press/doctype/invoice_discount/invoice_discount.json
index 844f6152..bc386930 100644
--- a/press/press/doctype/invoice_discount/invoice_discount.json
+++ b/press/press/doctype/invoice_discount/invoice_discount.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-02-23 01:00:17.427618",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/invoice_item/invoice_item.json b/press/press/doctype/invoice_item/invoice_item.json
index bd7f4a0c..9e079e65 100644
--- a/press/press/doctype/invoice_item/invoice_item.json
+++ b/press/press/doctype/invoice_item/invoice_item.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-07-17 18:04:33.958085",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -51,7 +51,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Document Type",
-   "options": "DocType",
+   "options": "PageType",
    "search_index": 1
   },
   {
diff --git a/press/press/doctype/invoice_transaction_fee/invoice_transaction_fee.json b/press/press/doctype/invoice_transaction_fee/invoice_transaction_fee.json
index a6278ccf..3b262fd9 100644
--- a/press/press/doctype/invoice_transaction_fee/invoice_transaction_fee.json
+++ b/press/press/doctype/invoice_transaction_fee/invoice_transaction_fee.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-11-24 19:46:04.697275",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/log_counter/log_counter.json b/press/press/doctype/log_counter/log_counter.json
index f327187d..f630e6d4 100644
--- a/press/press/doctype/log_counter/log_counter.json
+++ b/press/press/doctype/log_counter/log_counter.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2024-04-19 11:57:50.263215",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "logtype",
@@ -61,7 +61,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Log Type",
-   "options": "DocType",
+   "options": "PageType",
    "read_only": 1,
    "reqd": 1,
    "search_index": 1
diff --git a/press/press/doctype/log_counter/log_counter.py b/press/press/doctype/log_counter/log_counter.py
index 2dfa2b29..1f45ca75 100644
--- a/press/press/doctype/log_counter/log_counter.py
+++ b/press/press/doctype/log_counter/log_counter.py
@@ -8,11 +8,11 @@ from typing import Optional, TypedDict
 import jingrow
 import jingrow.utils
 from jingrow.model.document import Document
-from jingrow.query_builder import DocType
+from jingrow.query_builder import PageType
 from jingrow.query_builder.functions import Count
 from pypika import Order
 
-# DocType: groupby
+# PageType: groupby
 RECORD_FOR: dict[str, str] = {
 	"Error Log": "method",
 }
@@ -49,22 +49,22 @@ class LogCounter(Document):
 
 def record_counts():
 	date = jingrow.utils.now_datetime().date() - datetime.timedelta(days=1)
-	for doctype, groupby in RECORD_FOR.items():
-		record_for_date(doctype, groupby, date)
+	for pagetype, groupby in RECORD_FOR.items():
+		record_for_date(pagetype, groupby, date)
 	jingrow.db.commit()
 
 
 def record_for_date(
-	doctype: str = "Error Log",
+	pagetype: str = "Error Log",
 	groupby: str = "method",
 	date: Optional[datetime.date] = None,
 ):
 	counts = get_counts(
-		doctype,
+		pagetype,
 		groupby,
 		date,
 	)
-	name = get_name(doctype, counts["date"])
+	name = get_name(pagetype, counts["date"])
 	counts_json = json.dumps(counts["counts"], indent=2)
 
 	# Update counts if name value exists
@@ -75,8 +75,8 @@ def record_for_date(
 
 	lc = jingrow.get_pg(
 		{
-			"doctype": "Log Counter",
-			"logtype": doctype,
+			"pagetype": "Log Counter",
+			"logtype": pagetype,
 			"groupby": groupby,
 			"counts": counts_json,
 			"total": counts["total"],
@@ -87,14 +87,14 @@ def record_for_date(
 
 
 def get_counts(
-	doctype: str = "Error Log",
+	pagetype: str = "Error Log",
 	groupby: str = "method",
 	date: Optional[datetime.date] = None,
 ) -> Counts:
 	date_to = date if date else jingrow.utils.now_datetime().date()
 	date_from = date_to - datetime.timedelta(days=1)
 
-	table = DocType(doctype)
+	table = PageType(pagetype)
 	column = table[groupby]
 
 	q = jingrow.qb.from_(table)
@@ -109,8 +109,8 @@ def get_counts(
 	return dict(counts=counts, date=date_to, total=total)
 
 
-def get_name(doctype: str, date: datetime.date):
-	dt_stub = doctype.lower().replace(" ", "_")
+def get_name(pagetype: str, date: datetime.date):
+	dt_stub = pagetype.lower().replace(" ", "_")
 	date_iso = date.isoformat().replace("-", "_")
 	return f"{dt_stub}-{date_iso}"
 
diff --git a/press/press/doctype/log_server/log_server.json b/press/press/doctype/log_server/log_server.json
index 758e3d9e..4e5260f1 100644
--- a/press/press/doctype/log_server/log_server.json
+++ b/press/press/doctype/log_server/log_server.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-05-11 20:38:48.560155",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -222,7 +222,7 @@
  ],
  "links": [
   {
-   "link_doctype": "Ansible Play",
+   "link_pagetype": "Ansible Play",
    "link_fieldname": "server"
   }
  ],
diff --git a/press/press/doctype/log_server/log_server.py b/press/press/doctype/log_server/log_server.py
index 54c26999..b6f109d4 100644
--- a/press/press/doctype/log_server/log_server.py
+++ b/press/press/doctype/log_server/log_server.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import jingrow
 
-from jcloude.jcloude.doctype.server.server import BaseServer
+from jcloude.jcloude.pagetype.server.server import BaseServer
 from jcloude.runner import Ansible
 from jcloude.utils import log_error
 
@@ -103,7 +103,7 @@ class LogServer(BaseServer):
 	@jingrow.whitelist()
 	def install_elasticsearch_exporter(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_install_elasticsearch_exporter",
 			queue="long",
diff --git a/press/press/doctype/logical_replication_backup/logical_replication_backup.json b/press/press/doctype/logical_replication_backup/logical_replication_backup.json
index ef88e9d0..ea0fc80b 100644
--- a/press/press/doctype/logical_replication_backup/logical_replication_backup.json
+++ b/press/press/doctype/logical_replication_backup/logical_replication_backup.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-08-14 12:59:28.001429",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "status",
diff --git a/press/press/doctype/logical_replication_backup/logical_replication_backup.py b/press/press/doctype/logical_replication_backup/logical_replication_backup.py
index 0d9f9728..152e7c8f 100644
--- a/press/press/doctype/logical_replication_backup/logical_replication_backup.py
+++ b/press/press/doctype/logical_replication_backup/logical_replication_backup.py
@@ -9,16 +9,16 @@ from typing import TYPE_CHECKING, Literal
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.ansible_console.ansible_console import AnsibleAdHoc
+from jcloude.jcloude.pagetype.ansible_console.ansible_console import AnsibleAdHoc
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.bench.bench import Bench
-	from jcloude.jcloude.doctype.database_server.database_server import DatabaseServer
-	from jcloude.jcloude.doctype.logical_replication_step.logical_replication_step import LogicalReplicationStep
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
-	from jcloude.jcloude.doctype.server.server import BaseServer, Server
-	from jcloude.jcloude.doctype.server_snapshot.server_snapshot import ServerSnapshot
-	from jcloude.jcloude.doctype.site.site import Site
+	from jcloude.jcloude.pagetype.bench.bench import Bench
+	from jcloude.jcloude.pagetype.database_server.database_server import DatabaseServer
+	from jcloude.jcloude.pagetype.logical_replication_step.logical_replication_step import LogicalReplicationStep
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.server.server import BaseServer, Server
+	from jcloude.jcloude.pagetype.server_snapshot.server_snapshot import ServerSnapshot
+	from jcloude.jcloude.pagetype.site.site import Site
 
 
 StepStatus = Enum("StepStatus", ["Pending", "Running", "Skipped", "Success", "Failure"])
@@ -113,10 +113,10 @@ class LogicalReplicationBackup(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.logical_replication_server.logical_replication_server import (
+		from jcloude.jcloude.pagetype.logical_replication_server.logical_replication_server import (
 			LogicalReplicationServer,
 		)
-		from jcloude.jcloude.doctype.logical_replication_step.logical_replication_step import (
+		from jcloude.jcloude.pagetype.logical_replication_step.logical_replication_step import (
 			LogicalReplicationStep,
 		)
 
@@ -407,8 +407,8 @@ class LogicalReplicationBackup(Document):
 		"""Wait For Servers To Be Online"""
 
 		servers = [["Server", self.server], ["Database Server", self.database_server]]
-		for doctype, name in servers:
-			server: "BaseServer" = jingrow.get_pg(doctype, name)
+		for pagetype, name in servers:
+			server: "BaseServer" = jingrow.get_pg(pagetype, name)
 			if server.status != "Active":
 				time.sleep(1)
 				return StepStatus.Running
@@ -730,7 +730,7 @@ class LogicalReplicationBackup(Document):
 			"Agent Job",
 			{
 				"job_type": "Update Database Host",
-				"reference_doctype": self.doctype,
+				"reference_pagetype": self.pagetype,
 				"reference_name": self.name,
 			},
 		):
@@ -738,7 +738,7 @@ class LogicalReplicationBackup(Document):
 				"Agent Job",
 				{
 					"job_type": "Update Database Host",
-					"reference_doctype": self.doctype,
+					"reference_pagetype": self.pagetype,
 					"reference_name": self.name,
 				},
 				"status",
@@ -753,10 +753,10 @@ class LogicalReplicationBackup(Document):
 
 		agent = self.app_server_pg.agent
 		"""
-		On changing the database server on server doctype, it should automatically update the database host
+		On changing the database server on server pagetype, it should automatically update the database host
 		in all the benches that are associated with this server.
 
-		Do a check here in this doctype as well to reduce chance of affecting by external changes.
+		Do a check here in this pagetype as well to reduce chance of affecting by external changes.
 		"""
 
 		hot_standby_database_server = self.hot_standby_database_server
@@ -771,7 +771,7 @@ class LogicalReplicationBackup(Document):
 				bench.save()
 
 		agent.update_database_host_in_all_benches(
-			self.hot_standby_database_server_pg.private_ip, self.doctype, self.name
+			self.hot_standby_database_server_pg.private_ip, self.pagetype, self.name
 		)
 		return StepStatus.Running
 
@@ -841,7 +841,7 @@ class LogicalReplicationBackup(Document):
 			{
 				"site": self.site,
 				"job_type": "Deactivate Site",
-				"reference_doctype": self.doctype,
+				"reference_pagetype": self.pagetype,
 				"reference_name": self.name,
 			},
 		):
@@ -850,7 +850,7 @@ class LogicalReplicationBackup(Document):
 				{
 					"site": self.site,
 					"job_type": "Deactivate Site",
-					"reference_doctype": self.doctype,
+					"reference_pagetype": self.pagetype,
 					"reference_name": self.name,
 				},
 				"status",
@@ -859,7 +859,7 @@ class LogicalReplicationBackup(Document):
 
 		# Deactivate the site
 		self.app_server_pg.agent.deactivate_site(
-			self.site_pg, reference_doctype=self.doctype, reference_name=self.name
+			self.site_pg, reference_pagetype=self.pagetype, reference_name=self.name
 		)
 		return "Pending"
 
@@ -869,7 +869,7 @@ class LogicalReplicationBackup(Document):
 			{
 				"site": self.site,
 				"job_type": "Activate Site",
-				"reference_doctype": self.doctype,
+				"reference_pagetype": self.pagetype,
 				"reference_name": self.name,
 			},
 		):
@@ -878,7 +878,7 @@ class LogicalReplicationBackup(Document):
 				{
 					"site": self.site,
 					"job_type": "Activate Site",
-					"reference_doctype": self.doctype,
+					"reference_pagetype": self.pagetype,
 					"reference_name": self.name,
 				},
 				"status",
@@ -886,7 +886,7 @@ class LogicalReplicationBackup(Document):
 			)
 
 		self.app_server_pg.agent.activate_site(
-			self.site_pg, reference_doctype=self.doctype, reference_name=self.name
+			self.site_pg, reference_pagetype=self.pagetype, reference_name=self.name
 		)
 		return "Pending"
 
@@ -974,7 +974,7 @@ class LogicalReplicationBackup(Document):
 			self.append("failover_steps", step)
 
 	def callback_to_linked_site_update(self):
-		from jcloude.jcloude.doctype.site_update.site_update import (
+		from jcloude.jcloude.pagetype.site_update.site_update import (
 			process_callback_from_logical_replication_backup,
 		)
 
@@ -1032,7 +1032,7 @@ class LogicalReplicationBackup(Document):
 			return
 
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"execute_step",
 			step_name=next_step_to_run.name,
@@ -1171,7 +1171,7 @@ class LogicalReplicationBackup(Document):
 
 
 def process_logical_replication_backup_deactivate_site_job_update(job):
-	if job.reference_doctype != "Logical Replication Backup":
+	if job.reference_pagetype != "Logical Replication Backup":
 		return
 	if job.status not in ["Success", "Failure", "Delivery Failure"]:
 		return
@@ -1180,7 +1180,7 @@ def process_logical_replication_backup_deactivate_site_job_update(job):
 
 
 def process_logical_replication_backup_activate_site_job_update(job):
-	if job.reference_doctype != "Logical Replication Backup":
+	if job.reference_pagetype != "Logical Replication Backup":
 		return
 	if job.status not in ["Success", "Failure", "Delivery Failure"]:
 		return
@@ -1189,7 +1189,7 @@ def process_logical_replication_backup_activate_site_job_update(job):
 
 
 def process_logical_replication_backup_update_database_host_job_update(job):
-	if job.reference_doctype != "Logical Replication Backup":
+	if job.reference_pagetype != "Logical Replication Backup":
 		return
 	if job.status not in ["Success", "Failure", "Delivery Failure"]:
 		return
diff --git a/press/press/doctype/logical_replication_backup/test_logical_replication_backup.py b/press/press/doctype/logical_replication_backup/test_logical_replication_backup.py
index 53c0ebef..95e71566 100644
--- a/press/press/doctype/logical_replication_backup/test_logical_replication_backup.py
+++ b/press/press/doctype/logical_replication_backup/test_logical_replication_backup.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/logical_replication_server/logical_replication_server.json b/press/press/doctype/logical_replication_server/logical_replication_server.json
index 067d6536..94d0215a 100644
--- a/press/press/doctype/logical_replication_server/logical_replication_server.json
+++ b/press/press/doctype/logical_replication_server/logical_replication_server.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-08-14 17:35:36.329972",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/logical_replication_step/logical_replication_step.json b/press/press/doctype/logical_replication_step/logical_replication_step.json
index f3ff27c2..06210de1 100644
--- a/press/press/doctype/logical_replication_step/logical_replication_step.json
+++ b/press/press/doctype/logical_replication_step/logical_replication_step.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-08-14 15:54:52.129009",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/mail_log/mail_log.json b/press/press/doctype/mail_log/mail_log.json
index f23e3990..c1c14e0a 100644
--- a/press/press/doctype/mail_log/mail_log.json
+++ b/press/press/doctype/mail_log/mail_log.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "QML.#####",
  "creation": "2021-10-24 09:26:16.759715",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/mail_log/mail_log.py b/press/press/doctype/mail_log/mail_log.py
index e29ed18a..34715b78 100644
--- a/press/press/doctype/mail_log/mail_log.py
+++ b/press/press/doctype/mail_log/mail_log.py
@@ -30,6 +30,6 @@ class MailLog(Document):
 	pass
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	jingrow.db.add_index("Mail Log", ["site", "status"])
 	jingrow.db.add_index("Mail Log", ["site", "creation"])
diff --git a/press/press/doctype/mail_setup/mail_setup.json b/press/press/doctype/mail_setup/mail_setup.json
index ba480759..d3d406b0 100644
--- a/press/press/doctype/mail_setup/mail_setup.json
+++ b/press/press/doctype/mail_setup/mail_setup.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-02-28 16:42:45.716872",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/malware_scan/malware_scan.json b/press/press/doctype/malware_scan/malware_scan.json
index e3883196..3360043e 100644
--- a/press/press/doctype/malware_scan/malware_scan.json
+++ b/press/press/doctype/malware_scan/malware_scan.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "hash",
  "creation": "2022-05-22 02:41:30.828632",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/malware_scan/malware_scan.py b/press/press/doctype/malware_scan/malware_scan.py
index f4deedbd..e37afceb 100644
--- a/press/press/doctype/malware_scan/malware_scan.py
+++ b/press/press/doctype/malware_scan/malware_scan.py
@@ -30,7 +30,7 @@ class MalwareScan(Document):
 		self.status = "Pending"
 		self.save()
 		jingrow.db.commit()
-		jingrow.enqueue_pg(self.doctype, self.name, "_check_clamav", queue="default")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_check_clamav", queue="default")
 
 	def _check_clamav(self):
 		try:
@@ -62,7 +62,7 @@ class MalwareScan(Document):
 		self.status = "Pending"
 		self.save()
 		jingrow.db.commit()
-		jingrow.enqueue_pg(self.doctype, self.name, "_start", queue="long", timeout=32000)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_start", queue="long", timeout=32000)
 
 	def _start(self):
 		try:
diff --git a/press/press/doctype/managed_database_service/managed_database_service.json b/press/press/doctype/managed_database_service/managed_database_service.json
index e98faa35..472a77b1 100644
--- a/press/press/doctype/managed_database_service/managed_database_service.json
+++ b/press/press/doctype/managed_database_service/managed_database_service.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "field:database_host",
  "creation": "2024-05-17 16:35:50.107617",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "database_section",
diff --git a/press/press/doctype/mariadb_binlog/mariadb_binlog.json b/press/press/doctype/mariadb_binlog/mariadb_binlog.json
index d69294c0..99fccbce 100644
--- a/press/press/doctype/mariadb_binlog/mariadb_binlog.json
+++ b/press/press/doctype/mariadb_binlog/mariadb_binlog.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-05-08 15:23:10.701619",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "file_name",
diff --git a/press/press/doctype/mariadb_binlog/mariadb_binlog.py b/press/press/doctype/mariadb_binlog/mariadb_binlog.py
index 080227d4..f87a745c 100644
--- a/press/press/doctype/mariadb_binlog/mariadb_binlog.py
+++ b/press/press/doctype/mariadb_binlog/mariadb_binlog.py
@@ -7,14 +7,14 @@ import json
 from typing import TYPE_CHECKING
 
 import jingrow
-from jingrow.desk.doctype.tag.tag import add_tag
+from jingrow.desk.pagetype.tag.tag import add_tag
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.ansible_console.ansible_console import AnsibleAdHoc
+from jcloude.jcloude.pagetype.ansible_console.ansible_console import AnsibleAdHoc
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.remote_file.remote_file import RemoteFile
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.remote_file.remote_file import RemoteFile
 
 
 class MariaDBBinlog(Document):
@@ -101,7 +101,7 @@ def process_upload_binlogs_to_s3_job_update(job: AgentJob):
 	for binlog_file_name, data in offsite_files.items():
 		remote_file = jingrow.get_pg(
 			{
-				"doctype": "Remote File",
+				"pagetype": "Remote File",
 				"file_name": f"{binlog_file_name}.gz",
 				"file_path": data["path"],
 				"file_size": data["size"],
@@ -110,7 +110,7 @@ def process_upload_binlogs_to_s3_job_update(job: AgentJob):
 			}
 		)
 		remote_file.save()
-		add_tag("MariaDB Binlog", remote_file.doctype, remote_file.name)
+		add_tag("MariaDB Binlog", remote_file.pagetype, remote_file.name)
 		binlog_file_remote_files[binlog_file_name] = remote_file.name
 
 	# Update the remote_file field in the binlog files
diff --git a/press/press/doctype/mariadb_stalk/mariadb_stalk.json b/press/press/doctype/mariadb_stalk/mariadb_stalk.json
index fb4360d0..37fcc4b4 100644
--- a/press/press/doctype/mariadb_stalk/mariadb_stalk.json
+++ b/press/press/doctype/mariadb_stalk/mariadb_stalk.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2023-12-21 16:47:05.329972",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "server",
diff --git a/press/press/doctype/mariadb_stalk/mariadb_stalk.py b/press/press/doctype/mariadb_stalk/mariadb_stalk.py
index 1b69e80d..8f90dd9f 100644
--- a/press/press/doctype/mariadb_stalk/mariadb_stalk.py
+++ b/press/press/doctype/mariadb_stalk/mariadb_stalk.py
@@ -22,7 +22,7 @@ class MariaDBStalk(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.mariadb_stalk_diagnostic.mariadb_stalk_diagnostic import (
+		from jcloude.jcloude.pagetype.mariadb_stalk_diagnostic.mariadb_stalk_diagnostic import (
 			MariaDBStalkDiagnostic,
 		)
 
@@ -33,7 +33,7 @@ class MariaDBStalk(Document):
 
 	@staticmethod
 	def clear_old_logs(days=30):
-		table = jingrow.qb.DocType("MariaDB Stalk")
+		table = jingrow.qb.PageType("MariaDB Stalk")
 		stalks = jingrow.db.get_values(
 			table, filters=table.creation < (Now() - Interval(days=days))
 		)
@@ -55,7 +55,7 @@ class MariaDBStalk(Document):
 			return
 		file = jingrow.get_pg(
 			{
-				"doctype": "File",
+				"pagetype": "File",
 				"file_name": filename,
 				"content": compressed,
 				"is_private": True,
@@ -69,7 +69,7 @@ def fetch_stalks():
 		"Database Server", {"status": "Active", "is_stalk_setup": True}, pluck="name"
 	):
 		jingrow.enqueue(
-			"jcloude.jcloude.doctype.mariadb_stalk.mariadb_stalk.fetch_server_stalks",
+			"jcloude.jcloude.pagetype.mariadb_stalk.mariadb_stalk.fetch_server_stalks",
 			server=server,
 			job_id=f"fetch_mariadb_stalk:{server}",
 		)
diff --git a/press/press/doctype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.json b/press/press/doctype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.json
index bb7aaf39..5b18ff52 100644
--- a/press/press/doctype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.json
+++ b/press/press/doctype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2023-12-21 16:57:50.050145",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "type",
diff --git a/press/press/doctype/mariadb_variable/mariadb_variable.json b/press/press/doctype/mariadb_variable/mariadb_variable.json
index c2315fb5..2ccd349b 100644
--- a/press/press/doctype/mariadb_variable/mariadb_variable.json
+++ b/press/press/doctype/mariadb_variable/mariadb_variable.json
@@ -5,7 +5,7 @@
  "autoname": "prompt",
  "creation": "2023-04-29 00:00:12.372588",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/mariadb_variable/mariadb_variable.py b/press/press/doctype/mariadb_variable/mariadb_variable.py
index 936bb294..de5069f4 100644
--- a/press/press/doctype/mariadb_variable/mariadb_variable.py
+++ b/press/press/doctype/mariadb_variable/mariadb_variable.py
@@ -8,7 +8,7 @@ import jingrow
 from jingrow.model.document import Document
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.database_server.database_server import DatabaseServer
+	from jcloude.jcloude.pagetype.database_server.database_server import DatabaseServer
 
 
 class MariaDBVariable(Document):
diff --git a/press/press/doctype/mariadb_variable/test_mariadb_variable.py b/press/press/doctype/mariadb_variable/test_mariadb_variable.py
index 13f4e136..290f7913 100644
--- a/press/press/doctype/mariadb_variable/test_mariadb_variable.py
+++ b/press/press/doctype/mariadb_variable/test_mariadb_variable.py
@@ -4,7 +4,7 @@
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.database_server.test_database_server import (
+from jcloude.jcloude.pagetype.database_server.test_database_server import (
 	create_test_database_server,
 )
 
diff --git a/press/press/doctype/marketplace_app/events.py b/press/press/doctype/marketplace_app/events.py
index 5d0cc160..7ec15096 100644
--- a/press/press/doctype/marketplace_app/events.py
+++ b/press/press/doctype/marketplace_app/events.py
@@ -3,7 +3,7 @@
 
 import jingrow
 
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
 
 
 def auto_review_for_missing_steps():
@@ -33,7 +33,7 @@ def auto_review_for_missing_steps():
 				subject=f"Marketplace App Review: {app_pg.title}",
 				recipients=recipients,
 				template="marketplace_auto_review",
-				reference_doctype="Marketplace App",
+				reference_pagetype="Marketplace App",
 				reference_name=app,
 				args={
 					"logo": logo,
diff --git a/press/press/doctype/marketplace_app/marketplace_app.json b/press/press/doctype/marketplace_app/marketplace_app.json
index 8f0217f1..9007fef8 100644
--- a/press/press/doctype/marketplace_app/marketplace_app.json
+++ b/press/press/doctype/marketplace_app/marketplace_app.json
@@ -3,7 +3,7 @@
  "allow_guest_to_view": 1,
  "allow_rename": 1,
  "creation": "2022-02-04 19:53:27.058972",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -423,17 +423,17 @@
  "links": [
   {
    "group": "General",
-   "link_doctype": "App Release Approval Request",
+   "link_pagetype": "App Release Approval Request",
    "link_fieldname": "marketplace_app"
   },
   {
    "group": "App Subscription",
-   "link_doctype": "Marketplace App Plan",
+   "link_pagetype": "Marketplace App Plan",
    "link_fieldname": "app"
   },
   {
    "group": "App Subscription",
-   "link_doctype": "Marketplace App Subscription",
+   "link_pagetype": "Marketplace App Subscription",
    "link_fieldname": "app"
   }
  ],
diff --git a/press/press/doctype/marketplace_app/marketplace_app.py b/press/press/doctype/marketplace_app/marketplace_app.py
index c7291f76..6248add6 100644
--- a/press/press/doctype/marketplace_app/marketplace_app.py
+++ b/press/press/doctype/marketplace_app/marketplace_app.py
@@ -16,18 +16,18 @@ from jingrow.website.website_generator import WebsiteGenerator
 
 from jcloude.api.client import dashboard_whitelist
 from jcloude.api.github import get_access_token
-from jcloude.marketplace.doctype.marketplace_app_plan.marketplace_app_plan import (
+from jcloude.marketplace.pagetype.marketplace_app_plan.marketplace_app_plan import (
 	get_app_plan_features,
 )
-from jcloude.jcloude.doctype.app.app import new_app as new_app_pg
-from jcloude.jcloude.doctype.app_release_approval_request.app_release_approval_request import (
+from jcloude.jcloude.pagetype.app.app import new_app as new_app_pg
+from jcloude.jcloude.pagetype.app_release_approval_request.app_release_approval_request import (
 	AppReleaseApprovalRequest,
 )
-from jcloude.jcloude.doctype.marketplace_app.utils import get_rating_percentage_distribution
+from jcloude.jcloude.pagetype.marketplace_app.utils import get_rating_percentage_distribution
 from jcloude.utils import get_current_team, get_last_pg
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.site.site import Site
+	from jcloude.jcloude.pagetype.site.site import Site
 
 
 class MarketplaceApp(WebsiteGenerator):
@@ -39,14 +39,14 @@ class MarketplaceApp(WebsiteGenerator):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.marketplace_app_categories.marketplace_app_categories import (
+		from jcloude.jcloude.pagetype.marketplace_app_categories.marketplace_app_categories import (
 			MarketplaceAppCategories,
 		)
-		from jcloude.jcloude.doctype.marketplace_app_screenshot.marketplace_app_screenshot import (
+		from jcloude.jcloude.pagetype.marketplace_app_screenshot.marketplace_app_screenshot import (
 			MarketplaceAppScreenshot,
 		)
-		from jcloude.jcloude.doctype.marketplace_app_version.marketplace_app_version import MarketplaceAppVersion
-		from jcloude.jcloude.doctype.marketplace_localisation_app.marketplace_localisation_app import (
+		from jcloude.jcloude.pagetype.marketplace_app_version.marketplace_app_version import MarketplaceAppVersion
+		from jcloude.jcloude.pagetype.marketplace_localisation_app.marketplace_localisation_app import (
 			MarketplaceLocalisationApp,
 		)
 
@@ -269,7 +269,7 @@ class MarketplaceApp(WebsiteGenerator):
 			# create new app source for version and branch to switch
 			source_pg = jingrow.get_pg(
 				{
-					"doctype": "App Source",
+					"pagetype": "App Source",
 					"app": self.app,
 					"team": self.team,
 					"branch": branch,
@@ -419,8 +419,8 @@ class MarketplaceApp(WebsiteGenerator):
 		context.ratings_summary = ratings_summary
 
 	def get_user_reviews(self) -> list:
-		app_user_review = jingrow.qb.DocType("App User Review")
-		user = jingrow.qb.DocType("User")
+		app_user_review = jingrow.qb.PageType("App User Review")
+		user = jingrow.qb.PageType("User")
 
 		query = (
 			jingrow.qb.from_(app_user_review)
@@ -542,10 +542,10 @@ class MarketplaceApp(WebsiteGenerator):
 
 	@dashboard_whitelist()
 	def site_installs(self):
-		site = jingrow.qb.DocType("Site")
-		site_app = jingrow.qb.DocType("Site App")
-		site_plan = jingrow.qb.DocType("Site Plan")
-		team = jingrow.qb.DocType("Team")
+		site = jingrow.qb.PageType("Site")
+		site_app = jingrow.qb.PageType("Site App")
+		site_plan = jingrow.qb.PageType("Site Plan")
+		team = jingrow.qb.PageType("Team")
 
 		query = (
 			jingrow.qb.from_(site)
diff --git a/press/press/doctype/marketplace_app/patches/convert_images_to_webp.py b/press/press/doctype/marketplace_app/patches/convert_images_to_webp.py
index 3fca4f8c..48d6bcac 100644
--- a/press/press/doctype/marketplace_app/patches/convert_images_to_webp.py
+++ b/press/press/doctype/marketplace_app/patches/convert_images_to_webp.py
@@ -31,7 +31,7 @@ def execute():
 		image_bytes = image_bytes.getvalue()
 		_file = jingrow.get_pg(
 			{
-				"doctype": "File",
+				"pagetype": "File",
 				"attached_to_field": "image",
 				"folder": "Home/Attachments",
 				"file_name": filename,
diff --git a/press/press/doctype/marketplace_app/test_marketplace_app.py b/press/press/doctype/marketplace_app/test_marketplace_app.py
index 32d6a7e9..b83d22a9 100644
--- a/press/press/doctype/marketplace_app/test_marketplace_app.py
+++ b/press/press/doctype/marketplace_app/test_marketplace_app.py
@@ -6,7 +6,7 @@ from __future__ import annotations
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.marketplace_app.utils import (
+from jcloude.jcloude.pagetype.marketplace_app.utils import (
 	get_rating_percentage_distribution,
 	number_k_format,
 )
@@ -15,7 +15,7 @@ from jcloude.jcloude.doctype.marketplace_app.utils import (
 def create_test_marketplace_app(app: str, team: str | None = None, sources: list[dict] | None = None):
 	marketplace_app = jingrow.get_pg(
 		{
-			"doctype": "Marketplace App",
+			"pagetype": "Marketplace App",
 			"app": app,
 			"description": "Test App",
 			"team": team,
diff --git a/press/press/doctype/marketplace_app_categories/marketplace_app_categories.json b/press/press/doctype/marketplace_app_categories/marketplace_app_categories.json
index 67dc10c8..d08f45cf 100644
--- a/press/press/doctype/marketplace_app_categories/marketplace_app_categories.json
+++ b/press/press/doctype/marketplace_app_categories/marketplace_app_categories.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-02-22 14:07:05.005498",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "category"
diff --git a/press/press/doctype/marketplace_app_category/marketplace_app_category.json b/press/press/doctype/marketplace_app_category/marketplace_app_category.json
index 15078de9..844569f8 100644
--- a/press/press/doctype/marketplace_app_category/marketplace_app_category.json
+++ b/press/press/doctype/marketplace_app_category/marketplace_app_category.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "Prompt",
  "creation": "2020-09-03 00:13:41.932937",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/marketplace_app_screenshot/marketplace_app_screenshot.json b/press/press/doctype/marketplace_app_screenshot/marketplace_app_screenshot.json
index 86c77fb1..16f4099e 100644
--- a/press/press/doctype/marketplace_app_screenshot/marketplace_app_screenshot.json
+++ b/press/press/doctype/marketplace_app_screenshot/marketplace_app_screenshot.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-09-02 12:52:39.587791",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/marketplace_app_version/marketplace_app_version.json b/press/press/doctype/marketplace_app_version/marketplace_app_version.json
index b9cedf80..167abc43 100644
--- a/press/press/doctype/marketplace_app_version/marketplace_app_version.json
+++ b/press/press/doctype/marketplace_app_version/marketplace_app_version.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-07-19 12:11:08.469343",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/marketplace_localisation_app/marketplace_localisation_app.json b/press/press/doctype/marketplace_localisation_app/marketplace_localisation_app.json
index 3a96824a..d17cd5cd 100644
--- a/press/press/doctype/marketplace_localisation_app/marketplace_localisation_app.json
+++ b/press/press/doctype/marketplace_localisation_app/marketplace_localisation_app.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-09-11 22:58:01.233719",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/module_setup_guide/module_setup_guide.json b/press/press/doctype/module_setup_guide/module_setup_guide.json
index 649f19b9..64ce624c 100644
--- a/press/press/doctype/module_setup_guide/module_setup_guide.json
+++ b/press/press/doctype/module_setup_guide/module_setup_guide.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-06-02 14:20:54.808451",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/monitor_server/monitor_server.json b/press/press/doctype/monitor_server/monitor_server.json
index 41036e5c..18b5b331 100644
--- a/press/press/doctype/monitor_server/monitor_server.json
+++ b/press/press/doctype/monitor_server/monitor_server.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-03-30 16:42:06.785344",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -275,7 +275,7 @@
  "grid_page_length": 50,
  "links": [
   {
-   "link_doctype": "Ansible Play",
+   "link_pagetype": "Ansible Play",
    "link_fieldname": "server"
   }
  ],
diff --git a/press/press/doctype/monitor_server/monitor_server.py b/press/press/doctype/monitor_server/monitor_server.py
index 76f4a803..dcd21a52 100644
--- a/press/press/doctype/monitor_server/monitor_server.py
+++ b/press/press/doctype/monitor_server/monitor_server.py
@@ -12,7 +12,7 @@ from jingrow.utils.caching import redis_cache
 from jingrow.utils.data import cint
 from requests.auth import HTTPBasicAuth
 
-from jcloude.jcloude.doctype.server.server import BaseServer
+from jcloude.jcloude.pagetype.server.server import BaseServer
 from jcloude.runner import Ansible
 from jcloude.utils import log_error
 
@@ -175,7 +175,7 @@ class MonitorServer(BaseServer):
 
 	@jingrow.whitelist()
 	def reconfigure_monitor_server(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_reconfigure_monitor_server", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_reconfigure_monitor_server", queue="long", timeout=1200)
 
 	def _reconfigure_monitor_server(self):
 		settings = jingrow.get_single("Jcloude Settings")
diff --git a/press/press/doctype/mpesa_payment_record/mpesa_payment_record.json b/press/press/doctype/mpesa_payment_record/mpesa_payment_record.json
index 459015bd..6105664d 100644
--- a/press/press/doctype/mpesa_payment_record/mpesa_payment_record.json
+++ b/press/press/doctype/mpesa_payment_record/mpesa_payment_record.json
@@ -5,7 +5,7 @@
  "autoname": "MP.-.YY.-.MM.-.####",
  "creation": "2025-01-18 10:49:30.186896",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/mpesa_payment_record/mpesa_payment_record.py b/press/press/doctype/mpesa_payment_record/mpesa_payment_record.py
index 1290695c..40f66ea4 100644
--- a/press/press/doctype/mpesa_payment_record/mpesa_payment_record.py
+++ b/press/press/doctype/mpesa_payment_record/mpesa_payment_record.py
@@ -59,5 +59,5 @@ class MpesaPaymentRecord(Document):
 			jingrow.throw(f"Mpesa Payment Record for transaction {self.transaction_id} already exists")
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	jingrow.db.add_unique("Mpesa Payment Record", ["transaction_id"], constraint_name="unique_payment_record")
diff --git a/press/press/doctype/mpesa_payment_record/patches/add_unique_constraint.py b/press/press/doctype/mpesa_payment_record/patches/add_unique_constraint.py
index c0f61c69..f5f94df5 100644
--- a/press/press/doctype/mpesa_payment_record/patches/add_unique_constraint.py
+++ b/press/press/doctype/mpesa_payment_record/patches/add_unique_constraint.py
@@ -2,5 +2,5 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "mpesa_payment_record")
-	jingrow.get_pg("DocType", "Mpesa Payment Record").run_module_method("on_doctype_update")
+	jingrow.reload_pg("jcloude", "pagetype", "mpesa_payment_record")
+	jingrow.get_pg("PageType", "Mpesa Payment Record").run_module_method("on_pagetype_update")
diff --git a/press/press/doctype/mpesa_request_log/mpesa_request_log.json b/press/press/doctype/mpesa_request_log/mpesa_request_log.json
index e8e243be..ad119ac2 100644
--- a/press/press/doctype/mpesa_request_log/mpesa_request_log.json
+++ b/press/press/doctype/mpesa_request_log/mpesa_request_log.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2025-01-18 10:47:18.786442",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/mpesa_setup/mpesa_setup.json b/press/press/doctype/mpesa_setup/mpesa_setup.json
index 30e41bbc..264f7f25 100644
--- a/press/press/doctype/mpesa_setup/mpesa_setup.json
+++ b/press/press/doctype/mpesa_setup/mpesa_setup.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format:{mpesa_setup_id}-{api_type}",
  "creation": "2025-01-17 14:42:39.157512",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "team",
diff --git a/press/press/doctype/nfs_server/nfs_server.json b/press/press/doctype/nfs_server/nfs_server.json
index df7f7dd0..3e4f0d5e 100644
--- a/press/press/doctype/nfs_server/nfs_server.json
+++ b/press/press/doctype/nfs_server/nfs_server.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-01-04 16:30:38.925921",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -210,19 +210,19 @@
  ],
  "links": [
   {
-   "link_doctype": "Ansible Play",
+   "link_pagetype": "Ansible Play",
    "link_fieldname": "server"
   },
   {
-   "link_doctype": "Agent Job",
+   "link_pagetype": "Agent Job",
    "link_fieldname": "server"
   },
   {
-   "link_doctype": "NFS Volume Attachment",
+   "link_pagetype": "NFS Volume Attachment",
    "link_fieldname": "nfs_server"
   },
   {
-   "link_doctype": "NFS Volume Detachment",
+   "link_pagetype": "NFS Volume Detachment",
    "link_fieldname": "nfs_server"
   }
  ],
diff --git a/press/press/doctype/nfs_server/nfs_server.py b/press/press/doctype/nfs_server/nfs_server.py
index 765e81f4..72288176 100644
--- a/press/press/doctype/nfs_server/nfs_server.py
+++ b/press/press/doctype/nfs_server/nfs_server.py
@@ -4,9 +4,9 @@
 
 import jingrow
 
-from jcloude.jcloude.doctype.nfs_volume_attachment.nfs_volume_attachment import NFSVolumeAttachment
-from jcloude.jcloude.doctype.nfs_volume_detachment.nfs_volume_detachment import NFSVolumeDetachment
-from jcloude.jcloude.doctype.server.server import BaseServer
+from jcloude.jcloude.pagetype.nfs_volume_attachment.nfs_volume_attachment import NFSVolumeAttachment
+from jcloude.jcloude.pagetype.nfs_volume_detachment.nfs_volume_detachment import NFSVolumeDetachment
+from jcloude.jcloude.pagetype.server.server import BaseServer
 from jcloude.runner import Ansible
 from jcloude.utils import log_error
 
@@ -98,7 +98,7 @@ class NFSServer(BaseServer):
 		secondary_server = jingrow.get_value("Server", server, "secondary_server")
 		nfs_volume_attachment: NFSVolumeAttachment = jingrow.get_pg(
 			{
-				"doctype": "NFS Volume Attachment",
+				"pagetype": "NFS Volume Attachment",
 				"nfs_server": self.name,
 				"primary_server": server,
 				"secondary_server": secondary_server,
@@ -111,7 +111,7 @@ class NFSServer(BaseServer):
 		secondary_server = jingrow.get_value("Server", server, "secondary_server")
 		nfs_volume_detachment: NFSVolumeDetachment = jingrow.get_pg(
 			{
-				"doctype": "NFS Volume Detachment",
+				"pagetype": "NFS Volume Detachment",
 				"nfs_server": self.name,
 				"primary_server": server,
 				"secondary_server": secondary_server,
diff --git a/press/press/doctype/nfs_server/test_nfs_server.py b/press/press/doctype/nfs_server/test_nfs_server.py
index 292471fa..4ed0b8c2 100644
--- a/press/press/doctype/nfs_server/test_nfs_server.py
+++ b/press/press/doctype/nfs_server/test_nfs_server.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.json b/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.json
index fb42a743..70e0fcee 100644
--- a/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.json
+++ b/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-10-06 18:23:22.045154",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "nfs_settings_section",
@@ -64,7 +64,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Jcloude Notification",
+   "link_pagetype": "Jcloude Notification",
    "link_fieldname": "document_name"
   }
  ],
diff --git a/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.py b/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.py
index 611504bb..7f083796 100644
--- a/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.py
+++ b/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.py
@@ -8,17 +8,17 @@ import jingrow
 from jingrow.model.document import Document
 
 from jcloude.agent import Agent
-from jcloude.jcloude.doctype.auto_scale_record.auto_scale_record import AutoScaleStepFailureHandler
-from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import is_image_in_registry
+from jcloude.jcloude.pagetype.auto_scale_record.auto_scale_record import AutoScaleStepFailureHandler
+from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import is_image_in_registry
 from jcloude.runner import Ansible, Status, StepHandler
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.nfs_volume_attachment_step.nfs_volume_attachment_step import (
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.nfs_volume_attachment_step.nfs_volume_attachment_step import (
 		NFSVolumeAttachmentStep,
 	)
-	from jcloude.jcloude.doctype.server.server import Server
-	from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+	from jcloude.jcloude.pagetype.server.server import Server
+	from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 
 
 class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler):
@@ -30,7 +30,7 @@ class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.nfs_volume_attachment_step.nfs_volume_attachment_step import (
+		from jcloude.jcloude.pagetype.nfs_volume_attachment_step.nfs_volume_attachment_step import (
 			NFSVolumeAttachmentStep,
 		)
 
@@ -119,7 +119,7 @@ class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler):
 		try:
 			agent_job = Agent(primary_server.name).add_servers_to_acl(
 				secondary_server_private_ip=secondary_server_private_ip,
-				reference_doctype=primary_server.doctype,
+				reference_pagetype=primary_server.pagetype,
 				reference_name=primary_server.name,
 			)
 			step.job_type = "Agent Job"
@@ -218,7 +218,7 @@ class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler):
 			secondary_server_private_ip=secondary_server_private_ip,
 			is_primary=True,
 			restart_benches=True,
-			reference_doctype="Server",
+			reference_pagetype="Server",
 			reference_name=self.primary_server,
 		)
 
@@ -299,7 +299,7 @@ class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler):
 			{"document_name": self.secondary_server, "team": team, "plan_type": "Server Plan"},
 		):
 			jingrow.get_pg(
-				doctype="Subscription",
+				pagetype="Subscription",
 				team=team,
 				plan_type="Server Plan",
 				plan=jingrow.db.get_value("Server", self.secondary_server, "plan"),
@@ -334,8 +334,8 @@ class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler):
 			],
 			as_dict=True,
 		)
-		Bench = jingrow.qb.DocType("Bench")
-		DeployCandidateBuild = jingrow.qb.DocType("Deploy Candidate Build")
+		Bench = jingrow.qb.PageType("Bench")
+		DeployCandidateBuild = jingrow.qb.PageType("Deploy Candidate Build")
 		active_bench_images_on_server = (
 			jingrow.qb.from_(Bench)
 			.join(DeployCandidateBuild)
@@ -361,7 +361,7 @@ class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler):
 
 		# At this point we can trigger a agent job to push missing docker images
 		agent_job = Agent(self.primary_server).push_docker_images(
-			images=missing_images, reference_doctype="Server", reference_name=self.primary_server
+			images=missing_images, reference_pagetype="Server", reference_name=self.primary_server
 		)
 
 		step.status = Status.Success
@@ -445,7 +445,7 @@ class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler):
 
 	def execute_mount_steps(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_execute_steps",
 			steps=self.nfs_volume_attachment_steps,
diff --git a/press/press/doctype/nfs_volume_attachment/test_nfs_volume_attachment.py b/press/press/doctype/nfs_volume_attachment/test_nfs_volume_attachment.py
index 03be6680..79ef5283 100644
--- a/press/press/doctype/nfs_volume_attachment/test_nfs_volume_attachment.py
+++ b/press/press/doctype/nfs_volume_attachment/test_nfs_volume_attachment.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/nfs_volume_attachment_step/nfs_volume_attachment_step.json b/press/press/doctype/nfs_volume_attachment_step/nfs_volume_attachment_step.json
index f46e5dcb..898fdb41 100644
--- a/press/press/doctype/nfs_volume_attachment_step/nfs_volume_attachment_step.json
+++ b/press/press/doctype/nfs_volume_attachment_step/nfs_volume_attachment_step.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-10-06 18:30:54.878299",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -43,7 +43,7 @@
    "fieldname": "job_type",
    "fieldtype": "Link",
    "label": "Job Type",
-   "options": "DocType"
+   "options": "PageType"
   },
   {
    "fieldname": "job",
diff --git a/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.json b/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.json
index b07239d0..bd2ccd11 100644
--- a/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.json
+++ b/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-10-08 11:42:59.416534",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "nfs_settings_section",
@@ -55,7 +55,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Jcloude Notification",
+   "link_pagetype": "Jcloude Notification",
    "link_fieldname": "document_name"
   }
  ],
diff --git a/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.py b/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.py
index 4ed1da64..03d19130 100644
--- a/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.py
+++ b/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.py
@@ -8,17 +8,17 @@ import jingrow
 from jingrow.model.document import Document
 
 from jcloude.agent import Agent
-from jcloude.jcloude.doctype.auto_scale_record.auto_scale_record import AutoScaleStepFailureHandler
+from jcloude.jcloude.pagetype.auto_scale_record.auto_scale_record import AutoScaleStepFailureHandler
 from jcloude.runner import Ansible, Status, StepHandler
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.nfs_server.nfs_server import NFSServer
-	from jcloude.jcloude.doctype.nfs_volume_detachment_step.nfs_volume_detachment_step import (
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.nfs_server.nfs_server import NFSServer
+	from jcloude.jcloude.pagetype.nfs_volume_detachment_step.nfs_volume_detachment_step import (
 		NFSVolumeDetachmentStep,
 	)
-	from jcloude.jcloude.doctype.server.server import Server
-	from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+	from jcloude.jcloude.pagetype.server.server import Server
+	from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 
 
 class NFSVolumeDetachment(Document, AutoScaleStepFailureHandler, StepHandler):
@@ -30,7 +30,7 @@ class NFSVolumeDetachment(Document, AutoScaleStepFailureHandler, StepHandler):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.nfs_volume_detachment_step.nfs_volume_detachment_step import (
+		from jcloude.jcloude.pagetype.nfs_volume_detachment_step.nfs_volume_detachment_step import (
 			NFSVolumeDetachmentStep,
 		)
 
@@ -127,7 +127,7 @@ class NFSVolumeDetachment(Document, AutoScaleStepFailureHandler, StepHandler):
 			secondary_server_private_ip=secondary_server_private_ip,
 			is_primary=True,
 			restart_benches=True,
-			reference_doctype="Server",
+			reference_pagetype="Server",
 			reference_name=self.primary_server,
 		)
 
@@ -338,7 +338,7 @@ class NFSVolumeDetachment(Document, AutoScaleStepFailureHandler, StepHandler):
 
 	def execute_mount_steps(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_execute_steps",
 			steps=self.nfs_volume_detachment_steps,
diff --git a/press/press/doctype/nfs_volume_detachment/test_nfs_volume_detachment.py b/press/press/doctype/nfs_volume_detachment/test_nfs_volume_detachment.py
index 60c4c8ee..9da6e758 100644
--- a/press/press/doctype/nfs_volume_detachment/test_nfs_volume_detachment.py
+++ b/press/press/doctype/nfs_volume_detachment/test_nfs_volume_detachment.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/nfs_volume_detachment_step/nfs_volume_detachment_step.json b/press/press/doctype/nfs_volume_detachment_step/nfs_volume_detachment_step.json
index 48a84c79..ce3f2c49 100644
--- a/press/press/doctype/nfs_volume_detachment_step/nfs_volume_detachment_step.json
+++ b/press/press/doctype/nfs_volume_detachment_step/nfs_volume_detachment_step.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-10-08 12:05:49.273995",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -33,7 +33,7 @@
    "fieldname": "job_type",
    "fieldtype": "Link",
    "label": "Job Type",
-   "options": "DocType"
+   "options": "PageType"
   },
   {
    "fieldname": "job",
diff --git a/press/press/doctype/oauth_domain_mapping/oauth_domain_mapping.json b/press/press/doctype/oauth_domain_mapping/oauth_domain_mapping.json
index 512bbe66..71975d40 100644
--- a/press/press/doctype/oauth_domain_mapping/oauth_domain_mapping.json
+++ b/press/press/doctype/oauth_domain_mapping/oauth_domain_mapping.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-05-13 15:31:01.487795",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "social_login_key",
diff --git a/press/press/doctype/partner_payment_payout/partner_payment_payout.js b/press/press/doctype/partner_payment_payout/partner_payment_payout.js
index e03c085c..7b43a474 100644
--- a/press/press/doctype/partner_payment_payout/partner_payment_payout.js
+++ b/press/press/doctype/partner_payment_payout/partner_payment_payout.js
@@ -8,7 +8,7 @@ jingrow.ui.form.on('Partner Payment Payout', {
 				jingrow.call({
 					method: 'jcloude.api.regional_payments.mpesa.utils.fetch_payments',
 					args: {
-						// transaction_doctype: frm.pg.transaction_doctype,
+						// transaction_pagetype: frm.pg.transaction_pagetype,
 						from_date: frm.pg.from_date,
 						to_date: frm.pg.to_date,
 						partner: frm.pg.partner,
diff --git a/press/press/doctype/partner_payment_payout/partner_payment_payout.json b/press/press/doctype/partner_payment_payout/partner_payment_payout.json
index 2b49c9e6..0b7c63e2 100644
--- a/press/press/doctype/partner_payment_payout/partner_payment_payout.json
+++ b/press/press/doctype/partner_payment_payout/partner_payment_payout.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format:PPT-{MM}-{#####}",
  "creation": "2025-01-20 14:16:57.352757",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "section_break_l0lu",
diff --git a/press/press/doctype/partner_payment_payout/partner_payment_payout.py b/press/press/doctype/partner_payment_payout/partner_payment_payout.py
index 113fc9e2..7c79e407 100644
--- a/press/press/doctype/partner_payment_payout/partner_payment_payout.py
+++ b/press/press/doctype/partner_payment_payout/partner_payment_payout.py
@@ -15,7 +15,7 @@ class PartnerPaymentPayout(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.partner_payment_payout_item.partner_payment_payout_item import (
+		from jcloude.jcloude.pagetype.partner_payment_payout_item.partner_payment_payout_item import (
 			PartnerPaymentPayoutItem,
 		)
 
diff --git a/press/press/doctype/partner_payment_payout_item/partner_payment_payout_item.json b/press/press/doctype/partner_payment_payout_item/partner_payment_payout_item.json
index f5c076e1..515796ff 100644
--- a/press/press/doctype/partner_payment_payout_item/partner_payment_payout_item.json
+++ b/press/press/doctype/partner_payment_payout_item/partner_payment_payout_item.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2025-01-20 14:16:33.396639",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/payment_dispute/payment_dispute.json b/press/press/doctype/payment_dispute/payment_dispute.json
index 4bb0d289..c55a8e20 100644
--- a/press/press/doctype/payment_dispute/payment_dispute.json
+++ b/press/press/doctype/payment_dispute/payment_dispute.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-11-30 14:26:12.167431",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/payment_dispute/payment_dispute.py b/press/press/doctype/payment_dispute/payment_dispute.py
index 4523145c..01c72405 100644
--- a/press/press/doctype/payment_dispute/payment_dispute.py
+++ b/press/press/doctype/payment_dispute/payment_dispute.py
@@ -6,7 +6,7 @@ from __future__ import annotations
 # import jingrow
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 
 
 class PaymentDispute(Document):
diff --git a/press/press/doctype/payment_due_extension/payment_due_extension.json b/press/press/doctype/payment_due_extension/payment_due_extension.json
index 98a0ec50..7738debe 100644
--- a/press/press/doctype/payment_due_extension/payment_due_extension.json
+++ b/press/press/doctype/payment_due_extension/payment_due_extension.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-04-14 11:50:10.971387",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "team",
diff --git a/press/press/doctype/payment_gateway/payment_gateway.json b/press/press/doctype/payment_gateway/payment_gateway.json
index d89c4074..c66a64b8 100644
--- a/press/press/doctype/payment_gateway/payment_gateway.json
+++ b/press/press/doctype/payment_gateway/payment_gateway.json
@@ -3,7 +3,7 @@
  "autoname": "field:gateway",
  "creation": "2025-01-18 10:45:52.966302",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "team",
@@ -81,7 +81,7 @@
    "fieldname": "gateway_settings",
    "fieldtype": "Link",
    "label": "Gateway Settings",
-   "options": "DocType"
+   "options": "PageType"
   },
   {
    "fieldname": "column_break_noki",
diff --git a/press/press/doctype/payment_partner_transaction/payment_partner_transaction.json b/press/press/doctype/payment_partner_transaction/payment_partner_transaction.json
index 429a5a94..69a0a9c2 100644
--- a/press/press/doctype/payment_partner_transaction/payment_partner_transaction.json
+++ b/press/press/doctype/payment_partner_transaction/payment_partner_transaction.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "PPT.-.YY.-.MM.-.####",
  "creation": "2025-01-18 10:53:07.242575",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "partner_details_section",
diff --git a/press/press/doctype/payout_order/payout_order.json b/press/press/doctype/payout_order/payout_order.json
index 544f8056..7a0b4b5c 100644
--- a/press/press/doctype/payout_order/payout_order.json
+++ b/press/press/doctype/payout_order/payout_order.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format:PO-{YYYY}-{#####}",
  "creation": "2022-07-05 23:04:55.997511",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/payout_order/payout_order.py b/press/press/doctype/payout_order/payout_order.py
index 2cc1dee0..66f29e80 100644
--- a/press/press/doctype/payout_order/payout_order.py
+++ b/press/press/doctype/payout_order/payout_order.py
@@ -8,8 +8,8 @@ from typing import List
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.invoice_item.invoice_item import InvoiceItem
-from jcloude.jcloude.doctype.payout_order_item.payout_order_item import PayoutOrderItem
+from jcloude.jcloude.pagetype.invoice_item.invoice_item import InvoiceItem
+from jcloude.jcloude.pagetype.payout_order_item.payout_order_item import PayoutOrderItem
 from jcloude.utils import log_error
 
 
@@ -21,7 +21,7 @@ class PayoutOrder(Document):
 
 	if TYPE_CHECKING:
 		from jingrow.types import DF
-		from jcloude.jcloude.doctype.payout_order_item.payout_order_item import PayoutOrderItem
+		from jcloude.jcloude.pagetype.payout_order_item.payout_order_item import PayoutOrderItem
 
 		amended_from: DF.Link | None
 		currency_inr: DF.Data | None
@@ -56,7 +56,7 @@ class PayoutOrder(Document):
 
 	@staticmethod
 	def get_list_query(query):
-		PayoutOrder = jingrow.qb.DocType("Payout Order")
+		PayoutOrder = jingrow.qb.PageType("Payout Order")
 		query = query.where((PayoutOrder.docstatus != 2))
 		return query
 
@@ -102,7 +102,7 @@ class PayoutOrder(Document):
 				if jingrow.db.exists("Marketplace App Payment", row.document_name)
 				else jingrow.get_pg(
 					{
-						"doctype": "Marketplace App Payment",
+						"pagetype": "Marketplace App Payment",
 						"app": row.document_name,
 						"team": self.team,
 					}
@@ -253,9 +253,9 @@ def add_invoice_items_to_po(po, invoice_item_names):
 
 def get_unaccounted_marketplace_invoice_items():
 	# Get all marketplace app invoice items
-	invoice = jingrow.qb.DocType("Invoice")
-	invoice_item = jingrow.qb.DocType("Invoice Item")
-	marketplace_app = jingrow.qb.DocType("Marketplace App")
+	invoice = jingrow.qb.PageType("Invoice")
+	invoice_item = jingrow.qb.PageType("Invoice Item")
+	marketplace_app = jingrow.qb.PageType("Marketplace App")
 
 	items = (
 		jingrow.qb.from_(invoice_item)
@@ -289,7 +289,7 @@ def create_payout_order_from_invoice_items(
 ) -> PayoutOrder:
 	po = jingrow.get_pg(
 		{
-			"doctype": "Payout Order",
+			"pagetype": "Payout Order",
 			"team": team,
 			"mode_of_payment": mode_of_payment,
 			"notes": notes,
diff --git a/press/press/doctype/payout_order/test_payout_order.py b/press/press/doctype/payout_order/test_payout_order.py
index 0742e415..7911fefe 100644
--- a/press/press/doctype/payout_order/test_payout_order.py
+++ b/press/press/doctype/payout_order/test_payout_order.py
@@ -6,16 +6,16 @@ from unittest.mock import Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.invoice.invoice import Invoice
-from jcloude.jcloude.doctype.marketplace_app.test_marketplace_app import (
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.invoice.invoice import Invoice
+from jcloude.jcloude.pagetype.marketplace_app.test_marketplace_app import (
 	create_test_marketplace_app,
 )
-from jcloude.jcloude.doctype.payout_order.payout_order import (
+from jcloude.jcloude.pagetype.payout_order.payout_order import (
 	create_marketplace_payout_orders_monthly,
 	create_payout_order_from_invoice_items,
 )
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 
 @patch.object(Invoice, "create_invoice_on_frappeio", new=Mock())
@@ -79,7 +79,7 @@ class TestPayoutOrder(FrappeTestCase):
 		self.test_team = create_test_team()
 
 		self.test_invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.test_team.name,
 			transaction_amount=1000,
 			transaction_fee=200,
@@ -109,7 +109,7 @@ class TestPayoutOrder(FrappeTestCase):
 		self.test_team = create_test_team(country="United States")
 
 		self.test_invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=self.test_team.name,
 			transaction_amount=1800,
 			transaction_fee=1260,
diff --git a/press/press/doctype/payout_order_item/payout_order_item.json b/press/press/doctype/payout_order_item/payout_order_item.json
index afd4ab58..6e88b626 100644
--- a/press/press/doctype/payout_order_item/payout_order_item.json
+++ b/press/press/doctype/payout_order_item/payout_order_item.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-07-05 23:16:31.202419",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -37,7 +37,7 @@
    "fieldname": "document_type",
    "fieldtype": "Link",
    "label": "Document Type",
-   "options": "DocType",
+   "options": "PageType",
    "reqd": 1
   },
   {
diff --git a/press/press/doctype/physical_backup_group/physical_backup_group.json b/press/press/doctype/physical_backup_group/physical_backup_group.json
index f7bfae45..dccb4c3c 100644
--- a/press/press/doctype/physical_backup_group/physical_backup_group.json
+++ b/press/press/doctype/physical_backup_group/physical_backup_group.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "prompt",
  "creation": "2025-02-18 10:25:00.790197",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "no_of_sites",
diff --git a/press/press/doctype/physical_backup_group/physical_backup_group.py b/press/press/doctype/physical_backup_group/physical_backup_group.py
index 4020bf3e..ad725843 100644
--- a/press/press/doctype/physical_backup_group/physical_backup_group.py
+++ b/press/press/doctype/physical_backup_group/physical_backup_group.py
@@ -18,7 +18,7 @@ class PhysicalBackupGroup(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.physical_backup_group_site.physical_backup_group_site import (
+		from jcloude.jcloude.pagetype.physical_backup_group_site.physical_backup_group_site import (
 			PhysicalBackupGroupSite,
 		)
 
@@ -65,7 +65,7 @@ class PhysicalBackupGroup(Document):
 
 	@jingrow.whitelist()
 	def trigger_next_backup(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_trigger_next_backup", queue="default", at_front=True)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_trigger_next_backup", queue="default", at_front=True)
 		jingrow.msgprint("Triggered next backup")
 
 	def _trigger_next_backup(self):
@@ -117,7 +117,7 @@ class PhysicalBackupGroup(Document):
 			name = self.name + "-" + str(suffix)
 		duplicate_group = jingrow.get_pg(
 			{
-				"doctype": "Physical Backup Group",
+				"pagetype": "Physical Backup Group",
 				"name": name,
 				"site_backups": [
 					{"site": site_backup.site, "status": "Pending"} for site_backup in self.site_backups
diff --git a/press/press/doctype/physical_backup_group_site/physical_backup_group_site.json b/press/press/doctype/physical_backup_group_site/physical_backup_group_site.json
index 12bf800b..d98368cf 100644
--- a/press/press/doctype/physical_backup_group_site/physical_backup_group_site.json
+++ b/press/press/doctype/physical_backup_group_site/physical_backup_group_site.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-02-18 10:31:17.504134",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/physical_backup_restoration/physical_backup_restoration.json b/press/press/doctype/physical_backup_restoration/physical_backup_restoration.json
index f1b113c6..05c2666c 100644
--- a/press/press/doctype/physical_backup_restoration/physical_backup_restoration.json
+++ b/press/press/doctype/physical_backup_restoration/physical_backup_restoration.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-01-10 13:02:39.393157",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "site",
@@ -225,7 +225,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Agent Job",
+   "link_pagetype": "Agent Job",
    "link_fieldname": "reference_name"
   }
  ],
diff --git a/press/press/doctype/physical_backup_restoration/physical_backup_restoration.py b/press/press/doctype/physical_backup_restoration/physical_backup_restoration.py
index 7466b385..707d2709 100644
--- a/press/press/doctype/physical_backup_restoration/physical_backup_restoration.py
+++ b/press/press/doctype/physical_backup_restoration/physical_backup_restoration.py
@@ -15,20 +15,20 @@ import jingrow.utils
 from jingrow.model.document import Document
 
 from jcloude.agent import Agent
-from jcloude.jcloude.doctype.ansible_console.ansible_console import AnsibleAdHoc
-from jcloude.jcloude.doctype.physical_restoration_test.physical_restoration_test import trigger_next_restoration
+from jcloude.jcloude.pagetype.ansible_console.ansible_console import AnsibleAdHoc
+from jcloude.jcloude.pagetype.physical_restoration_test.physical_restoration_test import trigger_next_restoration
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
 	from collections.abc import Callable
 
-	from jcloude.jcloude.doctype.physical_backup_restoration_step.physical_backup_restoration_step import (
+	from jcloude.jcloude.pagetype.physical_backup_restoration_step.physical_backup_restoration_step import (
 		PhysicalBackupRestorationStep,
 	)
-	from jcloude.jcloude.doctype.site.site import Site
-	from jcloude.jcloude.doctype.site_backup.site_backup import SiteBackup
-	from jcloude.jcloude.doctype.virtual_disk_snapshot.virtual_disk_snapshot import VirtualDiskSnapshot
-	from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+	from jcloude.jcloude.pagetype.site.site import Site
+	from jcloude.jcloude.pagetype.site_backup.site_backup import SiteBackup
+	from jcloude.jcloude.pagetype.virtual_disk_snapshot.virtual_disk_snapshot import VirtualDiskSnapshot
+	from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 
 
 StepStatus = Enum("StepStatus", ["Pending", "Running", "Skipped", "Success", "Failure"])
@@ -43,7 +43,7 @@ class PhysicalBackupRestoration(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.physical_backup_restoration_step.physical_backup_restoration_step import (
+		from jcloude.jcloude.pagetype.physical_backup_restoration_step.physical_backup_restoration_step import (
 			PhysicalBackupRestorationStep,
 		)
 
@@ -137,7 +137,7 @@ class PhysicalBackupRestoration(Document):
 
 	def on_update(self):
 		if self.has_value_changed("status") and self.status in ["Success", "Failure"]:
-			from jcloude.jcloude.doctype.site_update.site_update import (
+			from jcloude.jcloude.pagetype.site_update.site_update import (
 				process_physical_backup_restoration_status_update,
 			)
 
@@ -208,13 +208,13 @@ class PhysicalBackupRestoration(Document):
 		"""Deactivate site"""
 		deactivate_site_job = jingrow.db.get_value(
 			"Agent Job",
-			{"job_type": "Deactivate Site", "reference_doctype": self.doctype, "reference_name": self.name},
+			{"job_type": "Deactivate Site", "reference_pagetype": self.pagetype, "reference_name": self.name},
 			["name", "status"],
 		)
 		if not deactivate_site_job:
 			site: Site = jingrow.get_pg("Site", self.site)
 			agent = Agent(site.server)
-			agent.deactivate_site(site, reference_doctype=self.doctype, reference_name=self.name)
+			agent.deactivate_site(site, reference_pagetype=self.pagetype, reference_name=self.name)
 			# Send `Running` status to the queue
 			# So, that the current job can exit for now
 			# Once Snapshot status updated, someone will trigger this job again
@@ -543,7 +543,7 @@ class PhysicalBackupRestoration(Document):
 		"""Activate site"""
 		site: Site = jingrow.get_pg("Site", self.site)
 		agent = Agent(site.server)
-		agent.activate_site(site, reference_doctype=self.doctype, reference_name=self.name)
+		agent.activate_site(site, reference_pagetype=self.pagetype, reference_name=self.name)
 
 	def is_db_files_modified_during_failed_restoration(self):
 		if self.status != "Failure":
@@ -676,7 +676,7 @@ class PhysicalBackupRestoration(Document):
 			self.finish()
 
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"execute_step",
 			step_name=next_step_to_run.name,
@@ -926,7 +926,7 @@ def process_scheduled_restorations():  # noqa: C901
 
 
 def process_job_update(job):
-	if job.reference_doctype != "Physical Backup Restoration":
+	if job.reference_pagetype != "Physical Backup Restoration":
 		return
 
 	pg: PhysicalBackupRestoration = jingrow.get_pg("Physical Backup Restoration", job.reference_name)
@@ -935,7 +935,7 @@ def process_job_update(job):
 
 
 def process_physical_backup_restoration_deactivate_site_job_update(job):
-	if job.reference_doctype != "Physical Backup Restoration":
+	if job.reference_pagetype != "Physical Backup Restoration":
 		return
 	if job.status not in ["Success", "Failure", "Delivery Failure"]:
 		return
diff --git a/press/press/doctype/physical_backup_restoration_step/physical_backup_restoration_step.json b/press/press/doctype/physical_backup_restoration_step/physical_backup_restoration_step.json
index 5488ca27..41d615f2 100644
--- a/press/press/doctype/physical_backup_restoration_step/physical_backup_restoration_step.json
+++ b/press/press/doctype/physical_backup_restoration_step/physical_backup_restoration_step.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-01-10 13:15:34.497717",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/physical_restoration_test/physical_restoration_test.json b/press/press/doctype/physical_restoration_test/physical_restoration_test.json
index 145c6148..8437a804 100644
--- a/press/press/doctype/physical_restoration_test/physical_restoration_test.json
+++ b/press/press/doctype/physical_restoration_test/physical_restoration_test.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-02-18 14:30:59.285081",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "backup_group",
diff --git a/press/press/doctype/physical_restoration_test/physical_restoration_test.py b/press/press/doctype/physical_restoration_test/physical_restoration_test.py
index 720f5a97..16245029 100644
--- a/press/press/doctype/physical_restoration_test/physical_restoration_test.py
+++ b/press/press/doctype/physical_restoration_test/physical_restoration_test.py
@@ -9,8 +9,8 @@ import jingrow
 from jingrow.model.document import Document
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.physical_backup_group.physical_backup_group import PhysicalBackupGroup
-	from jcloude.jcloude.doctype.site_update.site_update import PhysicalBackupRestoration
+	from jcloude.jcloude.pagetype.physical_backup_group.physical_backup_group import PhysicalBackupGroup
+	from jcloude.jcloude.pagetype.site_update.site_update import PhysicalBackupRestoration
 
 
 class PhysicalRestorationTest(Document):
@@ -22,7 +22,7 @@ class PhysicalRestorationTest(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.physical_restoration_test_result.physical_restoration_test_result import (
+		from jcloude.jcloude.pagetype.physical_restoration_test_result.physical_restoration_test_result import (
 			PhysicalRestorationTestResult,
 		)
 
@@ -67,7 +67,7 @@ class PhysicalRestorationTest(Document):
 	def _create_restoration_record(self, site_backup: str) -> PhysicalBackupRestoration:
 		return jingrow.get_pg(
 			{
-				"doctype": "Physical Backup Restoration",
+				"pagetype": "Physical Backup Restoration",
 				"site": self.test_site,
 				"status": "Pending",
 				"site_backup": site_backup,
diff --git a/press/press/doctype/physical_restoration_test_result/physical_restoration_test_result.json b/press/press/doctype/physical_restoration_test_result/physical_restoration_test_result.json
index ff6435bb..f200591c 100644
--- a/press/press/doctype/physical_restoration_test_result/physical_restoration_test_result.json
+++ b/press/press/doctype/physical_restoration_test_result/physical_restoration_test_result.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-02-18 15:18:37.332620",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/plan_change/plan_change.json b/press/press/doctype/plan_change/plan_change.json
index b9554968..6d45a954 100644
--- a/press/press/doctype/plan_change/plan_change.json
+++ b/press/press/doctype/plan_change/plan_change.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2022-09-22 05:40:33.194538",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -21,7 +21,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Document Type",
-   "options": "DocType",
+   "options": "PageType",
    "reqd": 1
   },
   {
diff --git a/press/press/doctype/plan_change/plan_change.py b/press/press/doctype/plan_change/plan_change.py
index 6bf2fa13..f7f70a37 100644
--- a/press/press/doctype/plan_change/plan_change.py
+++ b/press/press/doctype/plan_change/plan_change.py
@@ -43,7 +43,7 @@ class PlanChange(Document):
 
 	def create_subscription(self):
 		jingrow.get_pg(
-			doctype="Subscription",
+			pagetype="Subscription",
 			team=self.team,
 			plan_type="Server Plan",
 			plan=self.to_plan,
@@ -66,7 +66,7 @@ class PlanChange(Document):
 
 		subscription.plan = self.to_plan
 		subscription.flags.updater_reference = {
-			"doctype": self.doctype,
+			"pagetype": self.pagetype,
 			"docname": self.name,
 			"label": _("via Plan Change"),
 		}
diff --git a/press/press/doctype/plan_feature/plan_feature.json b/press/press/doctype/plan_feature/plan_feature.json
index 297d1f79..734a55ee 100644
--- a/press/press/doctype/plan_feature/plan_feature.json
+++ b/press/press/doctype/plan_feature/plan_feature.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2021-12-22 18:49:12.677271",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/press_feedback/press_feedback.json b/press/press/doctype/press_feedback/press_feedback.json
index 0bde3950..a1b0384b 100644
--- a/press/press/doctype/press_feedback/press_feedback.json
+++ b/press/press/doctype/press_feedback/press_feedback.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-08-10 18:57:08.745042",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/press_job/press_job.json b/press/press/doctype/press_job/press_job.json
index 24729c92..95cdf317 100644
--- a/press/press/doctype/press_job/press_job.json
+++ b/press/press/doctype/press_job/press_job.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-09-28 17:46:37.964087",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -88,7 +88,7 @@
    "fieldname": "server_type",
    "fieldtype": "Link",
    "label": "Server Type",
-   "options": "DocType",
+   "options": "PageType",
    "read_only": 1
   },
   {
@@ -171,7 +171,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Jcloude Job Step",
+   "link_pagetype": "Jcloude Job Step",
    "link_fieldname": "job"
   }
  ],
diff --git a/press/press/doctype/press_job/press_job.py b/press/press/doctype/press_job/press_job.py
index 3298a8ae..c7d48d23 100644
--- a/press/press/doctype/press_job/press_job.py
+++ b/press/press/doctype/press_job/press_job.py
@@ -7,7 +7,7 @@ import jingrow
 from jingrow.model.document import Document
 from jingrow.utils import add_days, add_to_date
 
-from jcloude.jcloude.doctype.jcloude_job_step.jcloude_job_step import safe_exec
+from jcloude.jcloude.pagetype.jcloude_job_step.jcloude_job_step import safe_exec
 
 
 class PressJob(Document):
@@ -40,7 +40,7 @@ class PressJob(Document):
 	def before_insert(self):
 		jingrow.db.get_value(self.server_type, self.server, "status", for_update=True)
 		if existing_jobs := jingrow.db.get_all(
-			self.doctype,
+			self.pagetype,
 			{
 				"status": ("in", ["Pending", "Running"]),
 				"server_type": self.server_type,
@@ -68,7 +68,7 @@ class PressJob(Document):
 		for step in job_type.steps:
 			pg = jingrow.get_pg(
 				{
-					"doctype": "Jcloude Job Step",
+					"pagetype": "Jcloude Job Step",
 					"job": self.name,
 					"status": "Pending",
 					"job_type": self.job_type,
@@ -169,7 +169,7 @@ class PressJob(Document):
 
 	def publish_update(self):
 		jingrow.publish_realtime(
-			"jcloude_job_update", doctype=self.doctype, docname=self.name, message=self.detail()
+			"jcloude_job_update", pagetype=self.pagetype, docname=self.name, message=self.detail()
 		)
 
 	@jingrow.whitelist()
diff --git a/press/press/doctype/press_job_step/press_job_step.json b/press/press/doctype/press_job_step/press_job_step.json
index a204c7e9..5a857c29 100644
--- a/press/press/doctype/press_job_step/press_job_step.json
+++ b/press/press/doctype/press_job_step/press_job_step.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-09-28 17:46:17.371345",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/press_job_step/press_job_step.py b/press/press/doctype/press_job_step/press_job_step.py
index c4bd74c4..13313acb 100644
--- a/press/press/doctype/press_job_step/press_job_step.py
+++ b/press/press/doctype/press_job_step/press_job_step.py
@@ -9,7 +9,7 @@ from jingrow.model.document import Document
 from jingrow.utils.safe_exec import safe_exec
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.jcloude_job.jcloude_job import PressJob
+	from jcloude.jcloude.pagetype.jcloude_job.jcloude_job import PressJob
 
 
 class PressJobStep(Document):
diff --git a/press/press/doctype/press_job_type/press_job_type.json b/press/press/doctype/press_job_type/press_job_type.json
index 40ef94c7..d6d182ef 100644
--- a/press/press/doctype/press_job_type/press_job_type.json
+++ b/press/press/doctype/press_job_type/press_job_type.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "prompt",
  "creation": "2022-09-28 17:42:30.798157",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/press_job_type/press_job_type.py b/press/press/doctype/press_job_type/press_job_type.py
index 0c2a05c4..2490882d 100644
--- a/press/press/doctype/press_job_type/press_job_type.py
+++ b/press/press/doctype/press_job_type/press_job_type.py
@@ -14,7 +14,7 @@ class PressJobType(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.jcloude_job_type_step.jcloude_job_type_step import PressJobTypeStep
+		from jcloude.jcloude.pagetype.jcloude_job_type_step.jcloude_job_type_step import PressJobTypeStep
 
 		callback_max_retry: DF.Int
 		callback_script: DF.Code | None
diff --git a/press/press/doctype/press_job_type_step/press_job_type_step.json b/press/press/doctype/press_job_type_step/press_job_type_step.json
index d21203d9..f494d0c3 100644
--- a/press/press/doctype/press_job_type_step/press_job_type_step.json
+++ b/press/press/doctype/press_job_type_step/press_job_type_step.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-09-28 17:41:09.642406",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/press_method_permission/press_method_permission.json b/press/press/doctype/press_method_permission/press_method_permission.json
index 409bfc6e..6d791910 100644
--- a/press/press/doctype/press_method_permission/press_method_permission.json
+++ b/press/press/doctype/press_method_permission/press_method_permission.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-08-09 21:22:15.511701",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -17,7 +17,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Document Type",
-   "options": "DocType",
+   "options": "PageType",
    "reqd": 1
   },
   {
diff --git a/press/press/doctype/press_method_permission/press_method_permission.py b/press/press/doctype/press_method_permission/press_method_permission.py
index a926d422..f5502516 100644
--- a/press/press/doctype/press_method_permission/press_method_permission.py
+++ b/press/press/doctype/press_method_permission/press_method_permission.py
@@ -28,11 +28,11 @@ def available_actions():
 		"Jcloude Method Permission", pluck="document_type", distinct=True
 	)
 
-	for doctype in doctypes:
-		result[doctype] = {
+	for pagetype in doctypes:
+		result[pagetype] = {
 			perm["checkbox_label"]: perm["method"]
 			for perm in jingrow.get_all(
-				"Jcloude Method Permission", {"document_type": doctype}, ["checkbox_label", "method"]
+				"Jcloude Method Permission", {"document_type": pagetype}, ["checkbox_label", "method"]
 			)
 		}
 
diff --git a/press/press/doctype/press_notification/patches/link_reference_doctype_to_notifications.py b/press/press/doctype/press_notification/patches/link_reference_doctype_to_notifications.py
index dcb4e166..56aa529c 100644
--- a/press/press/doctype/press_notification/patches/link_reference_doctype_to_notifications.py
+++ b/press/press/doctype/press_notification/patches/link_reference_doctype_to_notifications.py
@@ -11,16 +11,16 @@ def execute():
 	)
 	for notification in tqdm(notifications):
 		if notification.document_type == "Agent Job":
-			reference_doctype = "Site"
+			reference_pagetype = "Site"
 			reference_pg = jingrow.db.get_value("Agent Job", notification.document_name, "site")
 			if not reference_pg:
-				reference_doctype = "Server"
+				reference_pagetype = "Server"
 				reference_pg = jingrow.db.get_value(
 					"Agent Job", notification.document_name, "server"
 				)
 
 		elif notification.document_type == "Deploy Candidate":
-			reference_doctype = "Release Group"
+			reference_pagetype = "Release Group"
 			reference_pg = jingrow.db.get_value(
 				"Deploy Candidate", notification.document_name, "group"
 			)
@@ -28,6 +28,6 @@ def execute():
 		jingrow.db.set_value(
 			"Jcloude Notification",
 			notification.name,
-			{"reference_doctype": reference_doctype, "reference_name": reference_pg},
+			{"reference_pagetype": reference_pagetype, "reference_name": reference_pg},
 			update_modified=False,
 		)
diff --git a/press/press/doctype/press_notification/press_notification.json b/press/press/doctype/press_notification/press_notification.json
index bdafcd5c..5313c7c6 100644
--- a/press/press/doctype/press_notification/press_notification.json
+++ b/press/press/doctype/press_notification/press_notification.json
@@ -3,13 +3,13 @@
  "allow_rename": 1,
  "creation": "2024-07-05 10:54:14.431684",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
   "team",
   "document_type",
-  "reference_doctype",
+  "reference_pagetype",
   "column_break_brxc",
   "type",
   "document_name",
@@ -63,7 +63,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Document Type",
-   "options": "DocType",
+   "options": "PageType",
    "read_only": 1,
    "reqd": 1
   },
@@ -144,11 +144,11 @@
   },
   {
    "description": "For filtering notifications in the dashboard",
-   "fieldname": "reference_doctype",
+   "fieldname": "reference_pagetype",
    "fieldtype": "Link",
    "hidden": 1,
-   "label": "Reference DocType",
-   "options": "DocType"
+   "label": "Reference PageType",
+   "options": "PageType"
   },
   {
    "description": "For filtering notifications in the dashboard",
@@ -156,7 +156,7 @@
    "fieldtype": "Dynamic Link",
    "hidden": 1,
    "label": "Reference Name",
-   "options": "reference_doctype"
+   "options": "reference_pagetype"
   }
  ],
  "index_web_pages_for_search": 1,
diff --git a/press/press/doctype/press_notification/press_notification.py b/press/press/doctype/press_notification/press_notification.py
index 018f8f66..66916c23 100644
--- a/press/press/doctype/press_notification/press_notification.py
+++ b/press/press/doctype/press_notification/press_notification.py
@@ -6,7 +6,7 @@ import jingrow
 from jingrow.model.document import Document
 
 from jcloude.api.client import dashboard_whitelist
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
 
 
 class PressNotification(Document):
@@ -25,7 +25,7 @@ class PressNotification(Document):
 		is_addressed: DF.Check
 		message: DF.LongText | None
 		read: DF.Check
-		reference_doctype: DF.Link | None
+		reference_pagetype: DF.Link | None
 		reference_name: DF.DynamicLink | None
 		team: DF.Link
 		title: DF.SmallText | None
@@ -102,25 +102,25 @@ class PressNotification(Document):
 def create_new_notification(team, type, document_type, document_name, message):
 	if not jingrow.db.exists("Jcloude Notification", {"document_name": document_name}):
 		if document_type == "Agent Job":
-			reference_doctype = "Site"
+			reference_pagetype = "Site"
 			reference_pg = jingrow.db.get_value("Agent Job", document_name, "site")
 			if not reference_pg:
-				reference_doctype = "Server"
+				reference_pagetype = "Server"
 				reference_pg = jingrow.db.get_value("Agent Job", document_name, "server")
 		elif document_type == "Deploy Candidate":
-			reference_doctype = "Release Group"
+			reference_pagetype = "Release Group"
 			reference_pg = jingrow.db.get_value("Deploy Candidate", document_name, "group")
 
 		jingrow.get_pg(
 			{
-				"doctype": "Jcloude Notification",
+				"pagetype": "Jcloude Notification",
 				"team": team,
 				"type": type,
 				"document_type": document_type,
 				"document_name": document_name or 0,
 				"message": message,
-				"reference_doctype": reference_doctype,
+				"reference_pagetype": reference_pagetype,
 				"reference_name": reference_pg,
 			}
 		).insert()
-		jingrow.publish_realtime("jcloude_notification", doctype="Jcloude Notification", message={"team": team})
+		jingrow.publish_realtime("jcloude_notification", pagetype="Jcloude Notification", message={"team": team})
diff --git a/press/press/doctype/press_notification/test_press_notification.py b/press/press/doctype/press_notification/test_press_notification.py
index bac97b21..e9f2e95a 100644
--- a/press/press/doctype/press_notification/test_press_notification.py
+++ b/press/press/doctype/press_notification/test_press_notification.py
@@ -5,16 +5,16 @@ import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
 from jcloude.api.notifications import get_unread_count
-from jcloude.jcloude.doctype.agent_job.agent_job import poll_pending_jobs
-from jcloude.jcloude.doctype.agent_job.test_agent_job import fake_agent_job
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.deploy_candidate_difference.test_deploy_candidate_difference import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import poll_pending_jobs
+from jcloude.jcloude.pagetype.agent_job.test_agent_job import fake_agent_job
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.deploy_candidate_difference.test_deploy_candidate_difference import (
 	create_test_deploy_candidate_differences,
 )
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.site.test_site import create_test_bench, create_test_site
+from jcloude.jcloude.pagetype.site.test_site import create_test_bench, create_test_site
 
 
 class TestPressNotification(FrappeTestCase):
diff --git a/press/press/doctype/press_permission_group/press_permission_group.json b/press/press/doctype/press_permission_group/press_permission_group.json
index b0d0daff..4ad04b17 100644
--- a/press/press/doctype/press_permission_group/press_permission_group.json
+++ b/press/press/doctype/press_permission_group/press_permission_group.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-08-07 12:47:43.330395",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/press_permission_group/press_permission_group.py b/press/press/doctype/press_permission_group/press_permission_group.py
index c8a8e82a..bf4ccc0d 100644
--- a/press/press/doctype/press_permission_group/press_permission_group.py
+++ b/press/press/doctype/press_permission_group/press_permission_group.py
@@ -22,7 +22,7 @@ class PressPermissionGroup(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.jcloude_permission_group_user.jcloude_permission_group_user import (
+		from jcloude.jcloude.pagetype.jcloude_permission_group_user.jcloude_permission_group_user import (
 			PressPermissionGroupUser,
 		)
 
@@ -60,31 +60,31 @@ class PressPermissionGroup(Document):
 			self.permissions = DEFAULT_PERMISSIONS
 			return
 
-		for doctype, doctype_perms in permissions.items():
-			if doctype not in get_all_restrictable_doctypes() and doctype != "*":
-				jingrow.throw(f"{doctype} is not a valid doctype.")
+		for pagetype, pagetype_perms in permissions.items():
+			if pagetype not in get_all_restrictable_doctypes() and pagetype != "*":
+				jingrow.throw(f"{pagetype} is not a valid pagetype.")
 
-			if not isinstance(doctype_perms, dict):
+			if not isinstance(pagetype_perms, dict):
 				jingrow.throw(
-					f"Invalid perms for {doctype}. Rule must be key-value pairs of document name and document perms."
+					f"Invalid perms for {pagetype}. Rule must be key-value pairs of document name and document perms."
 				)
 
-			for pg_name, pg_perms in doctype_perms.items():
+			for pg_name, pg_perms in pagetype_perms.items():
 				if not isinstance(pg_perms, dict):
 					jingrow.throw(
-						f"Invalid perms for {doctype} {pg_name}. Rule must be key-value pairs of method and permission."
+						f"Invalid perms for {pagetype} {pg_name}. Rule must be key-value pairs of method and permission."
 					)
 
-				if doctype == "*":
+				if pagetype == "*":
 					continue
 
-				restrictable_methods = get_all_restrictable_methods(doctype)
+				restrictable_methods = get_all_restrictable_methods(pagetype)
 				if not restrictable_methods:
-					jingrow.throw(f"{doctype} does not have any restrictable methods.")
+					jingrow.throw(f"{pagetype} does not have any restrictable methods.")
 
 				for method, _permitted in pg_perms.items():
 					if method != "*" and method not in restrictable_methods:
-						jingrow.throw(f"{method} is not a restrictable method of {doctype}")
+						jingrow.throw(f"{method} is not a restrictable method of {pagetype}")
 
 	def validate_users(self):
 		for user in self.users:
@@ -143,11 +143,11 @@ class PressPermissionGroup(Document):
 		self.save()
 
 	@dashboard_whitelist()
-	def get_all_document_permissions(self, doctype: str) -> list:
+	def get_all_document_permissions(self, pagetype: str) -> list:
 		"""
 		Get the permissions for the specified document type or all restrictable document types.
 
-		:param doctype: The doctype for which permissions are to be retrieved.
+		:param pagetype: The pagetype for which permissions are to be retrieved.
 		:return: A list of dictionaries containing the document type, document name, and permissions for each document.
 		"""
 		from jcloude.api.client import get_list
@@ -158,19 +158,19 @@ class PressPermissionGroup(Document):
 		if not (jingrow.local.system_user() or user_belongs_to_group or user_is_team_owner):
 			jingrow.throw(f"{user} does not belong to {self.name}")
 
-		if doctype not in get_all_restrictable_doctypes():
-			jingrow.throw(f"{doctype} is not a valid restrictable doctype.")
+		if pagetype not in get_all_restrictable_doctypes():
+			jingrow.throw(f"{pagetype} is not a valid restrictable pagetype.")
 
-		restrictable_methods = get_all_restrictable_methods(doctype)
+		restrictable_methods = get_all_restrictable_methods(pagetype)
 		if not restrictable_methods:
-			jingrow.throw(f"{doctype} does not have any restrictable methods.")
+			jingrow.throw(f"{pagetype} does not have any restrictable methods.")
 
 		options = []
-		fields = ["name", "title"] if doctype != "Site" else ["name"]
-		docs = get_list(doctype=doctype, fields=fields, limit=9999)
+		fields = ["name", "title"] if pagetype != "Site" else ["name"]
+		docs = get_list(pagetype=pagetype, fields=fields, limit=9999)
 
 		for pg in docs:
-			permitted_methods = get_permitted_methods(doctype, pg.name, group_names=[self.name])
+			permitted_methods = get_permitted_methods(pagetype, pg.name, group_names=[self.name])
 			pg_perms = []
 			for method, label in restrictable_methods.items():
 				is_permitted = method in permitted_methods
@@ -183,7 +183,7 @@ class PressPermissionGroup(Document):
 				)
 			options.append(
 				{
-					"document_type": doctype,
+					"document_type": pagetype,
 					"document_name": pg.title or pg.name,
 					"permissions": pg_perms,
 				}
@@ -194,34 +194,34 @@ class PressPermissionGroup(Document):
 	@dashboard_whitelist()
 	def update_permissions(self, updated_permissions):
 		cur_permissions = jingrow.parse_json(self.permissions)
-		for updated_doctype, updated_doctype_perms in updated_permissions.items():
-			if updated_doctype not in cur_permissions:
-				cur_permissions[updated_doctype] = {}
+		for updated_pagetype, updated_pagetype_perms in updated_permissions.items():
+			if updated_pagetype not in cur_permissions:
+				cur_permissions[updated_pagetype] = {}
 
-			for updated_docname, updated_docperms in updated_doctype_perms.items():
+			for updated_docname, updated_docperms in updated_pagetype_perms.items():
 				if updated_docname == "*":
-					cur_permissions[updated_doctype] = {"*": updated_docperms}
+					cur_permissions[updated_pagetype] = {"*": updated_docperms}
 					continue
-				if updated_docname not in cur_permissions[updated_doctype]:
-					cur_permissions[updated_doctype][updated_docname] = {}
+				if updated_docname not in cur_permissions[updated_pagetype]:
+					cur_permissions[updated_pagetype][updated_docname] = {}
 
 				for method, permitted in updated_docperms.items():
-					cur_permissions[updated_doctype][updated_docname][method] = permitted
+					cur_permissions[updated_pagetype][updated_docname][method] = permitted
 
 		self.permissions = cur_permissions
 		self.save()
 
 
-def has_method_permission(doctype: str, name: str, method: str, group_names: list | None = None):
+def has_method_permission(pagetype: str, name: str, method: str, group_names: list | None = None):
 	if jingrow.local.system_user():
 		return True
 
 	user = jingrow.session.user
 
-	if doctype not in get_all_restrictable_doctypes():
+	if pagetype not in get_all_restrictable_doctypes():
 		return True
 
-	if method not in get_all_restrictable_methods(doctype):
+	if method not in get_all_restrictable_methods(pagetype):
 		return True
 
 	if not group_names:
@@ -231,29 +231,29 @@ def has_method_permission(doctype: str, name: str, method: str, group_names: lis
 		# user does not have any restricted permissions set in any group
 		return True
 
-	if method in get_permitted_methods(doctype, name, group_names):
+	if method in get_permitted_methods(pagetype, name, group_names):
 		return True
 
 	return False
 
 
-def get_permitted_methods(doctype: str, name: str, group_names: list | None = None) -> list:
+def get_permitted_methods(pagetype: str, name: str, group_names: list | None = None) -> list:
 	user = jingrow.session.user
 
-	if doctype not in get_all_restrictable_doctypes():
-		jingrow.throw(f"{doctype} is not a valid restrictable doctype.")
+	if pagetype not in get_all_restrictable_doctypes():
+		jingrow.throw(f"{pagetype} is not a valid restrictable pagetype.")
 
 	permissions_by_group = {}
 	permission_groups = group_names or get_permission_groups(user)
 	for group_name in set(permission_groups):
-		permissions_by_group[group_name] = get_method_perms_for_group(doctype, name, group_name)
+		permissions_by_group[group_name] = get_method_perms_for_group(pagetype, name, group_name)
 
-	method_perms = resolve_pg_permissions(doctype, permissions_by_group)
+	method_perms = resolve_pg_permissions(pagetype, permissions_by_group)
 	permitted_methods = [method for method, permitted in method_perms.items() if permitted]
 	return list(set(permitted_methods))
 
 
-def get_method_perms_for_group(doctype: str, name: str, group_name: str) -> list:
+def get_method_perms_for_group(pagetype: str, name: str, group_name: str) -> list:
 	permissions = jingrow.db.get_value("Jcloude Permission Group", group_name, "permissions")
 
 	if not permissions:
@@ -261,12 +261,12 @@ def get_method_perms_for_group(doctype: str, name: str, group_name: str) -> list
 		return {"*": True}
 
 	permissions = jingrow.parse_json(permissions)
-	doctype_perms = permissions.get(doctype, None) or permissions.get("*", None)
-	if not doctype_perms:
+	pagetype_perms = permissions.get(pagetype, None) or permissions.get("*", None)
+	if not pagetype_perms:
 		# this group allows all methods of all documents
 		return {"*": True}
 
-	pg_perms = doctype_perms.get(name, None) or doctype_perms.get("*", None)
+	pg_perms = pagetype_perms.get(name, None) or pagetype_perms.get("*", None)
 	if not pg_perms:
 		# this group allows all methods of this document
 		return {"*": True}
@@ -274,7 +274,7 @@ def get_method_perms_for_group(doctype: str, name: str, group_name: str) -> list
 	return pg_perms
 
 
-def resolve_pg_permissions(doctype, permissions_by_group: dict) -> dict:  # noqa: C901
+def resolve_pg_permissions(pagetype, permissions_by_group: dict) -> dict:  # noqa: C901
 	"""
 	Permission Resolution Logic:
 	- if a group has *: True and another group has *: False, then all the methods are allowed
@@ -283,7 +283,7 @@ def resolve_pg_permissions(doctype, permissions_by_group: dict) -> dict:  # noqa
 	"""
 	method_perms = {}
 
-	all_methods = get_all_restrictable_methods(doctype)
+	all_methods = get_all_restrictable_methods(pagetype)
 	all_restricted = {method: False for method in all_methods}
 	all_allowed = {method: True for method in all_methods}
 
@@ -318,7 +318,7 @@ def get_all_restrictable_doctypes() -> list:
 	return ["Site", "Release Group"]
 
 
-def get_all_restrictable_methods(doctype: str) -> list:
+def get_all_restrictable_methods(pagetype: str) -> list:
 	methods = {
 		"Site": {
 			# method: label,
@@ -336,7 +336,7 @@ def get_all_restrictable_methods(doctype: str) -> list:
 			"restart": "Restart",
 		},
 	}
-	return methods.get(doctype, {})
+	return methods.get(pagetype, {})
 
 
 def get_permission_groups(user: str | None = None) -> list:
diff --git a/press/press/doctype/press_permission_group/test_press_permission_group.py b/press/press/doctype/press_permission_group/test_press_permission_group.py
index 9c4a7011..02f6e3e4 100644
--- a/press/press/doctype/press_permission_group/test_press_permission_group.py
+++ b/press/press/doctype/press_permission_group/test_press_permission_group.py
@@ -4,11 +4,11 @@
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.jcloude_permission_group.jcloude_permission_group import (
+from jcloude.jcloude.pagetype.jcloude_permission_group.jcloude_permission_group import (
 	get_all_restrictable_methods,
 	has_method_permission,
 )
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 
 class TestPressPermissionGroup(FrappeTestCase):
@@ -61,12 +61,12 @@ class TestPressPermissionGroup(FrappeTestCase):
 		jingrow.set_user(self.team_member.name)
 		self.assertEqual(has_method_permission("Site", "site1.test", "reinstall"), False)
 
-	def test_update_permissions_with_invalid_doctype(self):
+	def test_update_permissions_with_invalid_pagetype(self):
 		jingrow.set_user("Administrator")
 		self.assertRaises(
 			jingrow.ValidationError,
 			self.perm_group.update_permissions,
-			{"Invalid Doctype": {"*": {"*": True}}},
+			{"Invalid Pagetype": {"*": {"*": True}}},
 		)
 
 	def test_update_permissions_with_invalid_method(self):
@@ -125,7 +125,7 @@ class TestPressPermissionGroup(FrappeTestCase):
 		jingrow.set_user("user@example.com")
 		self.assertRaises(jingrow.ValidationError, self.perm_group.get_all_document_permissions, "Site")
 
-		# Test case 3: Invalid restrictable doctype
+		# Test case 3: Invalid restrictable pagetype
 		jingrow.set_user("Administrator")
 		self.assertRaises(
 			jingrow.ValidationError,
@@ -133,7 +133,7 @@ class TestPressPermissionGroup(FrappeTestCase):
 			"InvalidDoctype",
 		)
 
-		# Test case 4: No restrictable methods for the doctype
+		# Test case 4: No restrictable methods for the pagetype
 		self.assertRaises(jingrow.ValidationError, self.perm_group.get_all_document_permissions, "DocType2")
 
 
diff --git a/press/press/doctype/press_permission_group_user/press_permission_group_user.json b/press/press/doctype/press_permission_group_user/press_permission_group_user.json
index 7ac7dbaa..df85e616 100644
--- a/press/press/doctype/press_permission_group_user/press_permission_group_user.json
+++ b/press/press/doctype/press_permission_group_user/press_permission_group_user.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2023-08-07 13:20:37.357116",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/press_role/patches/migrate_permissions.py b/press/press/doctype/press_role/patches/migrate_permissions.py
index f7d68141..d69ef863 100644
--- a/press/press/doctype/press_role/patches/migrate_permissions.py
+++ b/press/press/doctype/press_role/patches/migrate_permissions.py
@@ -54,7 +54,7 @@ def migrate_group_permissions(team):
 			fieldname = perm.document_type.lower().replace(" ", "_")
 			jingrow.get_pg(
 				{
-					"doctype": "Jcloude Role Permission",
+					"pagetype": "Jcloude Role Permission",
 					"role": role.name,
 					"team": team,
 					fieldname: perm.document_name,
diff --git a/press/press/doctype/press_role/press_role.json b/press/press/doctype/press_role/press_role.json
index aec1da20..397114a6 100644
--- a/press/press/doctype/press_role/press_role.json
+++ b/press/press/doctype/press_role/press_role.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "hash",
  "creation": "2024-05-13 11:44:03.637522",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "title",
diff --git a/press/press/doctype/press_role/press_role.py b/press/press/doctype/press_role/press_role.py
index 1df844cb..bc6c04dd 100644
--- a/press/press/doctype/press_role/press_role.py
+++ b/press/press/doctype/press_role/press_role.py
@@ -13,7 +13,7 @@ from jcloude.guards import team_guard
 from jcloude.utils import get_current_team
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.team.team import Team
+	from jcloude.jcloude.pagetype.team.team import Team
 
 
 class PressRole(Document):
@@ -25,8 +25,8 @@ class PressRole(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.jcloude_role_resource.jcloude_role_resource import PressRoleResource
-		from jcloude.jcloude.doctype.jcloude_role_user.jcloude_role_user import PressRoleUser
+		from jcloude.jcloude.pagetype.jcloude_role_resource.jcloude_role_resource import PressRoleResource
+		from jcloude.jcloude.pagetype.jcloude_role_user.jcloude_role_user import PressRoleUser
 
 		admin_access: DF.Check
 		allow_apps: DF.Check
@@ -70,7 +70,7 @@ class PressRole(Document):
 		self.validate_duplicate_title()
 
 	def validate_duplicate_title(self):
-		exists = jingrow.db.exists({"doctype": "Jcloude Role", "title": self.title, "team": self.team})
+		exists = jingrow.db.exists({"pagetype": "Jcloude Role", "title": self.title, "team": self.team})
 		if self.is_new() and exists:
 			message = _("Role with title {0} already exists in this team").format(self.title)
 			jingrow.throw(message, jingrow.DuplicateEntryError)
@@ -152,7 +152,7 @@ def create_user_resource(document: Document, _):
 	roles_enabled = bool(
 		jingrow.db.exists(
 			{
-				"doctype": "Jcloude Role",
+				"pagetype": "Jcloude Role",
 				"team": get_current_team(),
 			}
 		)
@@ -161,7 +161,7 @@ def create_user_resource(document: Document, _):
 		return
 	jingrow.get_pg(
 		{
-			"doctype": "Jcloude Role",
+			"pagetype": "Jcloude Role",
 			"title": user + " / " + document.name,
 			"team": team,
 			"users": [
@@ -171,7 +171,7 @@ def create_user_resource(document: Document, _):
 			],
 			"resources": [
 				{
-					"document_type": document.doctype,
+					"document_type": document.pagetype,
 					"document_name": document.name,
 				}
 			],
diff --git a/press/press/doctype/press_role/test_press_role.py b/press/press/doctype/press_role/test_press_role.py
index 6b0dd3ad..becac3ec 100644
--- a/press/press/doctype/press_role/test_press_role.py
+++ b/press/press/doctype/press_role/test_press_role.py
@@ -5,7 +5,7 @@ import jingrow
 from jingrow.model.naming import make_autoname
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 
 class TestPressRole(FrappeTestCase):
diff --git a/press/press/doctype/press_role_permission/press_role_permission.json b/press/press/doctype/press_role_permission/press_role_permission.json
index d94d2cbd..0047e6bf 100644
--- a/press/press/doctype/press_role_permission/press_role_permission.json
+++ b/press/press/doctype/press_role_permission/press_role_permission.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-05-13 11:34:13.051627",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "team",
diff --git a/press/press/doctype/press_role_resource/press_role_resource.json b/press/press/doctype/press_role_resource/press_role_resource.json
index 85f78a10..38cb9446 100644
--- a/press/press/doctype/press_role_resource/press_role_resource.json
+++ b/press/press/doctype/press_role_resource/press_role_resource.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-12-17 21:37:40.933463",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -15,7 +15,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Document Type",
-   "options": "DocType",
+   "options": "PageType",
    "reqd": 1
   },
   {
diff --git a/press/press/doctype/press_role_user/press_role_user.json b/press/press/doctype/press_role_user/press_role_user.json
index 2e7a5540..be1df834 100644
--- a/press/press/doctype/press_role_user/press_role_user.json
+++ b/press/press/doctype/press_role_user/press_role_user.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-05-13 11:45:15.610737",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/press_settings/patches/move_stripe_credentials_to_press_settings.py b/press/press/doctype/press_settings/patches/move_stripe_credentials_to_press_settings.py
index 7c38388b..a8fc8f90 100644
--- a/press/press/doctype/press_settings/patches/move_stripe_credentials_to_press_settings.py
+++ b/press/press/doctype/press_settings/patches/move_stripe_credentials_to_press_settings.py
@@ -6,13 +6,13 @@ def execute():
 
 	stripe_account = jingrow.db.get_single_value("Jcloude Settings", "stripe_account")
 
-	# Fetch credentials from "Stripe Settings" doctype
+	# Fetch credentials from "Stripe Settings" pagetype
 	secret_key = get_decrypted_password("Stripe Settings", stripe_account, "secret_key")
 	publishable_key = jingrow.db.get_value(
 		"Stripe Settings", stripe_account, "publishable_key"
 	)
 
-	jingrow.reload_doctype("Jcloude Settings")
+	jingrow.reload_pagetype("Jcloude Settings")
 
 	# Set credentials in Jcloude Settings
 	jingrow.db.set_single_value("Jcloude Settings", "stripe_publishable_key", publishable_key)
diff --git a/press/press/doctype/press_settings/patches/set_minimum_rebuild_memory.py b/press/press/doctype/press_settings/patches/set_minimum_rebuild_memory.py
index afb89b8b..981414fc 100644
--- a/press/press/doctype/press_settings/patches/set_minimum_rebuild_memory.py
+++ b/press/press/doctype/press_settings/patches/set_minimum_rebuild_memory.py
@@ -7,11 +7,11 @@ import typing
 import jingrow
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.jcloude_settings.jcloude_settings import PressSettings
+	from jcloude.jcloude.pagetype.jcloude_settings.jcloude_settings import PressSettings
 
 
 def execute():
-	jingrow.reload_doctype("Jcloude Settings")
+	jingrow.reload_pagetype("Jcloude Settings")
 	settings: PressSettings = jingrow.get_single("Jcloude Settings")
 
 	if not settings.minimum_rebuild_memory:
diff --git a/press/press/doctype/press_settings/patches/set_press_monitoring_password.py b/press/press/doctype/press_settings/patches/set_press_monitoring_password.py
index 75e8ac0e..19095f1e 100644
--- a/press/press/doctype/press_settings/patches/set_press_monitoring_password.py
+++ b/press/press/doctype/press_settings/patches/set_press_monitoring_password.py
@@ -2,7 +2,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("Jcloude Settings")
+	jingrow.reload_pagetype("Jcloude Settings")
 	settings = jingrow.get_single("Jcloude Settings")
 	try:
 		settings.get_password("jcloude_monitoring_password")
diff --git a/press/press/doctype/press_settings/patches/set_redis_cache_size.py b/press/press/doctype/press_settings/patches/set_redis_cache_size.py
index 8d019652..8136fc32 100644
--- a/press/press/doctype/press_settings/patches/set_redis_cache_size.py
+++ b/press/press/doctype/press_settings/patches/set_redis_cache_size.py
@@ -3,7 +3,7 @@ from jingrow.core.utils import find
 
 
 def execute():
-	jingrow.reload_doctype("Jcloude Settings")
+	jingrow.reload_pagetype("Jcloude Settings")
 	settings = jingrow.get_single("Jcloude Settings")
 	if not settings.redis_cache_size:
 		redis_cache_size_field = find(settings.meta.fields, lambda x: x.fieldname == "redis_cache_size")
diff --git a/press/press/doctype/press_settings/press_settings.json b/press/press/doctype/press_settings/press_settings.json
index 87e8f7d5..d8c90854 100644
--- a/press/press/doctype/press_settings/press_settings.json
+++ b/press/press/doctype/press_settings/press_settings.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2022-02-08 15:13:48.372783",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/press_settings/press_settings.py b/press/press/doctype/press_settings/press_settings.py
index db433f58..c440e5ae 100644
--- a/press/press/doctype/press_settings/press_settings.py
+++ b/press/press/doctype/press_settings/press_settings.py
@@ -10,7 +10,7 @@ from jingrow.utils import get_url, validate_email_address
 from twilio.rest import Client
 
 from jcloude.api.billing import get_stripe
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 from jcloude.telegram_utils import Telegram
 
 
@@ -23,8 +23,8 @@ class PressSettings(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.app_group.app_group import AppGroup
-		from jcloude.jcloude.doctype.erpnext_app.erpnext_app import ERPNextApp
+		from jcloude.jcloude.pagetype.app_group.app_group import AppGroup
+		from jcloude.jcloude.pagetype.erpnext_app.erpnext_app import ERPNextApp
 
 		agent_github_access_token: DF.Data | None
 		agent_repository_owner: DF.Data | None
@@ -215,7 +215,7 @@ class PressSettings(Document):
 	def create_stripe_webhook(self):
 		stripe = get_stripe()
 		url = jingrow.utils.get_url(
-			"/api/method/jcloude.jcloude.doctype.stripe_webhook_log.stripe_webhook_log.stripe_webhook_handler"
+			"/api/method/jcloude.jcloude.pagetype.stripe_webhook_log.stripe_webhook_log.stripe_webhook_handler"
 		)
 		webhook = stripe.WebhookEndpoint.create(
 			url=url,
diff --git a/press/press/doctype/press_settings/test_press_settings.py b/press/press/doctype/press_settings/test_press_settings.py
index 61c22fe1..d461dff1 100644
--- a/press/press/doctype/press_settings/test_press_settings.py
+++ b/press/press/doctype/press_settings/test_press_settings.py
@@ -5,7 +5,7 @@
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.cluster.test_cluster import create_test_cluster
+from jcloude.jcloude.pagetype.cluster.test_cluster import create_test_cluster
 
 
 def create_test_jcloude_settings():
@@ -14,7 +14,7 @@ def create_test_jcloude_settings():
 	if not jingrow.db.exists("TLS Certificate", "*.fc.dev"):
 		jingrow.get_pg(
 			{
-				"doctype": "TLS Certificate",
+				"pagetype": "TLS Certificate",
 				"name": "*.fc.dev",
 				"domain": "fc.dev",
 				"wildcard": True,
@@ -25,7 +25,7 @@ def create_test_jcloude_settings():
 
 	jingrow.get_pg(
 		{
-			"doctype": "Root Domain",
+			"pagetype": "Root Domain",
 			"name": "fc.dev",
 			"dns_provider": "AWS Route 53",
 			"default_cluster": "Default",
diff --git a/press/press/doctype/press_tag/press_tag.json b/press/press/doctype/press_tag/press_tag.json
index 371ec864..44f7a711 100644
--- a/press/press/doctype/press_tag/press_tag.json
+++ b/press/press/doctype/press_tag/press_tag.json
@@ -3,13 +3,13 @@
  "allow_rename": 1,
  "creation": "2023-07-02 00:06:18.990686",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
   "team",
   "tag",
-  "doctype_name"
+  "pagetype_name"
  ],
  "fields": [
   {
@@ -26,10 +26,10 @@
    "label": "Tag"
   },
   {
-   "fieldname": "doctype_name",
+   "fieldname": "pagetype_name",
    "fieldtype": "Link",
-   "label": "Doctype Name",
-   "options": "DocType"
+   "label": "Pagetype Name",
+   "options": "PageType"
   }
  ],
  "index_web_pages_for_search": 1,
diff --git a/press/press/doctype/press_tag/press_tag.py b/press/press/doctype/press_tag/press_tag.py
index 1aa5676f..6aa73f5b 100644
--- a/press/press/doctype/press_tag/press_tag.py
+++ b/press/press/doctype/press_tag/press_tag.py
@@ -14,9 +14,9 @@ class PressTag(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		doctype_name: DF.Link | None
+		pagetype_name: DF.Link | None
 		tag: DF.Data | None
 		team: DF.Link | None
 	# end: auto-generated types
 
-	dashboard_fields = ["tag", "doctype_name", "team"]
+	dashboard_fields = ["tag", "pagetype_name", "team"]
diff --git a/press/press/doctype/press_tag/test_press_tag.py b/press/press/doctype/press_tag/test_press_tag.py
index 06b9aaef..824af33a 100644
--- a/press/press/doctype/press_tag/test_press_tag.py
+++ b/press/press/doctype/press_tag/test_press_tag.py
@@ -4,19 +4,19 @@
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 
-def create_and_add_test_tag(name: str, doctype: str, tag: str = "test_tag"):
+def create_and_add_test_tag(name: str, pagetype: str, tag: str = "test_tag"):
 	test_tag = jingrow.get_pg(
 		{
-			"doctype": "Jcloude Tag",
-			"doctype_name": doctype,
+			"pagetype": "Jcloude Tag",
+			"pagetype_name": pagetype,
 			"team": create_test_team().name,
 			"tag": tag,
 		}
 	).insert(ignore_permissions=True)
-	pg = jingrow.get_pg(doctype, name).append("tags", {"tag": test_tag.name})
+	pg = jingrow.get_pg(pagetype, name).append("tags", {"tag": test_tag.name})
 	pg.save()
 	return test_tag
 
diff --git a/press/press/doctype/press_user_permission/press_user_permission.json b/press/press/doctype/press_user_permission/press_user_permission.json
index 6ca31b61..84a1b33d 100644
--- a/press/press/doctype/press_user_permission/press_user_permission.json
+++ b/press/press/doctype/press_user_permission/press_user_permission.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-08-04 15:08:48.970377",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -37,7 +37,7 @@
    "in_preview": 1,
    "in_standard_filter": 1,
    "label": "Document Type",
-   "options": "DocType"
+   "options": "PageType"
   },
   {
    "depends_on": "eval: pg.type != 'Config';",
diff --git a/press/press/doctype/press_user_permission/press_user_permission.py b/press/press/doctype/press_user_permission/press_user_permission.py
index 6986e46c..bcfa669d 100644
--- a/press/press/doctype/press_user_permission/press_user_permission.py
+++ b/press/press/doctype/press_user_permission/press_user_permission.py
@@ -80,21 +80,21 @@ def has_user_permission(pg: str, name: str, action: str, groups: list | None = N
 	return allowed
 
 
-def check_config_perm(config: dict, doctype: str, name: str, action: str, allowed: bool):
+def check_config_perm(config: dict, pagetype: str, name: str, action: str, allowed: bool):
 	perm_types = config.keys()
 
 	if "global" in perm_types:
-		allowed = has_config_perm(config["global"], doctype, name, action, allowed, "global")
+		allowed = has_config_perm(config["global"], pagetype, name, action, allowed, "global")
 
 	if "restricted" in perm_types:
-		allowed = has_config_perm(config["restricted"], doctype, name, action, allowed, "restricted")
+		allowed = has_config_perm(config["restricted"], pagetype, name, action, allowed, "restricted")
 
 	return allowed
 
 
-def has_config_perm(config: dict, doctype: str, name: str, action: str, allowed: bool, ptype: str):
-	if doctype in config:
-		docnames = config[doctype].keys()
+def has_config_perm(config: dict, pagetype: str, name: str, action: str, allowed: bool, ptype: str):
+	if pagetype in config:
+		docnames = config[pagetype].keys()
 		if name in docnames:
 			name = name
 		elif "*" in docnames:
@@ -102,7 +102,7 @@ def has_config_perm(config: dict, doctype: str, name: str, action: str, allowed:
 		else:
 			return allowed
 
-		if action in config[doctype][name] or "*" in config[doctype][name]:
+		if action in config[pagetype][name] or "*" in config[pagetype][name]:
 			if ptype == "restricted":
 				allowed = False
 			elif ptype == "global":
diff --git a/press/press/doctype/press_user_permission/test_press_user_permission.py b/press/press/doctype/press_user_permission/test_press_user_permission.py
index 8f487676..75dc5a9a 100644
--- a/press/press/doctype/press_user_permission/test_press_user_permission.py
+++ b/press/press/doctype/press_user_permission/test_press_user_permission.py
@@ -4,11 +4,11 @@
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.jcloude_user_permission.jcloude_user_permission import (
+from jcloude.jcloude.pagetype.jcloude_user_permission.jcloude_user_permission import (
 	has_user_permission,
 )
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 
 class TestPressUserPermission(FrappeTestCase):
@@ -26,7 +26,7 @@ class TestPressUserPermission(FrappeTestCase):
 		self.assertFalse(has_user_permission("Site", self.site.name, "jcloude.api.site.login"))
 
 		jingrow.get_pg(
-			doctype="Jcloude User Permission",
+			pagetype="Jcloude User Permission",
 			type="User",
 			user=jingrow.session.user,
 			document_type="Site",
@@ -38,12 +38,12 @@ class TestPressUserPermission(FrappeTestCase):
 		self.assertFalse(has_user_permission("Site", self.site.name, "jcloude.api.site.migrate"))
 
 	def test_jcloude_group_permission(self):
-		group = jingrow.get_pg(doctype="Jcloude Permission Group", team=self.team.name, title="Test Group")
+		group = jingrow.get_pg(pagetype="Jcloude Permission Group", team=self.team.name, title="Test Group")
 		group.append("users", {"user": jingrow.session.user})
 		group.insert(ignore_permissions=True)
 
 		jingrow.get_pg(
-			doctype="Jcloude User Permission",
+			pagetype="Jcloude User Permission",
 			type="Group",
 			group=group.name,
 			document_type="Site",
@@ -66,7 +66,7 @@ class TestPressUserPermission(FrappeTestCase):
 			"restricted": {"Site": {"test.jingrow.dev": "jcloude.api.site.migrate"}},
 		}
 		jingrow.get_pg(
-			doctype="Jcloude User Permission",
+			pagetype="Jcloude User Permission",
 			type="Config",
 			config=jingrow.as_json(perms),
 			user=jingrow.session.user,
diff --git a/press/press/doctype/press_webhook/press_webhook.json b/press/press/doctype/press_webhook/press_webhook.json
index af361dd8..972178b3 100644
--- a/press/press/doctype/press_webhook/press_webhook.json
+++ b/press/press/doctype/press_webhook/press_webhook.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-09-18 14:32:26.332089",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "enabled",
diff --git a/press/press/doctype/press_webhook/press_webhook.py b/press/press/doctype/press_webhook/press_webhook.py
index d293462a..79ca1555 100644
--- a/press/press/doctype/press_webhook/press_webhook.py
+++ b/press/press/doctype/press_webhook/press_webhook.py
@@ -16,7 +16,7 @@ from jingrow.model.document import Document
 
 from jcloude.api.client import dashboard_whitelist
 from jcloude.guards import role_guard
-from jcloude.overrides import get_permission_query_conditions_for_doctype
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
 from jcloude.utils import is_valid_hostname
 
 
@@ -29,7 +29,7 @@ class PressWebhook(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.jcloude_webhook_selected_event.jcloude_webhook_selected_event import (
+		from jcloude.jcloude.pagetype.jcloude_webhook_selected_event.jcloude_webhook_selected_event import (
 			PressWebhookSelectedEvent,
 		)
 
@@ -168,7 +168,7 @@ class PressWebhook(Document):
 		jingrow.delete_pg("Jcloude Webhook", self.name)
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Site")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Site")
 
 
 def auto_disable_high_delivery_failure_webhooks():
diff --git a/press/press/doctype/press_webhook_attempt/press_webhook_attempt.json b/press/press/doctype/press_webhook_attempt/press_webhook_attempt.json
index 5c1af0dd..273cce9d 100644
--- a/press/press/doctype/press_webhook_attempt/press_webhook_attempt.json
+++ b/press/press/doctype/press_webhook_attempt/press_webhook_attempt.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2024-09-19 09:33:43.941516",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "status",
diff --git a/press/press/doctype/press_webhook_event/press_webhook_event.json b/press/press/doctype/press_webhook_event/press_webhook_event.json
index 0e90fc4d..3250770b 100644
--- a/press/press/doctype/press_webhook_event/press_webhook_event.json
+++ b/press/press/doctype/press_webhook_event/press_webhook_event.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "field:title",
  "creation": "2024-09-18 14:35:06.487107",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "enabled",
diff --git a/press/press/doctype/press_webhook_log/press_webhook_log.json b/press/press/doctype/press_webhook_log/press_webhook_log.json
index 82964097..db0138c1 100644
--- a/press/press/doctype/press_webhook_log/press_webhook_log.json
+++ b/press/press/doctype/press_webhook_log/press_webhook_log.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-09-18 16:34:27.110549",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "status",
diff --git a/press/press/doctype/press_webhook_log/press_webhook_log.py b/press/press/doctype/press_webhook_log/press_webhook_log.py
index 6034fa8d..145f2ebc 100644
--- a/press/press/doctype/press_webhook_log/press_webhook_log.py
+++ b/press/press/doctype/press_webhook_log/press_webhook_log.py
@@ -10,7 +10,7 @@ import requests
 from jingrow.model.document import Document
 from jingrow.utils import add_to_date, now
 
-from jcloude.overrides import get_permission_query_conditions_for_doctype
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
 
 
 class PressWebhookLog(Document):
@@ -22,7 +22,7 @@ class PressWebhookLog(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.jcloude_webhook_attempt.jcloude_webhook_attempt import PressWebhookAttempt
+		from jcloude.jcloude.pagetype.jcloude_webhook_attempt.jcloude_webhook_attempt import PressWebhookAttempt
 
 		attempts: DF.Table[PressWebhookAttempt]
 		event: DF.Link
@@ -92,8 +92,8 @@ class PressWebhookLog(Document):
 
 	def _process_webhook_call(self):
 		try:
-			PressWebhookSelectedEvent = jingrow.qb.DocType("Jcloude Webhook Selected Event")
-			PressWebhook = jingrow.qb.DocType("Jcloude Webhook")
+			PressWebhookSelectedEvent = jingrow.qb.PageType("Jcloude Webhook Selected Event")
+			PressWebhook = jingrow.qb.PageType("Jcloude Webhook")
 			query = (
 				jingrow.qb.from_(PressWebhookSelectedEvent)
 				.select(PressWebhook.name, PressWebhook.endpoint, PressWebhook.secret)
@@ -175,7 +175,7 @@ class PressWebhookLog(Document):
 		self.save()
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Jcloude Webhook Log")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Jcloude Webhook Log")
 
 
 def process():
diff --git a/press/press/doctype/press_webhook_selected_event/press_webhook_selected_event.json b/press/press/doctype/press_webhook_selected_event/press_webhook_selected_event.json
index 7ddac8ee..a920ae6f 100644
--- a/press/press/doctype/press_webhook_selected_event/press_webhook_selected_event.json
+++ b/press/press/doctype/press_webhook_selected_event/press_webhook_selected_event.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-09-18 15:16:58.232474",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/process_snapshot/process_snapshot.json b/press/press/doctype/process_snapshot/process_snapshot.json
index 3324a2bf..c9aa0548 100644
--- a/press/press/doctype/process_snapshot/process_snapshot.json
+++ b/press/press/doctype/process_snapshot/process_snapshot.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-04-01 15:41:25.224836",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "server",
diff --git a/press/press/doctype/process_snapshot/process_snapshot.py b/press/press/doctype/process_snapshot/process_snapshot.py
index 3d49d85b..f9260a53 100644
--- a/press/press/doctype/process_snapshot/process_snapshot.py
+++ b/press/press/doctype/process_snapshot/process_snapshot.py
@@ -11,7 +11,7 @@ import requests
 from jingrow.model.document import Document
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.server.server import Server
+	from jcloude.jcloude.pagetype.server.server import Server
 
 
 class ProcessSnapshot(Document):
diff --git a/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.json b/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.json
index 5a6c5657..8f155ada 100644
--- a/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.json
+++ b/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "Prompt",
  "creation": "2021-05-26 19:54:21.999890",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -192,7 +192,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Alertmanager Webhook Log",
+   "link_pagetype": "Alertmanager Webhook Log",
    "link_fieldname": "alert"
   }
  ],
diff --git a/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.py b/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.py
index 1edf0447..ce615ed9 100644
--- a/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.py
+++ b/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.py
@@ -14,7 +14,7 @@ from jingrow.model.document import Document
 from jcloude.agent import Agent
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.server.server import Server
+	from jcloude.jcloude.pagetype.server.server import Server
 
 
 class PrometheusAlertRule(Document):
@@ -26,7 +26,7 @@ class PrometheusAlertRule(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.prometheus_alert_rule_cluster.prometheus_alert_rule_cluster import (
+		from jcloude.jcloude.pagetype.prometheus_alert_rule_cluster.prometheus_alert_rule_cluster import (
 			PrometheusAlertRuleCluster,
 		)
 
@@ -89,9 +89,9 @@ class PrometheusAlertRule(Document):
 	def get_rules(self):
 		rules_dict = {"groups": [{"name": "All", "rules": []}]}
 
-		rules = jingrow.get_all(self.doctype, {"enabled": True})
+		rules = jingrow.get_all(self.pagetype, {"enabled": True})
 		for rule in rules:
-			rule_pg = jingrow.get_pg(self.doctype, rule.name)
+			rule_pg = jingrow.get_pg(self.pagetype, rule.name)
 			rules_dict["groups"][0]["rules"].append(rule_pg.get_rule())
 
 		return rules_dict
@@ -115,9 +115,9 @@ class PrometheusAlertRule(Document):
 			],
 		}
 
-		rules = jingrow.get_all(self.doctype, {"enabled": True})
+		rules = jingrow.get_all(self.pagetype, {"enabled": True})
 		for rule in rules:
-			rule_pg = jingrow.get_pg(self.doctype, rule.name)
+			rule_pg = jingrow.get_pg(self.pagetype, rule.name)
 			routes_dict["route"]["routes"].append(rule_pg.get_route())
 
 		return routes_dict
@@ -155,7 +155,7 @@ class PrometheusAlertRule(Document):
 
 		return jingrow.get_pg(
 			{
-				"doctype": "Jcloude Job",
+				"pagetype": "Jcloude Job",
 				"job_type": job_name,
 				"server_type": server_type,
 				"server": server_name,
diff --git a/press/press/doctype/prometheus_alert_rule/test_prometheus_alert_rule.py b/press/press/doctype/prometheus_alert_rule/test_prometheus_alert_rule.py
index 07be6c41..faa8d944 100644
--- a/press/press/doctype/prometheus_alert_rule/test_prometheus_alert_rule.py
+++ b/press/press/doctype/prometheus_alert_rule/test_prometheus_alert_rule.py
@@ -7,14 +7,14 @@ import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
 from jcloude.agent import Agent
-from jcloude.jcloude.doctype.prometheus_alert_rule.prometheus_alert_rule import PrometheusAlertRule
+from jcloude.jcloude.pagetype.prometheus_alert_rule.prometheus_alert_rule import PrometheusAlertRule
 
 
 @patch.object(Agent, "update_monitor_rules", new=Mock())
 def create_test_prometheus_alert_rule(name="Sites Down") -> PrometheusAlertRule:
 	return jingrow.get_pg(  # type: ignore
 		{
-			"doctype": "Prometheus Alert Rule",
+			"pagetype": "Prometheus Alert Rule",
 			"name": name,
 			"description": "Sites didn't respond with http 200",
 			"severity": "Critical",
diff --git a/press/press/doctype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.json b/press/press/doctype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.json
index 3da2666e..218f584d 100644
--- a/press/press/doctype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.json
+++ b/press/press/doctype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-05-24 16:13:21.415426",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/proxy_failover/proxy_failover.json b/press/press/doctype/proxy_failover/proxy_failover.json
index 8e5f2f29..49bfabc7 100644
--- a/press/press/doctype/proxy_failover/proxy_failover.json
+++ b/press/press/doctype/proxy_failover/proxy_failover.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2025-11-24 13:32:44.225696",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "primary",
diff --git a/press/press/doctype/proxy_failover/proxy_failover.py b/press/press/doctype/proxy_failover/proxy_failover.py
index fd3e39c8..0f67fbd2 100644
--- a/press/press/doctype/proxy_failover/proxy_failover.py
+++ b/press/press/doctype/proxy_failover/proxy_failover.py
@@ -20,7 +20,7 @@ class ProxyFailover(Document, StepHandler):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.proxy_failover_steps.proxy_failover_steps import ProxyFailoverSteps
+		from jcloude.jcloude.pagetype.proxy_failover_steps.proxy_failover_steps import ProxyFailoverSteps
 
 		error: DF.Text | None
 		failover_steps: DF.Table[ProxyFailoverSteps]
@@ -73,7 +73,7 @@ class ProxyFailover(Document, StepHandler):
 
 	def execute_failover_steps(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_execute_steps",
 			steps=self.failover_steps,
@@ -189,8 +189,8 @@ class ProxyFailover(Document, StepHandler):
 		step.status = Status.Running
 		step.save()
 
-		benches = jingrow.qb.DocType("Bench")
-		servers = jingrow.qb.DocType("Server")
+		benches = jingrow.qb.PageType("Bench")
+		servers = jingrow.qb.PageType("Server")
 		active_benches = (
 			jingrow.qb.from_(benches)
 			.join(servers)
diff --git a/press/press/doctype/proxy_failover/test_proxy_failover.py b/press/press/doctype/proxy_failover/test_proxy_failover.py
index c7bb4151..2aafa0c9 100644
--- a/press/press/doctype/proxy_failover/test_proxy_failover.py
+++ b/press/press/doctype/proxy_failover/test_proxy_failover.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/proxy_failover_steps/proxy_failover_steps.json b/press/press/doctype/proxy_failover_steps/proxy_failover_steps.json
index 8490b0d1..6c93eeeb 100644
--- a/press/press/doctype/proxy_failover_steps/proxy_failover_steps.json
+++ b/press/press/doctype/proxy_failover_steps/proxy_failover_steps.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-11-26 12:16:36.353646",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -53,7 +53,7 @@
    "fieldname": "job_type",
    "fieldtype": "Link",
    "label": "Job Type",
-   "options": "DocType"
+   "options": "PageType"
   }
  ],
  "grid_page_length": 50,
diff --git a/press/press/doctype/proxy_server/patches/generate_proxysql_monitor_password.py b/press/press/doctype/proxy_server/patches/generate_proxysql_monitor_password.py
index ff38be92..4ceaae02 100644
--- a/press/press/doctype/proxy_server/patches/generate_proxysql_monitor_password.py
+++ b/press/press/doctype/proxy_server/patches/generate_proxysql_monitor_password.py
@@ -2,7 +2,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "proxy_server")
+	jingrow.reload_pg("jcloude", "pagetype", "proxy_server")
 
 	for server in jingrow.get_all(
 		"Proxy Server", filters={"status": "Active"}, pluck="name"
diff --git a/press/press/doctype/proxy_server/proxy_server.json b/press/press/doctype/proxy_server/proxy_server.json
index 3b802c92..b866d8c6 100644
--- a/press/press/doctype/proxy_server/proxy_server.json
+++ b/press/press/doctype/proxy_server/proxy_server.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2022-01-28 20:07:40.294840",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/proxy_server/proxy_server.py b/press/press/doctype/proxy_server/proxy_server.py
index c74bfb12..86f6c9fa 100644
--- a/press/press/doctype/proxy_server/proxy_server.py
+++ b/press/press/doctype/proxy_server/proxy_server.py
@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING
 import jingrow
 from jingrow.utils import unique
 
-from jcloude.jcloude.doctype.server.server import BaseServer
+from jcloude.jcloude.pagetype.server.server import BaseServer
 from jcloude.runner import Ansible
 from jcloude.utils import log_error
 
@@ -19,7 +19,7 @@ class ProxyServer(BaseServer):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.proxy_server_domain.proxy_server_domain import ProxyServerDomain
+		from jcloude.jcloude.pagetype.proxy_server_domain.proxy_server_domain import ProxyServerDomain
 
 		agent_password: DF.Password | None
 		auto_add_storage_max: DF.Int
@@ -159,7 +159,7 @@ class ProxyServer(BaseServer):
 		if not self.ssh_certificate_authority:
 			jingrow.throw("SSH Certificate Authority is required to setup SSH Proxy")
 
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_ssh_proxy", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_ssh_proxy", queue="long", timeout=1200)
 
 	def _setup_ssh_proxy(self):
 		settings = jingrow.db.get_value(
@@ -194,7 +194,7 @@ class ProxyServer(BaseServer):
 	def setup_fail2ban(self):
 		self.status = "Installing"
 		self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_fail2ban", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_fail2ban", queue="long", timeout=1200)
 
 	def _setup_fail2ban(self):
 		try:
@@ -214,7 +214,7 @@ class ProxyServer(BaseServer):
 
 	@jingrow.whitelist()
 	def setup_proxysql(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_proxysql", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_proxysql", queue="long", timeout=1200)
 
 	def _setup_proxysql(self):
 		try:
@@ -250,7 +250,7 @@ class ProxyServer(BaseServer):
 	def setup_replication(self):
 		self.status = "Installing"
 		self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_replication", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_replication", queue="long", timeout=1200)
 
 	def _setup_replication(self):
 		self._setup_secondary()
@@ -311,17 +311,17 @@ class ProxyServer(BaseServer):
 
 		failover = jingrow.get_pg(
 			{
-				"doctype": "Proxy Failover",
+				"pagetype": "Proxy Failover",
 				"primary": self.primary,
 				"secondary": self.name,
 			}
 		).insert()
 
-		return f"Failover Reference: {jingrow.get_desk_link(failover.doctype, failover.name)}"
+		return f"Failover Reference: {jingrow.get_desk_link(failover.pagetype, failover.name)}"
 
 	@jingrow.whitelist()
 	def setup_proxysql_monitor(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_proxysql_monitor", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_proxysql_monitor", queue="long", timeout=1200)
 
 	def _setup_proxysql_monitor(self):
 		try:
@@ -358,7 +358,7 @@ class ProxyServer(BaseServer):
 				if task_res[i]["ipv4"]["address"] == self.private_ip:
 					self.private_ip_interface_id = task_res[i]["device"]
 			self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_wireguard", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_wireguard", queue="long", timeout=1200)
 
 	def _setup_wireguard(self):
 		try:
diff --git a/press/press/doctype/proxy_server/test_proxy_server.py b/press/press/doctype/proxy_server/test_proxy_server.py
index 15f3df9c..b92eaf16 100644
--- a/press/press/doctype/proxy_server/test_proxy_server.py
+++ b/press/press/doctype/proxy_server/test_proxy_server.py
@@ -9,14 +9,14 @@ from jingrow.model.naming import make_autoname
 from jingrow.tests.utils import FrappeTestCase
 from moto import mock_aws
 
-from jcloude.jcloude.doctype.agent_job.test_agent_job import fake_agent_job
-from jcloude.jcloude.doctype.jcloude_settings.test_jcloude_settings import (
+from jcloude.jcloude.pagetype.agent_job.test_agent_job import fake_agent_job
+from jcloude.jcloude.pagetype.jcloude_settings.test_jcloude_settings import (
 	create_test_jcloude_settings,
 )
-from jcloude.jcloude.doctype.proxy_server.proxy_server import ProxyServer
-from jcloude.jcloude.doctype.root_domain.root_domain import RootDomain
-from jcloude.jcloude.doctype.server.server import BaseServer
-from jcloude.jcloude.doctype.virtual_machine.test_virtual_machine import create_test_virtual_machine
+from jcloude.jcloude.pagetype.proxy_server.proxy_server import ProxyServer
+from jcloude.jcloude.pagetype.root_domain.root_domain import RootDomain
+from jcloude.jcloude.pagetype.server.server import BaseServer
+from jcloude.jcloude.pagetype.virtual_machine.test_virtual_machine import create_test_virtual_machine
 from jcloude.utils.test import foreground_enqueue_pg
 
 
@@ -36,7 +36,7 @@ def create_test_proxy_server(
 	create_test_jcloude_settings()
 	server = jingrow.get_pg(
 		{
-			"doctype": "Proxy Server",
+			"pagetype": "Proxy Server",
 			"status": "Active",
 			"ip": jingrow.mock("ipv4"),
 			"private_ip": jingrow.mock("ipv4_private"),
@@ -54,10 +54,10 @@ def create_test_proxy_server(
 
 
 @patch(
-	"jcloude.jcloude.doctype.proxy_server.proxy_server.jingrow.enqueue_pg",
+	"jcloude.jcloude.pagetype.proxy_server.proxy_server.jingrow.enqueue_pg",
 	foreground_enqueue_pg,
 )
-@patch("jcloude.jcloude.doctype.proxy_server.proxy_server.Ansible", new=Mock())
+@patch("jcloude.jcloude.pagetype.proxy_server.proxy_server.Ansible", new=Mock())
 class TestProxyServer(FrappeTestCase):
 	@fake_agent_job("Reload NGINX Job")
 	@mock_aws
@@ -68,8 +68,8 @@ class TestProxyServer(FrappeTestCase):
 		autospec=True,
 	)
 	def test_sites_dns_updated_on_failover(self, update_dns_records_for_sites):
-		from jcloude.jcloude.doctype.server.test_server import create_test_server
-		from jcloude.jcloude.doctype.site.test_site import create_test_site
+		from jcloude.jcloude.pagetype.server.test_server import create_test_server
+		from jcloude.jcloude.pagetype.site.test_site import create_test_site
 
 		proxy1 = create_test_proxy_server(is_static_ip=True)
 		proxy2 = create_test_proxy_server(is_primary=False)
diff --git a/press/press/doctype/proxy_server_domain/proxy_server_domain.json b/press/press/doctype/proxy_server_domain/proxy_server_domain.json
index 8f47720e..9d7a94f4 100644
--- a/press/press/doctype/proxy_server_domain/proxy_server_domain.json
+++ b/press/press/doctype/proxy_server_domain/proxy_server_domain.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-03-24 10:21:00.192032",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/razorpay_payment_record/razorpay_payment_record.json b/press/press/doctype/razorpay_payment_record/razorpay_payment_record.json
index 370b7d96..71ad00f2 100644
--- a/press/press/doctype/razorpay_payment_record/razorpay_payment_record.json
+++ b/press/press/doctype/razorpay_payment_record/razorpay_payment_record.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-01-19 15:12:41.914117",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/razorpay_payment_record/razorpay_payment_record.py b/press/press/doctype/razorpay_payment_record/razorpay_payment_record.py
index b3c6bbc8..140482a6 100644
--- a/press/press/doctype/razorpay_payment_record/razorpay_payment_record.py
+++ b/press/press/doctype/razorpay_payment_record/razorpay_payment_record.py
@@ -7,7 +7,7 @@ from datetime import datetime, timedelta
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.team.team import _enqueue_finalize_unpaid_invoices_for_team
+from jcloude.jcloude.pagetype.team.team import _enqueue_finalize_unpaid_invoices_for_team
 from jcloude.utils import log_error
 from jcloude.utils.billing import get_razorpay_client
 
@@ -54,7 +54,7 @@ class RazorpayPaymentRecord(Document):
 
 		# Add a field to track razorpay event
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=team.name,
 			type="Prepaid Credits",
 			status="Paid",
@@ -104,7 +104,7 @@ class RazorpayPaymentRecord(Document):
 
 		# Add a field to track razorpay event
 		invoice = jingrow.get_pg(
-			doctype="Invoice",
+			pagetype="Invoice",
 			team=team.name,
 			type="Partnership Fees",
 			status="Paid",
@@ -144,7 +144,7 @@ class RazorpayPaymentRecord(Document):
 				if item["status"] == "captured":
 					jingrow.get_pg(
 						{
-							"doctype": "Razorpay Webhook Log",
+							"pagetype": "Razorpay Webhook Log",
 							"payload": jingrow.as_json(item),
 							"event": "order.paid",
 							"payment_id": item["id"],
@@ -174,7 +174,7 @@ def fetch_pending_payment_orders(hours=12):
 				if item["status"] == "captured":
 					jingrow.get_pg(
 						{
-							"doctype": "Razorpay Webhook Log",
+							"pagetype": "Razorpay Webhook Log",
 							"payload": jingrow.as_json(item),
 							"event": "order.paid",
 							"payment_id": item["id"],
diff --git a/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.json b/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.json
index e2e722a4..68d386bc 100644
--- a/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.json
+++ b/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "Prompt",
  "creation": "2022-01-19 15:16:25.377525",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.py b/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.py
index 74dc80e6..3ee4cb94 100644
--- a/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.py
+++ b/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.py
@@ -135,7 +135,7 @@ def razorpay_webhook_handler():
 
 		jingrow.get_pg(
 			{
-				"doctype": "Razorpay Webhook Log",
+				"pagetype": "Razorpay Webhook Log",
 				"payload": jingrow.as_json(form_dict),
 				"event": form_dict.get("event"),
 				"payment_id": form_dict["payload"]["payment"]["entity"]["id"],
diff --git a/press/press/doctype/region/region.json b/press/press/doctype/region/region.json
index cafa7dc3..c8530fa1 100644
--- a/press/press/doctype/region/region.json
+++ b/press/press/doctype/region/region.json
@@ -3,7 +3,7 @@
  "allow_import": 1,
  "autoname": "field:region_name",
  "creation": "2018-04-26 17:21:09.034956",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/registry_server/registry_server.json b/press/press/doctype/registry_server/registry_server.json
index f195b34b..2bf2689b 100644
--- a/press/press/doctype/registry_server/registry_server.json
+++ b/press/press/doctype/registry_server/registry_server.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-01-04 16:30:38.925921",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -277,7 +277,7 @@
  ],
  "links": [
   {
-   "link_doctype": "Ansible Play",
+   "link_pagetype": "Ansible Play",
    "link_fieldname": "server"
   }
  ],
diff --git a/press/press/doctype/registry_server/registry_server.py b/press/press/doctype/registry_server/registry_server.py
index 286fc56d..3993133b 100644
--- a/press/press/doctype/registry_server/registry_server.py
+++ b/press/press/doctype/registry_server/registry_server.py
@@ -8,7 +8,7 @@ import os
 import jingrow
 from jingrow.frappeclient import FrappeClient
 
-from jcloude.jcloude.doctype.server.server import BaseServer
+from jcloude.jcloude.pagetype.server.server import BaseServer
 from jcloude.runner import Ansible
 from jcloude.utils import log_error
 
@@ -131,7 +131,7 @@ class RegistryServer(BaseServer):
 		if not self.is_mirror:
 			return
 
-		jingrow.enqueue_pg(self.doctype, self.name, "_prune_mirror_registry", queue="long", timeout=3600)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_prune_mirror_registry", queue="long", timeout=3600)
 
 	def _prune_mirror_registry(self):
 		try:
@@ -169,7 +169,7 @@ class RegistryServer(BaseServer):
 		"""Create a registry mirror"""
 		registry: RegistryServer = jingrow.get_pg(
 			{
-				"doctype": "Registry Server",
+				"pagetype": "Registry Server",
 				"ip": public_ip,
 				"private_ip": private_ip,
 				"docker_data_mountpoint": docker_data_mountpoint,
@@ -210,7 +210,7 @@ class RegistryServer(BaseServer):
 		if not self.is_mirror:
 			jingrow.throw("Config can not be update for the hub registry")
 
-		jingrow.enqueue_pg(self.doctype, self.name, "_rewrite_config")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_rewrite_config")
 
 
 def delete_old_images_from_registry():  # noqa: C901
diff --git a/press/press/doctype/release_group/release_group.json b/press/press/doctype/release_group/release_group.json
index 49b6bb12..5bda8348 100644
--- a/press/press/doctype/release_group/release_group.json
+++ b/press/press/doctype/release_group/release_group.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "bench-.####",
  "creation": "2022-01-28 20:07:29.874387",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/release_group/release_group.py b/press/press/doctype/release_group/release_group.py
index ef96e019..e612ec14 100644
--- a/press/press/doctype/release_group/release_group.py
+++ b/press/press/doctype/release_group/release_group.py
@@ -11,7 +11,7 @@ import jingrow
 import jingrow.query_builder
 import semantic_version as sv
 from jingrow import _
-from jingrow.core.doctype.version.version import get_diff
+from jingrow.core.pagetype.version.version import get_diff
 from jingrow.core.utils import find, find_all
 from jingrow.model.document import Document
 from jingrow.model.naming import append_number_if_name_exists
@@ -25,13 +25,13 @@ from jcloude.agent import Agent
 from jcloude.api.client import dashboard_whitelist
 from jcloude.exceptions import ImageNotFoundInRegistry, InsufficientSpaceOnServer, VolumeResizeLimitError
 from jcloude.guards import role_guard
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.app.app import new_app
-from jcloude.jcloude.doctype.app_source.app_source import AppSource, create_app_source
-from jcloude.jcloude.doctype.deploy_candidate.utils import is_suspended
-from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import create_platform_build_and_deploy
-from jcloude.jcloude.doctype.resource_tag.tag_helpers import TagHelpers
-from jcloude.jcloude.doctype.server.server import Server
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.app.app import new_app
+from jcloude.jcloude.pagetype.app_source.app_source import AppSource, create_app_source
+from jcloude.jcloude.pagetype.deploy_candidate.utils import is_suspended
+from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import create_platform_build_and_deploy
+from jcloude.jcloude.pagetype.resource_tag.tag_helpers import TagHelpers
+from jcloude.jcloude.pagetype.server.server import Server
 from jcloude.utils import (
 	fmt_timedelta,
 	get_app_tag,
@@ -45,7 +45,7 @@ if TYPE_CHECKING:
 	from datetime import datetime
 	from typing import Any
 
-	from jcloude.jcloude.doctype.user_ssh_key.user_ssh_key import UserSSHKey
+	from jcloude.jcloude.pagetype.user_ssh_key.user_ssh_key import UserSSHKey
 
 DEFAULT_DEPENDENCIES = [
 	{"dependency": "NVM_VERSION", "version": "0.36.0"},
@@ -66,10 +66,10 @@ class LastDeployInfo(TypedDict):
 
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app.app import App
-	from jcloude.jcloude.doctype.bench.bench import Bench
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-	from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+	from jcloude.jcloude.pagetype.app.app import App
+	from jcloude.jcloude.pagetype.bench.bench import Bench
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
 
 
 class ReleaseGroup(Document, TagHelpers):
@@ -81,16 +81,16 @@ class ReleaseGroup(Document, TagHelpers):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.common_site_config.common_site_config import CommonSiteConfig
-		from jcloude.jcloude.doctype.release_group_app.release_group_app import ReleaseGroupApp
-		from jcloude.jcloude.doctype.release_group_dependency.release_group_dependency import (
+		from jcloude.jcloude.pagetype.common_site_config.common_site_config import CommonSiteConfig
+		from jcloude.jcloude.pagetype.release_group_app.release_group_app import ReleaseGroupApp
+		from jcloude.jcloude.pagetype.release_group_dependency.release_group_dependency import (
 			ReleaseGroupDependency,
 		)
-		from jcloude.jcloude.doctype.release_group_mount.release_group_mount import ReleaseGroupMount
-		from jcloude.jcloude.doctype.release_group_package.release_group_package import ReleaseGroupPackage
-		from jcloude.jcloude.doctype.release_group_server.release_group_server import ReleaseGroupServer
-		from jcloude.jcloude.doctype.release_group_variable.release_group_variable import ReleaseGroupVariable
-		from jcloude.jcloude.doctype.resource_tag.resource_tag import ResourceTag
+		from jcloude.jcloude.pagetype.release_group_mount.release_group_mount import ReleaseGroupMount
+		from jcloude.jcloude.pagetype.release_group_package.release_group_package import ReleaseGroupPackage
+		from jcloude.jcloude.pagetype.release_group_server.release_group_server import ReleaseGroupServer
+		from jcloude.jcloude.pagetype.release_group_variable.release_group_variable import ReleaseGroupVariable
+		from jcloude.jcloude.pagetype.resource_tag.resource_tag import ResourceTag
 
 		apps: DF.Table[ReleaseGroupApp]
 		bench_config: DF.Code | None
@@ -136,10 +136,10 @@ class ReleaseGroup(Document, TagHelpers):
 
 	@staticmethod
 	def get_list_query(query, filters, **list_args):
-		ReleaseGroupServer = jingrow.qb.DocType("Release Group Server")
-		ReleaseGroup = jingrow.qb.DocType("Release Group")
-		Bench = jingrow.qb.DocType("Bench")
-		Site = jingrow.qb.DocType("Site")
+		ReleaseGroupServer = jingrow.qb.PageType("Release Group Server")
+		ReleaseGroup = jingrow.qb.PageType("Release Group")
+		Bench = jingrow.qb.PageType("Bench")
+		Site = jingrow.qb.PageType("Site")
 
 		site_count = (
 			jingrow.qb.from_(Site)
@@ -740,7 +740,7 @@ class ReleaseGroup(Document, TagHelpers):
 		# Create and deploy the DC
 		new_dc: "DeployCandidate" = jingrow.get_pg(
 			{
-				"doctype": "Deploy Candidate",
+				"pagetype": "Deploy Candidate",
 				"group": self.name,
 				"apps": apps,
 				"dependencies": dependencies,
@@ -752,7 +752,7 @@ class ReleaseGroup(Document, TagHelpers):
 		)
 
 		if run_will_fail_check:
-			from jcloude.jcloude.doctype.deploy_candidate.validations import (
+			from jcloude.jcloude.pagetype.deploy_candidate.validations import (
 				check_if_update_will_fail,
 			)
 
@@ -878,8 +878,8 @@ class ReleaseGroup(Document, TagHelpers):
 
 	@dashboard_whitelist()
 	def deployed_versions(self):
-		Bench = jingrow.qb.DocType("Bench")
-		Server = jingrow.qb.DocType("Server")
+		Bench = jingrow.qb.PageType("Bench")
+		Server = jingrow.qb.PageType("Server")
 		deployed_versions = (
 			jingrow.qb.from_(Bench)
 			.left_join(Server)
@@ -904,7 +904,7 @@ class ReleaseGroup(Document, TagHelpers):
 		)
 
 		if sites_in_group_details:
-			Cluster = jingrow.qb.DocType("Cluster")
+			Cluster = jingrow.qb.PageType("Cluster")
 			cluster_data = (
 				jingrow.qb.from_(Cluster)
 				.select(Cluster.name, Cluster.title, Cluster.image)
@@ -912,7 +912,7 @@ class ReleaseGroup(Document, TagHelpers):
 				.run(as_dict=True)
 			)
 
-			Plan = jingrow.qb.DocType("Site Plan")
+			Plan = jingrow.qb.PageType("Site Plan")
 			plan_data = (
 				jingrow.qb.from_(Plan)
 				.select(Plan.name, Plan.plan_title, Plan.price_inr, Plan.price_usd)
@@ -920,7 +920,7 @@ class ReleaseGroup(Document, TagHelpers):
 				.run(as_dict=True)
 			)
 
-			ResourceTag = jingrow.qb.DocType("Resource Tag")
+			ResourceTag = jingrow.qb.PageType("Resource Tag")
 			tag_data = (
 				jingrow.qb.from_(ResourceTag)
 				.select(ResourceTag.tag_name, ResourceTag.parent)
@@ -1000,7 +1000,7 @@ class ReleaseGroup(Document, TagHelpers):
 		key = jingrow.generate_hash("Release Group Transfer Link", 20)
 		jingrow.get_pg(
 			{
-				"doctype": "Team Change",
+				"pagetype": "Team Change",
 				"document_type": "Release Group",
 				"document_name": self.name,
 				"to_team": jingrow.db.get_value("Team", {"user": team_mail_id, "enabled": 1}),
@@ -1046,7 +1046,7 @@ class ReleaseGroup(Document, TagHelpers):
 
 		return jingrow.get_pg(
 			{
-				"doctype": "SSH Certificate",
+				"pagetype": "SSH Certificate",
 				"certificate_type": "User",
 				"group": self.name,
 				"user": jingrow.session.user,
@@ -1085,8 +1085,8 @@ class ReleaseGroup(Document, TagHelpers):
 
 	@property
 	def deploy_in_progress(self):
-		from jcloude.jcloude.doctype.bench.bench import TRANSITORY_STATES as BENCH_TRANSITORY
-		from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import (
+		from jcloude.jcloude.pagetype.bench.bench import TRANSITORY_STATES as BENCH_TRANSITORY
+		from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import (
 			TRANSITORY_STATES as DC_TRANSITORY,
 		)
 
@@ -1111,7 +1111,7 @@ class ReleaseGroup(Document, TagHelpers):
 
 	@cached_property
 	def last_dc_info(self) -> LastDeployInfo | None:
-		DeployCandidateBuild = jingrow.qb.DocType("Deploy Candidate Build")
+		DeployCandidateBuild = jingrow.qb.PageType("Deploy Candidate Build")
 
 		query = (
 			jingrow.qb.from_(DeployCandidateBuild)
@@ -1134,7 +1134,7 @@ class ReleaseGroup(Document, TagHelpers):
 		if not name:
 			return []
 
-		Bench = jingrow.qb.DocType("Bench")
+		Bench = jingrow.qb.PageType("Bench")
 		query = (
 			jingrow.qb.from_(Bench)
 			.where(Bench.candidate == name)
@@ -1209,7 +1209,7 @@ class ReleaseGroup(Document, TagHelpers):
 
 		only_approved_for_sources = [self.apps[0].source]  # add jingrow app source
 		if marketplace_app_sources:
-			AppSource = jingrow.qb.DocType("App Source")
+			AppSource = jingrow.qb.PageType("App Source")
 			only_approved_for_sources.append(
 				jingrow.qb.from_(AppSource)
 				.where(AppSource.name.isin(marketplace_app_sources))
@@ -1221,7 +1221,7 @@ class ReleaseGroup(Document, TagHelpers):
 		next_apps = []
 
 		app_sources = [app.source for app in self.apps]
-		AppRelease = jingrow.qb.DocType("App Release")
+		AppRelease = jingrow.qb.PageType("App Release")
 		latest_releases = (
 			jingrow.qb.from_(AppRelease)
 			.where(AppRelease.source.isin(app_sources))
@@ -1517,7 +1517,7 @@ class ReleaseGroup(Document, TagHelpers):
 
 	@jingrow.whitelist()
 	def update_benches_config(self):
-		from jcloude.jcloude.doctype.bench.bench import Bench
+		from jcloude.jcloude.pagetype.bench.bench import Bench
 
 		"""Update benches config for all benches in the release group"""
 		benches = jingrow.get_all("Bench", "name", {"group": self.name, "status": "Active"})
@@ -1671,7 +1671,7 @@ def new_release_group(title, version, apps, team=None, cluster=None, saas_app=""
 		servers = []
 	return jingrow.get_pg(
 		{
-			"doctype": "Release Group",
+			"pagetype": "Release Group",
 			"title": title,
 			"version": version,
 			"apps": apps,
@@ -1691,8 +1691,8 @@ def get_status(name):
 
 
 def prune_servers_without_sites():
-	rg_servers = jingrow.qb.DocType("Release Group Server")
-	rg = jingrow.qb.DocType("Release Group")
+	rg_servers = jingrow.qb.PageType("Release Group Server")
+	rg = jingrow.qb.PageType("Release Group")
 	groups_with_multiple_servers = (
 		jingrow.qb.from_(rg_servers)
 		.inner_join(rg)
@@ -1718,7 +1718,7 @@ def prune_servers_without_sites():
 		as_list=True,
 	)
 
-	from jcloude.jcloude.doctype.bench.bench import (
+	from jcloude.jcloude.pagetype.bench.bench import (
 		get_scheduled_version_upgrades,
 		get_unfinished_site_migrations,
 	)
@@ -1742,7 +1742,7 @@ def prune_servers_without_sites():
 			jingrow.db.commit()
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Release Group")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Release Group")
 
 
 def can_use_release(app_src):
@@ -1760,8 +1760,8 @@ def update_rg_app_source(rg: "ReleaseGroup", source: "AppSource"):
 
 
 def get_job_names(rg: str, job_type: str, job_status: list[str]):
-	b = jingrow.qb.DocType("Bench")
-	aj = jingrow.qb.DocType("Agent Job")
+	b = jingrow.qb.PageType("Bench")
+	aj = jingrow.qb.PageType("Agent Job")
 
 	jobs = (
 		jingrow.qb.from_(b)
diff --git a/press/press/doctype/release_group/test_release_group.py b/press/press/doctype/release_group/test_release_group.py
index 7c58f536..0043485a 100644
--- a/press/press/doctype/release_group/test_release_group.py
+++ b/press/press/doctype/release_group/test_release_group.py
@@ -13,20 +13,20 @@ from jingrow.tests.utils import FrappeTestCase
 from jcloude.agent import Agent
 from jcloude.api.bench import deploy_information
 from jcloude.api.client import get_list
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.app_release.test_app_release import create_test_app_release
-from jcloude.jcloude.doctype.app_source.app_source import AppSource
-from jcloude.jcloude.doctype.app_source.test_app_source import create_test_app_source
-from jcloude.jcloude.doctype.release_group.release_group import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.app_release.test_app_release import create_test_app_release
+from jcloude.jcloude.pagetype.app_source.app_source import AppSource
+from jcloude.jcloude.pagetype.app_source.test_app_source import create_test_app_source
+from jcloude.jcloude.pagetype.release_group.release_group import (
 	ReleaseGroup,
 	new_release_group,
 )
-from jcloude.jcloude.doctype.server.server import BaseServer
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.server.server import BaseServer
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app.app import App
+	from jcloude.jcloude.pagetype.app.app import App
 
 
 def mock_free_space(space_required: int):
@@ -58,7 +58,7 @@ def create_test_release_group(
 	user = user or jingrow.session.user
 	release_group = jingrow.get_pg(
 		{
-			"doctype": "Release Group",
+			"pagetype": "Release Group",
 			"version": jingrow_version,
 			"enabled": True,
 			"title": f"Test ReleaseGroup {jingrow.generate_hash(length=10)}",
@@ -227,7 +227,7 @@ class TestReleaseGroup(FrappeTestCase):
 		jingrow_version = jingrow.get_pg("Jingrow Version", "Version 14")
 		group = jingrow.get_pg(
 			{
-				"doctype": "Release Group",
+				"pagetype": "Release Group",
 				"title": "Test Group",
 				"version": "Version 14",
 				"apps": [{"app": app.name, "source": create_test_app_source("Version 14", app).name}],
@@ -352,14 +352,14 @@ class TestReleaseGroup(FrappeTestCase):
 		self,
 	):
 		from jcloude.api.bench import new
-		from jcloude.jcloude.doctype.cluster.test_cluster import create_test_cluster
-		from jcloude.jcloude.doctype.proxy_server.test_proxy_server import (
+		from jcloude.jcloude.pagetype.cluster.test_cluster import create_test_cluster
+		from jcloude.jcloude.pagetype.proxy_server.test_proxy_server import (
 			create_test_proxy_server,
 		)
-		from jcloude.jcloude.doctype.root_domain.test_root_domain import create_test_root_domain
-		from jcloude.jcloude.doctype.server.test_server import create_test_server
-		from jcloude.jcloude.doctype.site.test_site import create_test_bench
-		from jcloude.jcloude.doctype.site_plan.test_site_plan import create_test_plan
+		from jcloude.jcloude.pagetype.root_domain.test_root_domain import create_test_root_domain
+		from jcloude.jcloude.pagetype.server.test_server import create_test_server
+		from jcloude.jcloude.pagetype.site.test_site import create_test_bench
+		from jcloude.jcloude.pagetype.site_plan.test_site_plan import create_test_plan
 
 		cluster = create_test_cluster("Default", public=True)
 		root_domain = create_test_root_domain("local.fc.jingrow.dev")
@@ -404,7 +404,7 @@ class TestReleaseGroup(FrappeTestCase):
 	def test_validate_dependant_apps(self):
 		release_group: ReleaseGroup = jingrow.get_pg(
 			{
-				"doctype": "Release Group",
+				"pagetype": "Release Group",
 				"version": "Nightly",
 				"enabled": True,
 				"title": f"Test ReleaseGroup {jingrow.mock('name')}",
@@ -447,12 +447,12 @@ class TestReleaseGroup(FrappeTestCase):
 			deploy_candidate_name = response["message"]
 			jingrow.db.set_value("Deploy Candidate Build", deploy_candidate_name, "status", "Success")
 
-		from jcloude.jcloude.doctype.cluster.test_cluster import create_test_cluster
-		from jcloude.jcloude.doctype.proxy_server.test_proxy_server import (
+		from jcloude.jcloude.pagetype.cluster.test_cluster import create_test_cluster
+		from jcloude.jcloude.pagetype.proxy_server.test_proxy_server import (
 			create_test_proxy_server,
 		)
-		from jcloude.jcloude.doctype.root_domain.test_root_domain import create_test_root_domain
-		from jcloude.jcloude.doctype.server.test_server import create_test_server
+		from jcloude.jcloude.pagetype.root_domain.test_root_domain import create_test_root_domain
+		from jcloude.jcloude.pagetype.server.test_server import create_test_server
 
 		cluster = create_test_cluster("Default", public=True)
 		root_domain = create_test_root_domain("local.fc.jingrow.dev")
@@ -488,8 +488,8 @@ class TestReleaseGroup(FrappeTestCase):
 	@patch.object(AgentJob, "enqueue_http_request", new=Mock())
 	@patch.object(BaseServer, "calculated_increase_disk_size", Mock())
 	def test_insufficient_space(self):
-		from jcloude.jcloude.doctype.server.test_server import create_test_server
-		from jcloude.jcloude.doctype.site.test_site import create_test_bench
+		from jcloude.jcloude.pagetype.server.test_server import create_test_server
+		from jcloude.jcloude.pagetype.site.test_site import create_test_bench
 
 		app = create_test_app()
 		server = create_test_server(auto_increase_storage=False)
@@ -514,8 +514,8 @@ class TestReleaseGroup(FrappeTestCase):
 	@patch.object(Agent, "get", mock_image_size(60))
 	@patch.object(BaseServer, "free_space", mock_free_space(space_required=5400000000))
 	def test_insufficient_space_on_auto_add_storage_servers(self):
-		from jcloude.jcloude.doctype.server.test_server import create_test_server
-		from jcloude.jcloude.doctype.site.test_site import create_test_bench
+		from jcloude.jcloude.pagetype.server.test_server import create_test_server
+		from jcloude.jcloude.pagetype.site.test_site import create_test_bench
 
 		# In case of public and servers with auto increase storage
 		# We should avoid throwing space errors instead just increment it for them
diff --git a/press/press/doctype/release_group_app/release_group_app.json b/press/press/doctype/release_group_app/release_group_app.json
index a14bac28..2638ec48 100644
--- a/press/press/doctype/release_group_app/release_group_app.json
+++ b/press/press/doctype/release_group_app/release_group_app.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-01-13 16:04:41.984386",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/release_group_dependency/release_group_dependency.json b/press/press/doctype/release_group_dependency/release_group_dependency.json
index 31f3febb..8bfe8389 100644
--- a/press/press/doctype/release_group_dependency/release_group_dependency.json
+++ b/press/press/doctype/release_group_dependency/release_group_dependency.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-05-18 17:34:17.579862",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/release_group_dependency/release_group_dependency.py b/press/press/doctype/release_group_dependency/release_group_dependency.py
index ada83683..1867e517 100644
--- a/press/press/doctype/release_group_dependency/release_group_dependency.py
+++ b/press/press/doctype/release_group_dependency/release_group_dependency.py
@@ -30,8 +30,8 @@ class ReleaseGroupDependency(Document):
 			return None
 		is_owned_by_team("Release Group", group, raise_exception=True)
 
-		RGDependency = jingrow.qb.DocType("Release Group Dependency")
-		BenchDependency = jingrow.qb.DocType("Bench Dependency")
+		RGDependency = jingrow.qb.PageType("Release Group Dependency")
+		BenchDependency = jingrow.qb.PageType("Bench Dependency")
 
 		query = (
 			query.join(BenchDependency)
diff --git a/press/press/doctype/release_group_mount/release_group_mount.json b/press/press/doctype/release_group_mount/release_group_mount.json
index 9cdeebcb..b684ce0b 100644
--- a/press/press/doctype/release_group_mount/release_group_mount.json
+++ b/press/press/doctype/release_group_mount/release_group_mount.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2023-12-13 15:02:17.666052",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "is_absolute_path",
diff --git a/press/press/doctype/release_group_package/release_group_package.json b/press/press/doctype/release_group_package/release_group_package.json
index 77cdac13..9983fe8a 100644
--- a/press/press/doctype/release_group_package/release_group_package.json
+++ b/press/press/doctype/release_group_package/release_group_package.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-05-12 14:37:58.299311",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/release_group_server/release_group_server.json b/press/press/doctype/release_group_server/release_group_server.json
index c38c4b43..cf5b7285 100644
--- a/press/press/doctype/release_group_server/release_group_server.json
+++ b/press/press/doctype/release_group_server/release_group_server.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-12-09 10:06:46.812420",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/release_group_variable/release_group_variable.json b/press/press/doctype/release_group_variable/release_group_variable.json
index 828c7708..c68de758 100644
--- a/press/press/doctype/release_group_variable/release_group_variable.json
+++ b/press/press/doctype/release_group_variable/release_group_variable.json
@@ -2,7 +2,7 @@
  "actions": [],
  "creation": "2023-06-13 16:15:53.783330",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/release_group_variable/release_group_variable.py b/press/press/doctype/release_group_variable/release_group_variable.py
index 28189b82..06de3c96 100644
--- a/press/press/doctype/release_group_variable/release_group_variable.py
+++ b/press/press/doctype/release_group_variable/release_group_variable.py
@@ -26,7 +26,7 @@ class ReleaseGroupVariable(Document):
 
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
-		environmentVariable = jingrow.qb.DocType("Release Group Variable")
+		environmentVariable = jingrow.qb.PageType("Release Group Variable")
 		query = query.where(environmentVariable.internal == 0).orderby(
 			environmentVariable.key, order=jingrow.qb.asc
 		)
diff --git a/press/press/doctype/remote_file/remote_file.json b/press/press/doctype/remote_file/remote_file.json
index 79988634..fd7ce534 100644
--- a/press/press/doctype/remote_file/remote_file.json
+++ b/press/press/doctype/remote_file/remote_file.json
@@ -3,7 +3,7 @@
  "allow_import": 1,
  "creation": "2020-07-02 14:40:15.222405",
  "description": "Tracks S3 uploads made via Jcloude",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "file_name",
diff --git a/press/press/doctype/remote_file/remote_file.py b/press/press/doctype/remote_file/remote_file.py
index 951cae9e..8915abaf 100644
--- a/press/press/doctype/remote_file/remote_file.py
+++ b/press/press/doctype/remote_file/remote_file.py
@@ -61,7 +61,7 @@ def poll_file_statuses():
 
 	for bucket in buckets:
 		jingrow.enqueue(
-			"jcloude.jcloude.doctype.remote_file.remote_file.poll_file_statuses_from_bucket",
+			"jcloude.jcloude.pagetype.remote_file.remote_file.poll_file_statuses_from_bucket",
 			bucket=bucket,
 			job_id=f"poll_file_statuses:{bucket['name']}",
 			queue="long",
@@ -84,9 +84,9 @@ def poll_file_statuses_from_bucket(bucket):
 	for s3_object in s3.Bucket(bucket["name"]).objects.all():
 		available_files.add(s3_object.key)
 
-	doctype = "Remote File"
+	pagetype = "Remote File"
 	remote_files = jingrow.get_all(
-		doctype,
+		pagetype,
 		fields=["name", "file_path", "status"],
 		filters={"bucket": bucket["name"]},
 	)
@@ -107,10 +107,10 @@ def poll_file_statuses_from_bucket(bucket):
 				set_to_available.append(name)
 
 	for files in chunk(set_to_unavailable, 1000):
-		jingrow.db.set_value(doctype, {"name": ("in", files)}, "status", "Unavailable")
+		jingrow.db.set_value(pagetype, {"name": ("in", files)}, "status", "Unavailable")
 
 	for files in chunk(set_to_available, 1000):
-		jingrow.db.set_value(doctype, {"name": ("in", files)}, "status", "Available")
+		jingrow.db.set_value(pagetype, {"name": ("in", files)}, "status", "Available")
 
 	# Delete s3 files that are not tracked with Remote Files
 	remote_file_paths = set(file["file_path"] for file in remote_files)
@@ -274,5 +274,5 @@ def delete_s3_files(buckets):
 			response = bucket.delete_objects(Delete={"Objects": objects})
 			response = pprint.pformat(response)
 			jingrow.get_pg(
-				doctype="Remote Operation Log", operation_type="Delete Files", response=response
+				pagetype="Remote Operation Log", operation_type="Delete Files", response=response
 			).insert()
diff --git a/press/press/doctype/remote_file/test_remote_file.py b/press/press/doctype/remote_file/test_remote_file.py
index b19d3f29..8b6c595e 100644
--- a/press/press/doctype/remote_file/test_remote_file.py
+++ b/press/press/doctype/remote_file/test_remote_file.py
@@ -22,7 +22,7 @@ def create_test_remote_file(
 	creation = creation or jingrow.utils.now_datetime()
 	remote_file = jingrow.get_pg(
 		{
-			"doctype": "Remote File",
+			"pagetype": "Remote File",
 			"status": "Available",
 			"site": site,
 			"file_path": file_path,
diff --git a/press/press/doctype/remote_operation_log/remote_operation_log.json b/press/press/doctype/remote_operation_log/remote_operation_log.json
index d06fb928..9837f959 100644
--- a/press/press/doctype/remote_operation_log/remote_operation_log.json
+++ b/press/press/doctype/remote_operation_log/remote_operation_log.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-12-16 17:01:05.934510",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/required_apps/required_apps.json b/press/press/doctype/required_apps/required_apps.json
index 8943c9e4..b7605fe7 100644
--- a/press/press/doctype/required_apps/required_apps.json
+++ b/press/press/doctype/required_apps/required_apps.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-03-28 11:42:58.586288",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/resource_tag/resource_tag.json b/press/press/doctype/resource_tag/resource_tag.json
index de7fc58b..768a9f25 100644
--- a/press/press/doctype/resource_tag/resource_tag.json
+++ b/press/press/doctype/resource_tag/resource_tag.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2023-07-02 00:07:18.322521",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/resource_tag/tag_helpers.py b/press/press/doctype/resource_tag/tag_helpers.py
index 4f81b21a..300c5f05 100644
--- a/press/press/doctype/resource_tag/tag_helpers.py
+++ b/press/press/doctype/resource_tag/tag_helpers.py
@@ -16,15 +16,15 @@ class TagHelpers:
 			return
 
 		if not jingrow.db.exists(
-			"Jcloude Tag", {"tag": tag, "doctype_name": self.doctype, "team": team}
+			"Jcloude Tag", {"tag": tag, "pagetype_name": self.pagetype, "team": team}
 		):
 			tag_pg = jingrow.new_pg(
-				"Jcloude Tag", tag=tag, doctype_name=self.doctype, team=team
+				"Jcloude Tag", tag=tag, pagetype_name=self.pagetype, team=team
 			).insert()
 		else:
 			tag_pg = jingrow.get_pg(
 				"Jcloude Tag",
-				{"tag": tag, "doctype_name": self.doctype, "team": team},
+				{"tag": tag, "pagetype_name": self.pagetype, "team": team},
 			)
 
 		self.append("tags", {"tag": tag_pg.name})
diff --git a/press/press/doctype/root_domain/root_domain.json b/press/press/doctype/root_domain/root_domain.json
index f8ac0a72..10e6f5f8 100644
--- a/press/press/doctype/root_domain/root_domain.json
+++ b/press/press/doctype/root_domain/root_domain.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "Prompt",
  "creation": "2021-03-24 09:04:21.555295",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -79,32 +79,32 @@
  "links": [
   {
    "group": "Linked Documents",
-   "link_doctype": "TLS Certificate",
+   "link_pagetype": "TLS Certificate",
    "link_fieldname": "domain"
   },
   {
    "group": "Linked Documents",
-   "link_doctype": "Site",
+   "link_pagetype": "Site",
    "link_fieldname": "domain"
   },
   {
    "group": "Servers",
-   "link_doctype": "Server",
+   "link_pagetype": "Server",
    "link_fieldname": "domain"
   },
   {
    "group": "Servers",
-   "link_doctype": "Proxy Server",
+   "link_pagetype": "Proxy Server",
    "link_fieldname": "domain"
   },
   {
    "group": "Servers",
-   "link_doctype": "Database Server",
+   "link_pagetype": "Database Server",
    "link_fieldname": "domain"
   },
   {
    "group": "Servers",
-   "link_doctype": "Registry Server",
+   "link_pagetype": "Registry Server",
    "link_fieldname": "domain"
   }
  ],
diff --git a/press/press/doctype/root_domain/root_domain.py b/press/press/doctype/root_domain/root_domain.py
index 97dbf72f..7e7e2b7e 100644
--- a/press/press/doctype/root_domain/root_domain.py
+++ b/press/press/doctype/root_domain/root_domain.py
@@ -17,7 +17,7 @@ from jcloude.utils import log_error
 if TYPE_CHECKING:
 	from collections.abc import Iterable
 
-	from jcloude.jcloude.doctype.proxy_server.proxy_server import ProxyServer
+	from jcloude.jcloude.pagetype.proxy_server.proxy_server import ProxyServer
 
 
 class RootDomain(Document):
@@ -44,7 +44,7 @@ class RootDomain(Document):
 			"TLS Certificate", {"wildcard": True, "domain": self.name}
 		):
 			jingrow.enqueue_pg(
-				self.doctype,
+				self.pagetype,
 				self.name,
 				"obtain_root_domain_tls_certificate",
 				enqueue_after_commit=True,
@@ -55,7 +55,7 @@ class RootDomain(Document):
 			rsa_key_size = jingrow.db.get_value("Jcloude Settings", "Jcloude Settings", "rsa_key_size")
 			jingrow.get_pg(
 				{
-					"doctype": "TLS Certificate",
+					"pagetype": "TLS Certificate",
 					"wildcard": True,
 					"domain": self.name,
 					"rsa_key_size": rsa_key_size,
diff --git a/press/press/doctype/root_domain/test_root_domain.py b/press/press/doctype/root_domain/test_root_domain.py
index 8c10dd7f..b40f26de 100644
--- a/press/press/doctype/root_domain/test_root_domain.py
+++ b/press/press/doctype/root_domain/test_root_domain.py
@@ -8,8 +8,8 @@ from unittest.mock import Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.root_domain.root_domain import RootDomain
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.root_domain.root_domain import RootDomain
 
 
 @patch.object(RootDomain, "after_insert", new=Mock())
@@ -19,7 +19,7 @@ def create_test_root_domain(
 ):
 	root_domain = jingrow.get_pg(
 		{
-			"doctype": "Root Domain",
+			"pagetype": "Root Domain",
 			"name": name,
 			"default_cluster": default_cluster,
 			"aws_access_key_id": "a",
@@ -36,20 +36,20 @@ class TestRootDomain(FrappeTestCase):
 		jingrow.db.rollback()
 
 	def _create_fake_rename_job(self, site_name: str, creation=None):
-		from jcloude.jcloude.doctype.database_server.test_database_server import (
+		from jcloude.jcloude.pagetype.database_server.test_database_server import (
 			create_test_database_server,
 		)
-		from jcloude.jcloude.doctype.proxy_server.test_proxy_server import (
+		from jcloude.jcloude.pagetype.proxy_server.test_proxy_server import (
 			create_test_proxy_server,
 		)
-		from jcloude.jcloude.doctype.server.test_server import create_test_server
+		from jcloude.jcloude.pagetype.server.test_server import create_test_server
 
 		creation = creation or jingrow.utils.now_datetime()
 		server = create_test_server(create_test_proxy_server().name, create_test_database_server().name)
 
 		job = jingrow.get_pg(
 			{
-				"doctype": "Agent Job",
+				"pagetype": "Agent Job",
 				"job_type": "Rename Site",
 				"request_data": json.dumps({"new_name": site_name}),
 				"server_type": "Server",
diff --git a/press/press/doctype/scale_step/scale_step.json b/press/press/doctype/scale_step/scale_step.json
index 34c0c789..a668888d 100644
--- a/press/press/doctype/scale_step/scale_step.json
+++ b/press/press/doctype/scale_step/scale_step.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-11-16 15:08:56.885130",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -38,7 +38,7 @@
    "fieldname": "job_type",
    "fieldtype": "Link",
    "label": "Job Type",
-   "options": "DocType"
+   "options": "PageType"
   },
   {
    "fieldname": "job",
diff --git a/press/press/doctype/scheduled_auto_update_log/scheduled_auto_update_log.json b/press/press/doctype/scheduled_auto_update_log/scheduled_auto_update_log.json
index 454f00d5..6fef9778 100644
--- a/press/press/doctype/scheduled_auto_update_log/scheduled_auto_update_log.json
+++ b/press/press/doctype/scheduled_auto_update_log/scheduled_auto_update_log.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2021-11-06 22:52:46.091867",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "MyISAM",
  "field_order": [
@@ -33,7 +33,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Document Type",
-   "options": "DocType",
+   "options": "PageType",
    "read_only": 1
   },
   {
diff --git a/press/press/doctype/security_update/security_update.json b/press/press/doctype/security_update/security_update.json
index abecb317..98f911d9 100644
--- a/press/press/doctype/security_update/security_update.json
+++ b/press/press/doctype/security_update/security_update.json
@@ -2,7 +2,7 @@
  "actions": [],
  "creation": "2023-08-03 15:58:45.992061",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/security_update/security_update.py b/press/press/doctype/security_update/security_update.py
index 85598c9b..7cbe9fee 100644
--- a/press/press/doctype/security_update/security_update.py
+++ b/press/press/doctype/security_update/security_update.py
@@ -105,7 +105,7 @@ class SecurityUpdate(Document):
 			security_update.update(
 				{
 					"package": package,
-					"server_type": server_obj.doctype,
+					"server_type": server_obj.pagetype,
 					"server": server_obj.name,
 					"package_meta": package_meta,
 					"change_log": package_change_log,
diff --git a/press/press/doctype/security_update_check/security_update_check.json b/press/press/doctype/security_update_check/security_update_check.json
index 1c3b8d50..e809237f 100644
--- a/press/press/doctype/security_update_check/security_update_check.json
+++ b/press/press/doctype/security_update_check/security_update_check.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-05-13 09:24:36.476122",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -17,7 +17,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Server Type",
-   "options": "DocType",
+   "options": "PageType",
    "reqd": 1
   },
   {
diff --git a/press/press/doctype/security_update_check/security_update_check.py b/press/press/doctype/security_update_check/security_update_check.py
index cbfa2393..3ad20414 100644
--- a/press/press/doctype/security_update_check/security_update_check.py
+++ b/press/press/doctype/security_update_check/security_update_check.py
@@ -7,12 +7,12 @@ from typing import TYPE_CHECKING
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 from jcloude.runner import Ansible
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.server.server import Server
+	from jcloude.jcloude.pagetype.server.server import Server
 
 
 class SecurityUpdateCheck(Document):
@@ -38,7 +38,7 @@ class SecurityUpdateCheck(Document):
 		self.status = "Pending"
 		self.save()
 		jingrow.db.commit()
-		jingrow.enqueue_pg(self.doctype, self.name, "_start", queue="short")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_start", queue="short")
 
 	def _start(self):
 		try:
diff --git a/press/press/doctype/self_hosted_server/self_hosted_server.json b/press/press/doctype/self_hosted_server/self_hosted_server.json
index 484aac6b..e1adfd05 100644
--- a/press/press/doctype/self_hosted_server/self_hosted_server.json
+++ b/press/press/doctype/self_hosted_server/self_hosted_server.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-03-07 11:56:33.641999",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/self_hosted_server/self_hosted_server.py b/press/press/doctype/self_hosted_server/self_hosted_server.py
index b3579cc6..2bbd83a0 100644
--- a/press/press/doctype/self_hosted_server/self_hosted_server.py
+++ b/press/press/doctype/self_hosted_server/self_hosted_server.py
@@ -24,10 +24,10 @@ class SelfHostedServer(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.self_hosted_site_apps.self_hosted_site_apps import (
+		from jcloude.jcloude.pagetype.self_hosted_site_apps.self_hosted_site_apps import (
 			SelfHostedSiteApps,
 		)
-		from jcloude.jcloude.doctype.site_analytics_app.site_analytics_app import SiteAnalyticsApp
+		from jcloude.jcloude.pagetype.site_analytics_app.site_analytics_app import SiteAnalyticsApp
 
 		agent_password: DF.Password | None
 		apps: DF.Table[SiteAnalyticsApp]
@@ -109,7 +109,7 @@ class SelfHostedServer(Document):
 		duplicate_server = jingrow.db.get_value("Self Hosted Server", filters, pluck="name")
 
 		if duplicate_server:
-			raise jingrow.DuplicateEntryError(self.doctype, duplicate_server)
+			raise jingrow.DuplicateEntryError(self.pagetype, duplicate_server)
 
 	def set_proxy_details(self):
 		if self.proxy_created or self.proxy_server:
@@ -129,8 +129,8 @@ class SelfHostedServer(Document):
 
 	@jingrow.whitelist()
 	def fetch_apps_and_sites(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_get_apps", queue="long", timeout=1200)
-		jingrow.enqueue_pg(self.doctype, self.name, "_get_sites", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_get_apps", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_get_sites", queue="long", timeout=1200)
 
 	@jingrow.whitelist()
 	def ping_ansible(self):
@@ -275,7 +275,7 @@ class SelfHostedServer(Document):
 					if not jingrow.db.exists("App", {"_newname": app["app"]}):
 						app_pg = jingrow.get_pg(
 							{
-								"doctype": "App",
+								"pagetype": "App",
 								"_newname": app["app"],
 								"title": app["app"].title(),
 								"name": app["app"],
@@ -284,7 +284,7 @@ class SelfHostedServer(Document):
 						app_pg.insert()
 						app_source_pg = jingrow.get_pg(
 							{
-								"doctype": "App Source",
+								"pagetype": "App Source",
 								"app": app["app"],
 								"repository_url": app["remote"],
 								"team": "Administrator",
@@ -377,7 +377,7 @@ class SelfHostedServer(Document):
 
 			jingrow.msgprint(f"Database server record {db_server.name} created")
 		except Exception:
-			jingrow.throw("Adding Server to Database Server Doctype failed")
+			jingrow.throw("Adding Server to Database Server Pagetype failed")
 			self.status = "Broken"
 			self.save()
 			log_error("Inserting a new DB server failed")
@@ -412,7 +412,7 @@ class SelfHostedServer(Document):
 	@jingrow.whitelist()
 	def create_application_server(self):
 		"""
-		Add a new record to the Server doctype
+		Add a new record to the Server pagetype
 		"""
 
 		try:
@@ -498,7 +498,7 @@ class SelfHostedServer(Document):
 
 	@jingrow.whitelist()
 	def restore_files(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_restore_files", queue="long", timeout=2400)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_restore_files", queue="long", timeout=2400)
 
 	def _restore_files(self):
 		"""
@@ -550,7 +550,7 @@ class SelfHostedServer(Document):
 	@jingrow.whitelist()
 	def create_proxy_server(self):
 		"""
-		Add a new record to the Proxy Server doctype
+		Add a new record to the Proxy Server pagetype
 		"""
 		try:
 			proxy_server = jingrow.new_pg(
@@ -623,7 +623,7 @@ class SelfHostedServer(Document):
 
 	@jingrow.whitelist()
 	def update_tls(self):
-		from jcloude.jcloude.doctype.tls_certificate.tls_certificate import (
+		from jcloude.jcloude.pagetype.tls_certificate.tls_certificate import (
 			update_server_tls_certifcate,
 		)
 
@@ -654,7 +654,7 @@ class SelfHostedServer(Document):
 	@property
 	def subscription(self):
 		name = jingrow.db.get_value(
-			"Subscription", {"document_type": self.doctype, "document_name": self.name}
+			"Subscription", {"document_type": self.pagetype, "document_name": self.name}
 		)
 		return jingrow.get_pg("Subscription", name) if name else None
 
diff --git a/press/press/doctype/self_hosted_server/test_self_hosted_server.py b/press/press/doctype/self_hosted_server/test_self_hosted_server.py
index 18246ae5..64667a81 100644
--- a/press/press/doctype/self_hosted_server/test_self_hosted_server.py
+++ b/press/press/doctype/self_hosted_server/test_self_hosted_server.py
@@ -9,12 +9,12 @@ import jingrow
 from jingrow.tests.utils import FrappeTestCase, change_settings
 
 from jcloude.api.tests.test_server import create_test_server_plan
-from jcloude.jcloude.doctype.ansible_play.test_ansible_play import create_test_ansible_play
-from jcloude.jcloude.doctype.jcloude_settings.test_jcloude_settings import (
+from jcloude.jcloude.pagetype.ansible_play.test_ansible_play import create_test_ansible_play
+from jcloude.jcloude.pagetype.jcloude_settings.test_jcloude_settings import (
 	create_test_jcloude_settings,
 )
-from jcloude.jcloude.doctype.self_hosted_server.self_hosted_server import SelfHostedServer
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.self_hosted_server.self_hosted_server import SelfHostedServer
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 
 class TestSelfHostedServer(FrappeTestCase):
@@ -35,11 +35,11 @@ class TestSelfHostedServer(FrappeTestCase):
 	def test_successful_ping_ansible_sets_status_to_pending(self):
 		server = create_test_self_hosted_server("pinger")
 		with patch(
-			"jcloude.jcloude.doctype.self_hosted_server.self_hosted_server.Ansible.run",
+			"jcloude.jcloude.pagetype.self_hosted_server.self_hosted_server.Ansible.run",
 			new=lambda x: create_test_ansible_play(
 				"Ping Server",
 				"ping.yml",
-				server.doctype,
+				server.pagetype,
 				server.name,
 				{"server": server.name},
 			),
@@ -50,11 +50,11 @@ class TestSelfHostedServer(FrappeTestCase):
 	def test_failed_ping_ansible_sets_status_to_unreachable(self):
 		server = create_test_self_hosted_server("pinger")
 		with patch(
-			"jcloude.jcloude.doctype.self_hosted_server.self_hosted_server.Ansible.run",
+			"jcloude.jcloude.pagetype.self_hosted_server.self_hosted_server.Ansible.run",
 			new=lambda x: create_test_ansible_play(
 				"Ping Server",
 				"ping.yml",
-				server.doctype,
+				server.pagetype,
 				server.name,
 				{"server": server.name},
 				"Failure",
@@ -66,7 +66,7 @@ class TestSelfHostedServer(FrappeTestCase):
 	def test_get_apps_populates_apps_child_table(self):
 		server = create_test_self_hosted_server("apps")
 		with patch(
-			"jcloude.jcloude.doctype.self_hosted_server.self_hosted_server.Ansible.run",
+			"jcloude.jcloude.pagetype.self_hosted_server.self_hosted_server.Ansible.run",
 			new=lambda x: _create_test_ansible_play_and_task(
 				server=server,
 				playbook="get_apps.yml",
@@ -97,7 +97,7 @@ class TestSelfHostedServer(FrappeTestCase):
 		server = create_test_self_hosted_server("sites")
 		server.bench_path = "/home/jingrow/jingrow-bench"
 		with patch(
-			"jcloude.jcloude.doctype.self_hosted_server.self_hosted_server.Ansible.run",
+			"jcloude.jcloude.pagetype.self_hosted_server.self_hosted_server.Ansible.run",
 			new=lambda x: _create_test_ansible_play_and_task(
 				server=server,
 				playbook="get_sites.yml",
@@ -188,8 +188,8 @@ class TestSelfHostedServer(FrappeTestCase):
 
 	@change_settings("Jcloude Settings", {"hybrid_domain": "fc.dev"})
 	def test_create_server_and_check_total_records(self):
-		from jcloude.jcloude.doctype.cluster.test_cluster import create_test_cluster
-		from jcloude.jcloude.doctype.proxy_server.test_proxy_server import (
+		from jcloude.jcloude.pagetype.cluster.test_cluster import create_test_cluster
+		from jcloude.jcloude.pagetype.proxy_server.test_proxy_server import (
 			create_test_proxy_server,
 		)
 
@@ -209,8 +209,8 @@ class TestSelfHostedServer(FrappeTestCase):
 
 	@change_settings("Jcloude Settings", {"hybrid_domain": "fc.dev"})
 	def test_create_db_server_and_check_total_records(self):
-		from jcloude.jcloude.doctype.cluster.test_cluster import create_test_cluster
-		from jcloude.jcloude.doctype.proxy_server.test_proxy_server import (
+		from jcloude.jcloude.pagetype.cluster.test_cluster import create_test_cluster
+		from jcloude.jcloude.pagetype.proxy_server.test_proxy_server import (
 			create_test_proxy_server,
 		)
 
@@ -272,7 +272,7 @@ def create_test_self_hosted_server(host, database_plan=None, plan=None) -> SelfH
 	"""
 	server = jingrow.get_pg(
 		{
-			"doctype": "Self Hosted Server",
+			"pagetype": "Self Hosted Server",
 			"ip": jingrow.mock("ipv4"),
 			"private_ip": "192.168.1.1",
 			"mariadb_ip": jingrow.mock("ipv4"),
@@ -299,7 +299,7 @@ def _create_test_ansible_play_and_task(
 	play = create_test_ansible_play(
 		_play,
 		playbook,
-		server.doctype,
+		server.pagetype,
 		server.name,
 		{"server": server.name},
 	)
@@ -308,7 +308,7 @@ def _create_test_ansible_play_and_task(
 		try:
 			task = jingrow.get_pg(
 				{
-					"doctype": "Ansible Task",
+					"pagetype": "Ansible Task",
 					"status": "Success",
 					"play": play.name,
 					"role": play.playbook.split(".")[0],
diff --git a/press/press/doctype/self_hosted_site_apps/self_hosted_site_apps.json b/press/press/doctype/self_hosted_site_apps/self_hosted_site_apps.json
index bc751a78..791e5405 100644
--- a/press/press/doctype/self_hosted_site_apps/self_hosted_site_apps.json
+++ b/press/press/doctype/self_hosted_site_apps/self_hosted_site_apps.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2023-03-16 10:53:27.900551",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/serial_console_log/serial_console_log.json b/press/press/doctype/serial_console_log/serial_console_log.json
index 4f681694..2f681503 100644
--- a/press/press/doctype/serial_console_log/serial_console_log.json
+++ b/press/press/doctype/serial_console_log/serial_console_log.json
@@ -1,7 +1,7 @@
 {
  "actions": [
   {
-   "action": "jcloude.jcloude.doctype.serial_console_log.serial_console_log.run_sysrq",
+   "action": "jcloude.jcloude.pagetype.serial_console_log.serial_console_log.run_sysrq",
    "action_type": "Server Action",
    "group": "Actions",
    "label": "Run SysRQ Command"
@@ -9,7 +9,7 @@
  ],
  "allow_rename": 1,
  "creation": "2023-12-29 13:02:05.574172",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "server_type",
@@ -28,8 +28,8 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Server Type",
-   "link_filters": "[[{\"fieldname\":\"server_type\",\"field_option\":\"DocType\"},\"name\",\"like\",\"%Server\"]]",
-   "options": "DocType",
+   "link_filters": "[[{\"fieldname\":\"server_type\",\"field_option\":\"PageType\"},\"name\",\"like\",\"%Server\"]]",
+   "options": "PageType",
    "reqd": 1,
    "set_only_once": 1
   },
diff --git a/press/press/doctype/serial_console_log/serial_console_log.py b/press/press/doctype/serial_console_log/serial_console_log.py
index e85d7b7b..8c0207e9 100644
--- a/press/press/doctype/serial_console_log/serial_console_log.py
+++ b/press/press/doctype/serial_console_log/serial_console_log.py
@@ -10,7 +10,7 @@ import jingrow
 import pexpect
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import ansi_escape
+from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import ansi_escape
 
 
 class SerialConsoleLog(Document):
@@ -57,7 +57,7 @@ class SerialConsoleLog(Document):
 	@jingrow.whitelist()
 	def run_sysrq(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			method="_run_sysrq",
 			queue="long",
@@ -122,7 +122,7 @@ class FakeIO(StringIO):
 		message = {"name": self.console, "output": output}
 		jingrow.publish_realtime(
 			event="serial_console_log_update",
-			doctype="Serial Console Log",
+			pagetype="Serial Console Log",
 			docname=self.console,
 			user=jingrow.session.user,
 			message=message,
@@ -158,5 +158,5 @@ SYSRQ_COMMANDS = {
 def run_sysrq(pg):
 	jingrow.only_for("System Manager")
 	parsed_pg = jingrow.parse_json(pg)
-	jingrow.get_pg(parsed_pg.doctype, parsed_pg.name).run_sysrq()
+	jingrow.get_pg(parsed_pg.pagetype, parsed_pg.name).run_sysrq()
 	return pg
diff --git a/press/press/doctype/server/patches/set_plan_and_subscription.py b/press/press/doctype/server/patches/set_plan_and_subscription.py
index 372e6a13..816da38c 100644
--- a/press/press/doctype/server/patches/set_plan_and_subscription.py
+++ b/press/press/doctype/server/patches/set_plan_and_subscription.py
@@ -6,14 +6,14 @@ import jingrow
 
 def execute():
 	DOCTYPES = ["Server", "Database Server"]
-	for doctype in DOCTYPES:
+	for pagetype in DOCTYPES:
 		server_names = jingrow.get_all(
-			doctype,
+			pagetype,
 			{"status": ("!=", "Archived"), "virtual_machine": ("is", "set")},
 			pluck="name",
 		)
 		for server_name in server_names:
-			server = jingrow.get_pg(doctype, server_name)
+			server = jingrow.get_pg(pagetype, server_name)
 
 			subscription = jingrow.get_all(
 				"Subscription", ["name", "plan"], {"enabled": True, "document_name": server.name}
@@ -27,7 +27,7 @@ def execute():
 				# Subscription exists but plan is not set
 				# Set Server.plan to the plan of the subscription
 				print(
-					f"Subscription exists, but plan isn't set for {doctype} {server.name} setting plan to {subscription[0].plan}"
+					f"Subscription exists, but plan isn't set for {pagetype} {server.name} setting plan to {subscription[0].plan}"
 				)
 				server.plan = subscription[0].plan
 				server.save()
@@ -35,7 +35,7 @@ def execute():
 				# Plan is set but no subscription exists
 				# Create a subscription
 				print(
-					f"Plan is set but no subscription exists for {doctype} {server.name} creating subscription for {server.plan}"
+					f"Plan is set but no subscription exists for {pagetype} {server.name} creating subscription for {server.plan}"
 				)
 				server.create_subscription(server.plan)
 			if not subscription and not server.plan:
@@ -48,7 +48,7 @@ def execute():
 					"Server Plan",
 					{
 						"enabled": True,
-						"server_type": doctype,
+						"server_type": pagetype,
 						"cluster": server.cluster,
 						"instance_type": instance_type,
 						"premium": False,
@@ -56,7 +56,7 @@ def execute():
 				)
 				if plan:
 					print(
-						f"Found plan for {doctype} {server.name} based on instance_type {instance_type} setting plan to {plan}"
+						f"Found plan for {pagetype} {server.name} based on instance_type {instance_type} setting plan to {plan}"
 					)
 					server.plan = plan[0].name
 					server.save()
@@ -68,7 +68,7 @@ def execute():
 						"Server Plan",
 						{
 							"enabled": True,
-							"server_type": doctype,
+							"server_type": pagetype,
 							"cluster": server.cluster,
 							"instance_type": instance_type,
 							"premium": False,
@@ -76,7 +76,7 @@ def execute():
 					)
 
 					print(
-						f"No exact match plan found for {doctype} {server.name} based on instance_type {instance_type} found next best plan {plan[0].name}"
+						f"No exact match plan found for {pagetype} {server.name} based on instance_type {instance_type} found next best plan {plan[0].name}"
 					)
 					server.plan = plan[0].name
 					server.save()
diff --git a/press/press/doctype/server/server.json b/press/press/doctype/server/server.json
index 5a09b33a..e083cbd3 100644
--- a/press/press/doctype/server/server.json
+++ b/press/press/doctype/server/server.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2019-12-09 12:34:13.844800",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -730,7 +730,7 @@
  ],
  "links": [
   {
-   "link_doctype": "Auto Scale Record",
+   "link_pagetype": "Auto Scale Record",
    "link_fieldname": "primary_server"
   }
  ],
diff --git a/press/press/doctype/server/server.py b/press/press/doctype/server/server.py
index c826620c..e2254b2d 100644
--- a/press/press/doctype/server/server.py
+++ b/press/press/doctype/server/server.py
@@ -26,39 +26,39 @@ from jcloude.agent import Agent
 from jcloude.api.client import dashboard_whitelist
 from jcloude.exceptions import VolumeResizeLimitError
 from jcloude.guards import role_guard
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.add_on_storage_log.add_on_storage_log import (
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.add_on_storage_log.add_on_storage_log import (
 	insert_addon_storage_log,
 )
-from jcloude.jcloude.doctype.ansible_console.ansible_console import AnsibleAdHoc
-from jcloude.jcloude.doctype.auto_scale_record.auto_scale_record import (
+from jcloude.jcloude.pagetype.ansible_console.ansible_console import AnsibleAdHoc
+from jcloude.jcloude.pagetype.auto_scale_record.auto_scale_record import (
 	create_prometheus_rule_for_scaling,
 	is_secondary_ready_for_scale_down,
 	update_or_delete_prometheus_rule_for_scaling,
 )
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
-from jcloude.jcloude.doctype.resource_tag.tag_helpers import TagHelpers
-from jcloude.jcloude.doctype.server_activity.server_activity import log_server_activity
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.resource_tag.tag_helpers import TagHelpers
+from jcloude.jcloude.pagetype.server_activity.server_activity import log_server_activity
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 from jcloude.runner import Ansible
 from jcloude.utils import fmt_timedelta, log_error
 
 if typing.TYPE_CHECKING:
-	from jcloude.infrastructure.doctype.arm_build_record.arm_build_record import ARMBuildRecord
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.ansible_play.ansible_play import AnsiblePlay
-	from jcloude.jcloude.doctype.auto_scale_record.auto_scale_record import AutoScaleRecord
-	from jcloude.jcloude.doctype.bench.bench import Bench
-	from jcloude.jcloude.doctype.cluster.cluster import Cluster
-	from jcloude.jcloude.doctype.database_server.database_server import DatabaseServer
-	from jcloude.jcloude.doctype.mariadb_variable.mariadb_variable import MariaDBVariable
-	from jcloude.jcloude.doctype.nfs_volume_detachment.nfs_volume_detachment import NFSVolumeDetachment
-	from jcloude.jcloude.doctype.jcloude_job.jcloude_job import PressJob
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
-	from jcloude.jcloude.doctype.server_mount.server_mount import ServerMount
-	from jcloude.jcloude.doctype.server_plan.server_plan import ServerPlan
-	from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
-	from jcloude.jcloude.doctype.virtual_machine_volume.virtual_machine_volume import VirtualMachineVolume
+	from jcloude.infrastructure.pagetype.arm_build_record.arm_build_record import ARMBuildRecord
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.ansible_play.ansible_play import AnsiblePlay
+	from jcloude.jcloude.pagetype.auto_scale_record.auto_scale_record import AutoScaleRecord
+	from jcloude.jcloude.pagetype.bench.bench import Bench
+	from jcloude.jcloude.pagetype.cluster.cluster import Cluster
+	from jcloude.jcloude.pagetype.database_server.database_server import DatabaseServer
+	from jcloude.jcloude.pagetype.mariadb_variable.mariadb_variable import MariaDBVariable
+	from jcloude.jcloude.pagetype.nfs_volume_detachment.nfs_volume_detachment import NFSVolumeDetachment
+	from jcloude.jcloude.pagetype.jcloude_job.jcloude_job import PressJob
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.server_mount.server_mount import ServerMount
+	from jcloude.jcloude.pagetype.server_plan.server_plan import ServerPlan
+	from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
+	from jcloude.jcloude.pagetype.virtual_machine_volume.virtual_machine_volume import VirtualMachineVolume
 
 
 from typing import Literal, TypedDict
@@ -106,7 +106,7 @@ class BaseServer(Document, TagHelpers):
 
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
-		Server = jingrow.qb.DocType("Server")
+		Server = jingrow.qb.PageType("Server")
 
 		status = filters.get("status")
 		if status == "Archived":
@@ -188,7 +188,7 @@ class BaseServer(Document, TagHelpers):
 		)
 		pg.owner_email = jingrow.db.get_value("Team", self.team, "user")
 
-		if self.doctype == "Server":
+		if self.pagetype == "Server":
 			pg.secondary_server = self.secondary_server
 			pg.scaled_up = self.scaled_up
 
@@ -204,11 +204,11 @@ class BaseServer(Document, TagHelpers):
 
 	@dashboard_whitelist()
 	def update_communication_infos(self, values: list[dict]):
-		if self.doctype != "Server":
+		if self.pagetype != "Server":
 			jingrow.throw("Setting up communication info is only allowed for App Server")
 			return
 
-		from jcloude.jcloude.doctype.communication_info.communication_info import (
+		from jcloude.jcloude.pagetype.communication_info.communication_info import (
 			update_communication_infos as update_infos,
 		)
 
@@ -233,7 +233,7 @@ class BaseServer(Document, TagHelpers):
 	) -> None:
 		add_on_storage_log = None
 		storage_parameters = {
-			"doctype": "Add On Storage Log",
+			"pagetype": "Add On Storage Log",
 			"adding_storage": increment,
 			is_auto_triggered: is_auto_triggered,
 		}
@@ -314,7 +314,7 @@ class BaseServer(Document, TagHelpers):
 	@dashboard_whitelist()
 	def configure_auto_add_storage(self, server: str, enabled: bool, min: int = 0, max: int = 0) -> None:
 		if not enabled:
-			jingrow.db.set_value(self.doctype, self.name, "auto_increase_storage", False)
+			jingrow.db.set_value(self.pagetype, self.name, "auto_increase_storage", False)
 			return
 
 		if min < 0 or max < 0:
@@ -346,9 +346,9 @@ class BaseServer(Document, TagHelpers):
 
 	def get_actions(self):
 		server_type = ""
-		if self.doctype == "Server":
+		if self.pagetype == "Server":
 			server_type = "application server"
-		elif self.doctype == "Database Server":
+		elif self.pagetype == "Database Server":
 			if self.is_replication_setup:
 				server_type = "replication server"
 			else:
@@ -375,7 +375,7 @@ class BaseServer(Document, TagHelpers):
 				"action": "Cleanup Server",
 				"description": f"Cleanup unused files on the {server_type}",
 				"button_label": "Cleanup",
-				"condition": self.status == "Active" and self.doctype == "Server",
+				"condition": self.status == "Active" and self.pagetype == "Server",
 				"pg_method": "cleanup_unused_files",
 				"group": f"{server_type.title()} Actions",
 			},
@@ -384,7 +384,7 @@ class BaseServer(Document, TagHelpers):
 				"description": "Setup a secondary application server to auto scale to during high loads",
 				"button_label": "Setup",
 				"condition": self.status == "Active"
-				and self.doctype == "Server"
+				and self.pagetype == "Server"
 				and not self.secondary_server
 				and self.cluster == "Mumbai",
 				"group": "Application Server Actions",
@@ -395,7 +395,7 @@ class BaseServer(Document, TagHelpers):
 				"button_label": "Teardown",
 				"condition": (
 					self.status == "Active"
-					and self.doctype == "Server"
+					and self.pagetype == "Server"
 					# Only applicable for primary application servers
 					and self.secondary_server
 					and self.benches_on_shared_volume
@@ -406,14 +406,14 @@ class BaseServer(Document, TagHelpers):
 				"action": "Drop server",
 				"description": "Drop both the application and database servers",
 				"button_label": "Drop",
-				"condition": self.status == "Active" and self.doctype == "Server",
+				"condition": self.status == "Active" and self.pagetype == "Server",
 				"pg_method": "drop_server",
 				"group": "Dangerous Actions",
 			},
 		]
 
 		for action in actions:
-			action["server_doctype"] = self.doctype
+			action["server_pagetype"] = self.pagetype
 			action["server_name"] = self.name
 
 		return [action for action in actions if action.get("condition", True)]
@@ -427,7 +427,7 @@ class BaseServer(Document, TagHelpers):
 		return jingrow.db.get_value("Virtual Machine Volume", {"volume_id": volume.volume_id}, "size")
 
 	def _get_app_and_database_servers(self) -> tuple[Server, DatabaseServer]:
-		if self.doctype == "Database Server":
+		if self.pagetype == "Database Server":
 			app_server_name = jingrow.db.get_value("Server", {"database_server": self.name}, "name")
 			app_server = jingrow.get_pg("Server", app_server_name)
 			return app_server, self
@@ -456,13 +456,13 @@ class BaseServer(Document, TagHelpers):
 		if not self.domain:
 			self.domain = jingrow.db.get_single_value("Jcloude Settings", "domain")
 		self.name = f"{self.hostname}.{self.domain}"
-		if self.doctype in ["Database Server", "Server", "Proxy Server"] and self.is_self_hosted:
+		if self.pagetype in ["Database Server", "Server", "Proxy Server"] and self.is_self_hosted:
 			self.name = f"{self.hostname}.{self.self_hosted_server_domain}"
 
 	def validate(self):
 		self.validate_cluster()
 		self.validate_agent_password()
-		if self.doctype == "Database Server" and not self.self_hosted_mariadb_server:
+		if self.pagetype == "Database Server" and not self.self_hosted_mariadb_server:
 			self.self_hosted_mariadb_server = self.private_ip
 
 		if not self.hostname_abbreviation:
@@ -475,7 +475,7 @@ class BaseServer(Document, TagHelpers):
 
 	def after_insert(self):
 		if self.ip and (
-			self.doctype not in ["Database Server", "Server", "Proxy Server"] or not self.is_self_hosted
+			self.pagetype not in ["Database Server", "Server", "Proxy Server"] or not self.is_self_hosted
 		):
 			self.create_dns_record()
 			self.update_virtual_machine_name()
@@ -507,7 +507,7 @@ class BaseServer(Document, TagHelpers):
 							"ResourceRecordSet": {
 								"Name": self.name,
 								"Type": "A",
-								"TTL": 3600 if self.doctype == "Proxy Server" else 300,
+								"TTL": 3600 if self.pagetype == "Proxy Server" else 300,
 								"ResourceRecords": [{"Value": self.ip}],
 							},
 						}
@@ -604,25 +604,25 @@ class BaseServer(Document, TagHelpers):
 
 	@jingrow.whitelist()
 	def ping_agent(self):
-		agent = Agent(self.name, self.doctype)
+		agent = Agent(self.name, self.pagetype)
 		return agent.ping()
 
 	@jingrow.whitelist()
 	def ping_mariadb(self) -> bool:
 		try:
-			agent = Agent(self.name, self.doctype)
+			agent = Agent(self.name, self.pagetype)
 			return agent.ping_database(self).get("reachable")
 		except Exception:
 			return False
 
 	@jingrow.whitelist()
 	def ping_agent_job(self):
-		agent = Agent(self.name, self.doctype)
+		agent = Agent(self.name, self.pagetype)
 		return agent.create_agent_job("Ping Job", "ping_job").name
 
 	@jingrow.whitelist()
 	def update_agent(self):
-		agent = Agent(self.name, self.doctype)
+		agent = Agent(self.name, self.pagetype)
 		return agent.update()
 
 	@jingrow.whitelist()
@@ -630,7 +630,7 @@ class BaseServer(Document, TagHelpers):
 		if self.provider == "Generic":
 			self._prepare_server()
 		else:
-			jingrow.enqueue_pg(self.doctype, self.name, "_prepare_server", queue="long", timeout=2400)
+			jingrow.enqueue_pg(self.pagetype, self.name, "_prepare_server", queue="long", timeout=2400)
 
 	def _prepare_server(self):
 		try:
@@ -662,13 +662,13 @@ class BaseServer(Document, TagHelpers):
 	def setup_server(self):
 		self.status = "Installing"
 		self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_server", queue="long", timeout=2400)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_server", queue="long", timeout=2400)
 
 	@jingrow.whitelist()
 	def install_nginx(self):
 		self.status = "Installing"
 		self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_install_nginx", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_install_nginx", queue="long", timeout=1200)
 
 	def _install_nginx(self):
 		try:
@@ -691,7 +691,7 @@ class BaseServer(Document, TagHelpers):
 
 	@jingrow.whitelist()
 	def install_filebeat(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_install_filebeat", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_install_filebeat", queue="long", timeout=1200)
 
 	def _install_filebeat(self):
 		log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server")
@@ -707,7 +707,7 @@ class BaseServer(Document, TagHelpers):
 				user=self._ssh_user(),
 				port=self._ssh_port(),
 				variables={
-					"server_type": self.doctype,
+					"server_type": self.pagetype,
 					"server": self.name,
 					"log_server": log_server,
 					"kibana_password": kibana_password,
@@ -719,7 +719,7 @@ class BaseServer(Document, TagHelpers):
 
 	@jingrow.whitelist()
 	def install_exporters(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_install_exporters", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_install_exporters", queue="long", timeout=1200)
 
 	@jingrow.whitelist()
 	def ping_ansible(self):
@@ -736,7 +736,7 @@ class BaseServer(Document, TagHelpers):
 
 	@jingrow.whitelist()
 	def update_agent_ansible(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_update_agent_ansible")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_update_agent_ansible")
 
 	def _update_agent_ansible(self):
 		try:
@@ -818,7 +818,7 @@ class BaseServer(Document, TagHelpers):
 		return False
 
 	def _cleanup_unused_files(self, force: bool = False):
-		agent = Agent(self.name, self.doctype)
+		agent = Agent(self.name, self.pagetype)
 		if agent.should_skip_requests():
 			return
 		agent.cleanup_unused_files(force)
@@ -845,7 +845,7 @@ class BaseServer(Document, TagHelpers):
 			jingrow.log_error(
 				title="Error removing glassfile",
 				message=e.output.decode(),
-				reference_doctype=self.doctype,
+				reference_pagetype=self.pagetype,
 				reference_name=self.name,
 			)
 
@@ -871,7 +871,7 @@ class BaseServer(Document, TagHelpers):
 			return
 		# Restart MariaDB if MariaDB disk is full
 		mountpoint = self.guess_data_disk_mountpoint()
-		restart_mariadb = self.doctype == "Database Server" and self.is_disk_full(
+		restart_mariadb = self.pagetype == "Database Server" and self.is_disk_full(
 			mountpoint
 		)  # check before breaking glass to ensure state of mariadb
 		self.break_glass()
@@ -900,7 +900,7 @@ class BaseServer(Document, TagHelpers):
 			log_error("EC2 Volume Extend Exception", server=server.as_dict())
 
 	def enqueue_extend_ec2_volume(self, device, log):
-		jingrow.enqueue_pg(self.doctype, self.name, "extend_ec2_volume", device=device, log=log)
+		jingrow.enqueue_pg(self.pagetype, self.name, "extend_ec2_volume", device=device, log=log)
 
 	@cached_property
 	def time_to_wait_before_updating_volume(self) -> timedelta | int:
@@ -954,9 +954,9 @@ class BaseServer(Document, TagHelpers):
 		volumes = self.get_volume_mounts()
 		if volumes or self.has_data_volume:
 			# Adding this condition since this method is called from both server and database server doctypes
-			if self.doctype == "Server":
+			if self.pagetype == "Server":
 				mountpoint = BENCH_DATA_MNT_POINT
-			elif self.doctype == "Database Server":
+			elif self.pagetype == "Database Server":
 				mountpoint = MARIADB_DATA_MNT_POINT
 		else:
 			mountpoint = "/"
@@ -998,8 +998,8 @@ class BaseServer(Document, TagHelpers):
 	def _create_initial_plan_change(self, plan):
 		jingrow.get_pg(
 			{
-				"doctype": "Plan Change",
-				"document_type": self.doctype,
+				"pagetype": "Plan Change",
+				"document_type": self.pagetype,
 				"document_name": self.name,
 				"from_plan": "",
 				"to_plan": plan,
@@ -1013,7 +1013,7 @@ class BaseServer(Document, TagHelpers):
 		name = jingrow.db.get_value(
 			"Subscription",
 			{
-				"document_type": self.doctype,
+				"document_type": self.pagetype,
 				"document_name": self.name,
 				"plan_type": "Server Plan",
 				"plan": self.plan,
@@ -1026,7 +1026,7 @@ class BaseServer(Document, TagHelpers):
 		name = jingrow.db.get_value(
 			"Subscription",
 			{
-				"document_type": self.doctype,
+				"document_type": self.pagetype,
 				"document_name": self.name,
 				"plan_type": "Server Storage Plan",
 			},
@@ -1037,7 +1037,7 @@ class BaseServer(Document, TagHelpers):
 	def rename_server(self):
 		self.status = "Installing"
 		self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_rename_server", queue="long", timeout=2400)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_rename_server", queue="long", timeout=2400)
 
 	@jingrow.whitelist()
 	def archive(self):
@@ -1046,7 +1046,7 @@ class BaseServer(Document, TagHelpers):
 			{
 				"job_type": "Archive Server",
 				"server": self.name,
-				"server_type": self.doctype,
+				"server_type": self.pagetype,
 				"status": "Success",
 			},
 		):
@@ -1083,11 +1083,11 @@ class BaseServer(Document, TagHelpers):
 			self.status = "Archived"
 			self.save()
 
-			if self.doctype == "Server":
+			if self.pagetype == "Server":
 				jingrow.db.set_value("Self Hosted Server", {"server": self.name}, "status", "Archived")
 
 		else:
-			jingrow.enqueue_pg(self.doctype, self.name, "_archive", queue="long")
+			jingrow.enqueue_pg(self.pagetype, self.name, "_archive", queue="long")
 		self.disable_subscription()
 
 	def _archive(self):
@@ -1140,8 +1140,8 @@ class BaseServer(Document, TagHelpers):
 		self.reload()
 		jingrow.get_pg(
 			{
-				"doctype": "Plan Change",
-				"document_type": self.doctype,
+				"pagetype": "Plan Change",
+				"document_type": self.pagetype,
 				"document_name": self.name,
 				"from_plan": self.plan,
 				"to_plan": plan.name,
@@ -1157,9 +1157,9 @@ class BaseServer(Document, TagHelpers):
 			arguments = {}
 		return jingrow.get_pg(
 			{
-				"doctype": "Jcloude Job",
+				"pagetype": "Jcloude Job",
 				"job_type": job_name,
-				"server_type": self.doctype,
+				"server_type": self.pagetype,
 				"server": self.name,
 				"virtual_machine": self.virtual_machine,
 				"arguments": json.dumps(arguments, indent=2, sort_keys=True),
@@ -1201,7 +1201,7 @@ class BaseServer(Document, TagHelpers):
 	@jingrow.whitelist()
 	def setup_nfs(self):
 		"""Allow nfs setup on this server"""
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_nfs", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_nfs", queue="long", timeout=1200)
 
 	def _setup_nfs(self):
 		try:
@@ -1218,7 +1218,7 @@ class BaseServer(Document, TagHelpers):
 	@jingrow.whitelist()
 	def increase_swap(self, swap_size=4):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"increase_swap_locked",
 			queue="long",
@@ -1258,7 +1258,7 @@ class BaseServer(Document, TagHelpers):
 		Replace existing swap files with new swap file of given size
 		"""
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"reset_swap_locked",
 			queue="long",
@@ -1292,7 +1292,7 @@ class BaseServer(Document, TagHelpers):
 			log_error("Reset swap exception", pg=self)
 
 	def add_glass_file(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_add_glass_file")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_add_glass_file")
 
 	def _add_glass_file(self):
 		try:
@@ -1308,7 +1308,7 @@ class BaseServer(Document, TagHelpers):
 
 	@jingrow.whitelist()
 	def setup_mysqldump(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_mysqldump")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_mysqldump")
 
 	def _setup_mysqldump(self):
 		try:
@@ -1323,7 +1323,7 @@ class BaseServer(Document, TagHelpers):
 			log_error("MySQLdump Setup Exception", pg=self)
 
 	def setup_iptables(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_iptables")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_iptables")
 
 	def _setup_iptables(self):
 		try:
@@ -1339,7 +1339,7 @@ class BaseServer(Document, TagHelpers):
 
 	@jingrow.whitelist()
 	def set_swappiness(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_set_swappiness")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_set_swappiness")
 
 	def _set_swappiness(self):
 		try:
@@ -1355,7 +1355,7 @@ class BaseServer(Document, TagHelpers):
 
 	@jingrow.whitelist()
 	def update_tls_certificate(self):
-		from jcloude.jcloude.doctype.tls_certificate.tls_certificate import (
+		from jcloude.jcloude.pagetype.tls_certificate.tls_certificate import (
 			update_server_tls_certifcate,
 		)
 
@@ -1383,11 +1383,11 @@ class BaseServer(Document, TagHelpers):
 
 	@property
 	def agent(self):
-		return Agent(self.name, server_type=self.doctype)
+		return Agent(self.name, server_type=self.pagetype)
 
 	@jingrow.whitelist()
 	def fetch_security_updates(self):
-		from jcloude.jcloude.doctype.security_update.security_update import SecurityUpdate
+		from jcloude.jcloude.pagetype.security_update.security_update import SecurityUpdate
 
 		jingrow.enqueue(SecurityUpdate.fetch_security_updates, server_obj=self)
 
@@ -1414,7 +1414,7 @@ class BaseServer(Document, TagHelpers):
 		if self.provider != "AWS EC2":
 			raise NotImplementedError
 		console = jingrow.new_pg("Serial Console Log")
-		console.server_type = self.doctype
+		console.server_type = self.pagetype
 		console.server = self.name
 		console.virtual_machine = self.virtual_machine
 		console.action = "reboot"
@@ -1453,7 +1453,7 @@ class BaseServer(Document, TagHelpers):
 
 	def set_default_mount_points(self):
 		first = self.mounts[0]
-		if self.doctype == "Server":
+		if self.pagetype == "Server":
 			first.mount_point = BENCH_DATA_MNT_POINT
 			self.append(
 				"mounts",
@@ -1475,7 +1475,7 @@ class BaseServer(Document, TagHelpers):
 					"mount_point_group": "root",
 				},
 			)
-		elif self.doctype == "Database Server":
+		elif self.pagetype == "Database Server":
 			first.mount_point = MARIADB_DATA_MNT_POINT
 			self.append(
 				"mounts",
@@ -1551,7 +1551,7 @@ class BaseServer(Document, TagHelpers):
 		return [mount.as_dict() for mount in self.mounts if mount.mount_type == "Volume"]
 
 	def _create_arm_build(self, build: str) -> str | None:
-		from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import (
+		from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import (
 			_create_arm_build as arm_build_util,
 		)
 
@@ -1644,7 +1644,7 @@ class BaseServer(Document, TagHelpers):
 	@jingrow.whitelist()
 	def start_active_benches(self):
 		benches = jingrow.get_all("Bench", {"server": self.name, "status": "Active"}, pluck="name")
-		jingrow.enqueue_pg(self.doctype, self.name, "_start_active_benches", benches=benches)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_start_active_benches", benches=benches)
 
 	def _start_active_benches(self, benches: list[str]):
 		try:
@@ -1689,7 +1689,7 @@ class BaseServer(Document, TagHelpers):
 			jingrow.throw(_("No mounts defined to mount"))
 
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_mount_volumes",
 			queue="long",
@@ -1715,10 +1715,10 @@ class BaseServer(Document, TagHelpers):
 	):
 		try:
 			variables = {
-				"stop_docker_before_mount": self.doctype == "Server" and stop_docker_before_mount,
-				"stop_mariadb_before_mount": self.doctype == "Database Server" and stop_mariadb_before_mount,
-				"start_docker_after_mount": self.doctype == "Server" and start_docker_after_mount,
-				"start_mariadb_after_mount": self.doctype == "Database Server" and start_mariadb_after_mount,
+				"stop_docker_before_mount": self.pagetype == "Server" and stop_docker_before_mount,
+				"stop_mariadb_before_mount": self.pagetype == "Database Server" and stop_mariadb_before_mount,
+				"start_docker_after_mount": self.pagetype == "Server" and start_docker_after_mount,
+				"start_mariadb_after_mount": self.pagetype == "Database Server" and start_mariadb_after_mount,
 				# If other services are stopped, we can skip filebeat restart
 				"stop_filebeat_before_mount": stop_docker_before_mount or stop_mariadb_before_mount,
 				"start_filebeat_after_mount": stop_docker_before_mount or stop_mariadb_before_mount,
@@ -1727,7 +1727,7 @@ class BaseServer(Document, TagHelpers):
 				"hetzner_cloud": self.provider == "Hetzner",
 				**self.get_mount_variables(),
 			}
-			if self.doctype == "Database Server" and self.provider != "Generic":
+			if self.pagetype == "Database Server" and self.provider != "Generic":
 				variables["mariadb_bind_address"] = jingrow.get_value(
 					"Virtual Machine", self.virtual_machine, "private_ip_address"
 				)
@@ -1790,7 +1790,7 @@ class BaseServer(Document, TagHelpers):
 
 	def wait_for_cloud_init(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_wait_for_cloud_init",
 			queue="short",
@@ -1870,7 +1870,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 		Send disk expansion email to users with disabled auto addon storage at 80% capacity
 		Calculate the disk usage over a 30 hour period and take 25 percent of that
 		"""
-		server: Server | DatabaseServer = jingrow.get_pg(self.doctype, self.name)  # type: ignore
+		server: Server | DatabaseServer = jingrow.get_pg(self.pagetype, self.name)  # type: ignore
 		if server.auto_increase_storage:
 			return
 
@@ -1888,7 +1888,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 		disk_capacity_flt = round(disk_capacity / 1024 / 1024 / 1024, 2)
 
 		jingrow.sendmail(
-			recipients=get_communication_info("Email", "Incident", self.doctype, self.name),
+			recipients=get_communication_info("Email", "Incident", self.pagetype, self.name),
 			subject=f"Important: Server {server.name} has used 80% of the available space",
 			template="disabled_auto_disk_expansion",
 			args={
@@ -1920,7 +1920,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 		"""
 
 		buffer = self.size_to_increase_by_for_20_percent_available(mountpoint)
-		server: Server | DatabaseServer = jingrow.get_pg(self.doctype, self.name)
+		server: Server | DatabaseServer = jingrow.get_pg(self.pagetype, self.name)
 		disk_capacity = self.disk_capacity(mountpoint)
 
 		current_disk_usage = round((disk_capacity - self.free_space(mountpoint)) / 1024 / 1024 / 1024, 2)
@@ -1928,7 +1928,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 		if not server.auto_increase_storage and (not server.has_data_volume or mountpoint != "/"):
 			TelegramMessage.enqueue(
 				f"Not increasing disk (mount point {mountpoint}) on "
-				f"[{self.name}]({jingrow.utils.get_url_to_form(self.doctype, self.name)}) "
+				f"[{self.name}]({jingrow.utils.get_url_to_form(self.pagetype, self.name)}) "
 				f"by {buffer + additional}G as auto disk increase disabled by user",
 				"Information",
 			)
@@ -1950,7 +1950,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 
 		TelegramMessage.enqueue(
 			f"Increasing disk (mount point {mountpoint}) on "
-			f"[{self.name}]({jingrow.utils.get_url_to_form(self.doctype, self.name)}) "
+			f"[{self.name}]({jingrow.utils.get_url_to_form(self.pagetype, self.name)}) "
 			f"by {buffer + additional}G",
 			"Information",
 		)
@@ -1965,7 +1965,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 
 	def prune_docker_system(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_prune_docker_system",
 			queue="long",
@@ -1986,7 +1986,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 
 	@jingrow.whitelist()
 	def reload_nginx(self):
-		agent = Agent(self.name, server_type=self.doctype)
+		agent = Agent(self.name, server_type=self.pagetype)
 		agent.reload_nginx()
 
 	def _ssh_user(self):
@@ -2000,10 +2000,10 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 		return self.ssh_port or 22
 
 	def get_primary_jingrow_public_key(self):
-		if primary_public_key := jingrow.db.get_value(self.doctype, self.primary, "jingrow_public_key"):
+		if primary_public_key := jingrow.db.get_value(self.pagetype, self.primary, "jingrow_public_key"):
 			return primary_public_key
 
-		primary = jingrow.get_pg(self.doctype, self.primary)
+		primary = jingrow.get_pg(self.pagetype, self.primary)
 		ansible = Ansible(
 			playbook="fetch_jingrow_public_key.yml",
 			server=primary,
@@ -2012,13 +2012,13 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 		)
 		play = ansible.run()
 		if play.status == "Success":
-			return jingrow.db.get_value(self.doctype, self.primary, "jingrow_public_key")
+			return jingrow.db.get_value(self.pagetype, self.primary, "jingrow_public_key")
 		jingrow.throw(f"Failed to fetch {primary.name}'s Jingrow public key")
 		return None
 
 	def copy_files(self, source, destination):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_copy_files",
 			source=source,
@@ -2045,7 +2045,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 
 	@jingrow.whitelist()
 	def install_cadvisor(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_install_cadvisor")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_install_cadvisor")
 
 	def _install_cadvisor(self):
 		try:
@@ -2064,7 +2064,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 		"""
 		Corresponds to Set additional config step in Create Server Jcloude Job
 		"""
-		if self.doctype == "Database Server":
+		if self.pagetype == "Database Server":
 			default_variables = jingrow.get_all("MariaDB Variable", {"set_on_new_servers": 1}, pluck="name")
 			for var_name in default_variables:
 				var: MariaDBVariable = jingrow.get_pg("MariaDB Variable", var_name)
@@ -2074,7 +2074,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 		self.add_glass_file()
 		self.install_filebeat()
 
-		if self.doctype == "Server":
+		if self.pagetype == "Server":
 			self.install_nfs_common()
 			self.setup_mysqldump()
 			self.install_earlyoom()
@@ -2092,7 +2092,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 				)  # Update the status of the primary server
 				jingrow.db.commit()
 
-		if self.doctype == "Database Server":
+		if self.pagetype == "Database Server":
 			self.adjust_memory_config()
 			self.provide_jingrow_user_du_and_find_permission()
 			self.setup_logrotate()
@@ -2101,7 +2101,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 			if self.has_data_volume:
 				self.setup_binlog_indexes_folder()
 
-		if self.doctype == "Proxy Server":
+		if self.pagetype == "Proxy Server":
 			self.setup_wildcard_hosts()
 
 		self.validate_mounts()
@@ -2110,7 +2110,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 	def get_wildcard_domains(self):
 		wildcard_domains = []
 		for domain in self.domains:
-			if domain.domain == self.domain and self.doctype == "Proxy Server":
+			if domain.domain == self.domain and self.pagetype == "Proxy Server":
 				# self.domain certs are symlinks
 				continue
 			certificate_name = jingrow.db.get_value(
@@ -2132,7 +2132,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}}
 
 	@jingrow.whitelist()
 	def setup_wildcard_hosts(self):
-		agent = Agent(self.name, server_type=self.doctype)
+		agent = Agent(self.name, server_type=self.pagetype)
 		wildcards = self.get_wildcard_domains()
 		return agent.setup_wildcard_hosts(wildcards)
 
@@ -2191,10 +2191,10 @@ class Server(BaseServer):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.auto_scale_trigger.auto_scale_trigger import AutoScaleTrigger
-		from jcloude.jcloude.doctype.communication_info.communication_info import CommunicationInfo
-		from jcloude.jcloude.doctype.resource_tag.resource_tag import ResourceTag
-		from jcloude.jcloude.doctype.server_mount.server_mount import ServerMount
+		from jcloude.jcloude.pagetype.auto_scale_trigger.auto_scale_trigger import AutoScaleTrigger
+		from jcloude.jcloude.pagetype.communication_info.communication_info import CommunicationInfo
+		from jcloude.jcloude.pagetype.resource_tag.resource_tag import ResourceTag
+		from jcloude.jcloude.pagetype.server_mount.server_mount import ServerMount
 
 		agent_password: DF.Password | None
 		auto_add_storage_max: DF.Int
@@ -2353,7 +2353,7 @@ class Server(BaseServer):
 				"button_label": "Manage",
 				"pg_method": "dummy",
 				"group": "Application Server Actions",
-				"server_doctype": "Server",
+				"server_pagetype": "Server",
 				"server_name": self.name,
 			},
 			*server_actions,
@@ -2365,7 +2365,7 @@ class Server(BaseServer):
 			if sub := jingrow.db.get_value(
 				"Subscription",
 				{
-					"document_type": self.doctype,
+					"document_type": self.pagetype,
 					"document_name": self.name,
 					"team": self.team,
 					"plan_type": "Server Plan",
@@ -2388,7 +2388,7 @@ class Server(BaseServer):
 			if existing_subscription := jingrow.db.get_value(
 				"Subscription",
 				filters={
-					"document_type": self.doctype,
+					"document_type": self.pagetype,
 					"document_name": self.name,
 					"team": self.team,
 					"plan_type": "Server Storage Plan",
@@ -2457,7 +2457,7 @@ class Server(BaseServer):
 	@jingrow.whitelist()
 	def setup_secondary_server(self, server_plan: str):
 		"""Setup secondary server"""
-		if self.doctype == "Database Server" or self.is_secondary:
+		if self.pagetype == "Database Server" or self.is_secondary:
 			return
 
 		self.setup_nfs()  # Setup nfs when creating a secondary server
@@ -2471,18 +2471,18 @@ class Server(BaseServer):
 	def teardown_secondary_server(self):
 		if self.secondary_server:
 			nfs_volume_detachment: "NFSVolumeDetachment" = jingrow.get_pg(
-				{"doctype": "NFS Volume Detachment", "primary_server": self.name}
+				{"pagetype": "NFS Volume Detachment", "primary_server": self.name}
 			)
 			nfs_volume_detachment.insert(ignore_permissions=True)
 
 	@jingrow.whitelist()
 	def setup_ncdu(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_ncdu")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_ncdu")
 
 	@jingrow.whitelist()
 	def install_nfs_common(self):
 		"""Install nfs common on this server"""
-		jingrow.enqueue_pg(self.doctype, self.name, "_install_nfs_common")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_install_nfs_common")
 
 	def _install_nfs_common(self):
 		try:
@@ -2515,7 +2515,7 @@ class Server(BaseServer):
 		return AnsibleAdHoc(sources=inventory).run(command, self.name)[0]
 
 	def setup_docker(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_docker", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_docker", timeout=1200)
 
 	def _setup_docker(self):
 		try:
@@ -2531,7 +2531,7 @@ class Server(BaseServer):
 
 	def setup_archived_folder(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_setup_archived_folder",
 			queue="short",
@@ -2614,7 +2614,7 @@ class Server(BaseServer):
 
 	@jingrow.whitelist()
 	def setup_standalone(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_standalone", queue="short", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_standalone", queue="short", timeout=1200)
 
 	def _setup_standalone(self):
 		try:
@@ -2648,7 +2648,7 @@ class Server(BaseServer):
 
 	@jingrow.whitelist()
 	def setup_agent_sentry(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_agent_sentry")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_agent_sentry")
 
 	def _setup_agent_sentry(self):
 		agent_sentry_dsn = jingrow.db.get_single_value("Jcloude Settings", "agent_sentry_dsn")
@@ -2666,7 +2666,7 @@ class Server(BaseServer):
 
 	@jingrow.whitelist()
 	def whitelist_ipaddress(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_whitelist_ip", queue="short", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_whitelist_ip", queue="short", timeout=1200)
 
 	def _whitelist_ip(self):
 		proxy_server = jingrow.get_value("Server", self.name, "proxy_server")
@@ -2694,7 +2694,7 @@ class Server(BaseServer):
 
 	@jingrow.whitelist()
 	def agent_set_proxy_ip(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_agent_set_proxy_ip", queue="short", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_agent_set_proxy_ip", queue="short", timeout=1200)
 
 	def _agent_set_proxy_ip(self):
 		agent_password = self.get_password("agent_password")
@@ -2721,10 +2721,10 @@ class Server(BaseServer):
 	def setup_fail2ban(self):
 		self.status = "Installing"
 		self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_fail2ban", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_fail2ban", queue="long", timeout=1200)
 
 	def _setup_fail2ban(self):
-		from jcloude.jcloude.doctype.monitor_server.monitor_server import get_monitor_server_ips
+		from jcloude.jcloude.pagetype.monitor_server.monitor_server import get_monitor_server_ips
 
 		try:
 			ansible = Ansible(
@@ -2747,7 +2747,7 @@ class Server(BaseServer):
 
 	@jingrow.whitelist()
 	def setup_pyspy(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_pyspy", queue="long")
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_pyspy", queue="long")
 
 	def _setup_pyspy(self):
 		try:
@@ -2764,7 +2764,7 @@ class Server(BaseServer):
 	def setup_replication(self):
 		self.status = "Installing"
 		self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_setup_replication", queue="long", timeout=1200)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_setup_replication", queue="long", timeout=1200)
 
 	def _setup_replication(self):
 		self._setup_secondary()
@@ -3022,7 +3022,7 @@ class Server(BaseServer):
 
 	def install_earlyoom(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_install_earlyoom",
 		)
@@ -3045,7 +3045,7 @@ class Server(BaseServer):
 		if not wazuh_server:
 			jingrow.throw("Please configure Wazuh Server in Jcloude Settings")
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_install_wazuh_agent",
 			wazuh_server=wazuh_server,
@@ -3070,7 +3070,7 @@ class Server(BaseServer):
 	@jingrow.whitelist()
 	def uninstall_wazuh_agent(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_uninstall_wazuh_agent",
 		)
@@ -3102,7 +3102,7 @@ class Server(BaseServer):
 	) -> str:
 		pg = jingrow.get_pg(
 			{
-				"doctype": "Server Snapshot",
+				"pagetype": "Server Snapshot",
 				"app_server": self.name,
 				"consistent": consistent,
 				"expire_at": expire_at,
@@ -3295,7 +3295,7 @@ class Server(BaseServer):
 
 	def _create_auto_scale_record(self, action: Literal["Scale Up", "Scale Down"]) -> AutoScaleRecord:
 		"""Create up/down scale record"""
-		return jingrow.get_pg({"doctype": "Auto Scale Record", "primary_server": self.name, "action": action})
+		return jingrow.get_pg({"pagetype": "Auto Scale Record", "primary_server": self.name, "action": action})
 
 	@property
 	def domains(self):
@@ -3350,7 +3350,7 @@ def cleanup_unused_files():
 			log_error("Server File Cleanup Error", server=server)
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Server")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Server")
 
 
 def get_hostname_abbreviation(hostname):
diff --git a/press/press/doctype/server/test_server.py b/press/press/doctype/server/test_server.py
index 53d50931..618a508e 100644
--- a/press/press/doctype/server/test_server.py
+++ b/press/press/doctype/server/test_server.py
@@ -11,25 +11,25 @@ from jingrow.model.naming import make_autoname
 from jingrow.tests.utils import FrappeTestCase
 from moto import mock_aws
 
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.database_server.test_database_server import (
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.database_server.test_database_server import (
 	create_test_database_server,
 )
-from jcloude.jcloude.doctype.jcloude_settings.test_jcloude_settings import (
+from jcloude.jcloude.pagetype.jcloude_settings.test_jcloude_settings import (
 	create_test_jcloude_settings,
 )
-from jcloude.jcloude.doctype.proxy_server.test_proxy_server import create_test_proxy_server
-from jcloude.jcloude.doctype.release_group.test_release_group import create_test_release_group
-from jcloude.jcloude.doctype.server.server import BaseServer
-from jcloude.jcloude.doctype.server_plan.test_server_plan import create_test_server_plan
-from jcloude.jcloude.doctype.site.test_site import create_test_bench
-from jcloude.jcloude.doctype.team.test_team import create_test_team
-from jcloude.jcloude.doctype.virtual_machine.test_virtual_machine import create_test_virtual_machine
+from jcloude.jcloude.pagetype.proxy_server.test_proxy_server import create_test_proxy_server
+from jcloude.jcloude.pagetype.release_group.test_release_group import create_test_release_group
+from jcloude.jcloude.pagetype.server.server import BaseServer
+from jcloude.jcloude.pagetype.server_plan.test_server_plan import create_test_server_plan
+from jcloude.jcloude.pagetype.site.test_site import create_test_bench
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.virtual_machine.test_virtual_machine import create_test_virtual_machine
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.server.server import Server
-	from jcloude.jcloude.doctype.server_plan.server_plan import ServerPlan
-	from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+	from jcloude.jcloude.pagetype.server.server import Server
+	from jcloude.jcloude.pagetype.server_plan.server_plan import ServerPlan
+	from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 
 
 @patch.object(BaseServer, "after_insert", new=Mock())
@@ -59,7 +59,7 @@ def create_test_server(
 
 	server = jingrow.get_pg(
 		{
-			"doctype": "Server",
+			"pagetype": "Server",
 			"status": "Active",
 			"proxy_server": proxy_server,
 			"database_server": database_server,
@@ -100,7 +100,7 @@ class TestServer(FrappeTestCase):
 
 		server = jingrow.get_pg(
 			{
-				"doctype": "Server",
+				"pagetype": "Server",
 				"hostname": jingrow.mock("domain_word"),
 				"domain": "fc.dev",
 				"ip": jingrow.mock("ipv4"),
@@ -121,7 +121,7 @@ class TestServer(FrappeTestCase):
 
 		server = jingrow.get_pg(
 			{
-				"doctype": "Server",
+				"pagetype": "Server",
 				"hostname": jingrow.mock("domain_word"),
 				"domain": "fc.dev",
 				"ip": jingrow.mock("ipv4"),
@@ -167,7 +167,7 @@ class TestServer(FrappeTestCase):
 				"team": server.team,
 				"plan_type": "Server Storage Plan",
 				"plan": "Add-on Storage Plan",
-				"document_type": server.doctype,
+				"document_type": server.pagetype,
 				"document_name": server.name,
 			},
 		)
@@ -188,7 +188,7 @@ class TestServer(FrappeTestCase):
 				"team": server.team,
 				"plan_type": "Server Storage Plan",
 				"plan": "Add-on Storage Plan",
-				"document_type": server.doctype,
+				"document_type": server.pagetype,
 				"document_name": server.name,
 			},
 		)
diff --git a/press/press/doctype/server_activity/server_activity.json b/press/press/doctype/server_activity/server_activity.json
index bdeb892d..a9935205 100644
--- a/press/press/doctype/server_activity/server_activity.json
+++ b/press/press/doctype/server_activity/server_activity.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-08-06 13:10:00.206404",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "column_break_ceix",
@@ -40,7 +40,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Document Type",
-   "options": "DocType",
+   "options": "PageType",
    "reqd": 1
   },
   {
diff --git a/press/press/doctype/server_activity/server_activity.py b/press/press/doctype/server_activity/server_activity.py
index 818d7b85..70a19793 100644
--- a/press/press/doctype/server_activity/server_activity.py
+++ b/press/press/doctype/server_activity/server_activity.py
@@ -48,7 +48,7 @@ def log_server_activity(
 
 	jingrow.get_pg(
 		{
-			"doctype": "Server Activity",
+			"pagetype": "Server Activity",
 			"document_type": document_type,
 			"document_name": server,
 			"action": action,
diff --git a/press/press/doctype/server_mount/server_mount.json b/press/press/doctype/server_mount/server_mount.json
index bd7da02a..05fe45bb 100644
--- a/press/press/doctype/server_mount/server_mount.json
+++ b/press/press/doctype/server_mount/server_mount.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2024-10-28 17:06:07.172615",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/server_plan/server_plan.json b/press/press/doctype/server_plan/server_plan.json
index 2291edf9..6ad1b125 100644
--- a/press/press/doctype/server_plan/server_plan.json
+++ b/press/press/doctype/server_plan/server_plan.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "prompt",
  "creation": "2024-02-05 22:21:47.560972",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "enabled",
diff --git a/press/press/doctype/server_plan/server_plan.py b/press/press/doctype/server_plan/server_plan.py
index a4c63884..0856f091 100644
--- a/press/press/doctype/server_plan/server_plan.py
+++ b/press/press/doctype/server_plan/server_plan.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import jingrow
 
-from jcloude.jcloude.doctype.site_plan.plan import Plan
+from jcloude.jcloude.pagetype.site_plan.plan import Plan
 
 
 class ServerPlan(Plan):
@@ -14,7 +14,7 @@ class ServerPlan(Plan):
 	from typing import TYPE_CHECKING
 
 	if TYPE_CHECKING:
-		from jingrow.core.doctype.has_role.has_role import HasRole
+		from jingrow.core.pagetype.has_role.has_role import HasRole
 		from jingrow.types import DF
 
 		cluster: DF.Link | None
diff --git a/press/press/doctype/server_plan/test_server_plan.py b/press/press/doctype/server_plan/test_server_plan.py
index 0949e7c1..bcac2e58 100644
--- a/press/press/doctype/server_plan/test_server_plan.py
+++ b/press/press/doctype/server_plan/test_server_plan.py
@@ -8,14 +8,14 @@ from jingrow.model.naming import make_autoname
 from jingrow.tests.utils import FrappeTestCase
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.server_plan.server_plan import ServerPlan
+	from jcloude.jcloude.pagetype.server_plan.server_plan import ServerPlan
 
 
 def create_test_server_plan(server_type: str = "Server") -> "ServerPlan":
 	"""Create test Server Plan pg."""
 	server_plan = jingrow.get_pg(
 		{
-			"doctype": "Server Plan",
+			"pagetype": "Server Plan",
 			"name": make_autoname("SP-.####"),
 			"server_type": server_type,
 			"title": jingrow.mock("name"),
diff --git a/press/press/doctype/server_snapshot/server_snapshot.json b/press/press/doctype/server_snapshot/server_snapshot.json
index b21f23a2..55b6aca3 100644
--- a/press/press/doctype/server_snapshot/server_snapshot.json
+++ b/press/press/doctype/server_snapshot/server_snapshot.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "format:snap-{#######}",
  "creation": "2025-07-30 16:05:51.738947",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "status",
@@ -316,7 +316,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Server Snapshot Recovery",
+   "link_pagetype": "Server Snapshot Recovery",
    "link_fieldname": "snapshot"
   }
  ],
diff --git a/press/press/doctype/server_snapshot/server_snapshot.py b/press/press/doctype/server_snapshot/server_snapshot.py
index f4ac338d..65ba5ec4 100644
--- a/press/press/doctype/server_snapshot/server_snapshot.py
+++ b/press/press/doctype/server_snapshot/server_snapshot.py
@@ -10,12 +10,12 @@ import jingrow
 from jingrow.model.document import Document
 
 from jcloude.api.client import dashboard_whitelist
-from jcloude.overrides import get_permission_query_conditions_for_doctype
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
 from jcloude.utils.jobs import has_job_timeout_exceeded
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.cluster.cluster import Cluster
-	from jcloude.jcloude.doctype.site_backup.site_backup import VirtualMachine
+	from jcloude.jcloude.pagetype.cluster.cluster import Cluster
+	from jcloude.jcloude.pagetype.site_backup.site_backup import VirtualMachine
 
 
 class ServerSnapshot(Document):
@@ -73,7 +73,7 @@ class ServerSnapshot(Document):
 
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
-		Snapshot = jingrow.qb.DocType("Server Snapshot")
+		Snapshot = jingrow.qb.PageType("Server Snapshot")
 		status = filters.get("status")
 		if status:
 			query = query.where(Snapshot.status == status)
@@ -257,7 +257,7 @@ class ServerSnapshot(Document):
 		self.app_server_snapshot_jcloude_job = (
 			jingrow.get_pg(
 				{
-					"doctype": "Jcloude Job",
+					"pagetype": "Jcloude Job",
 					"job_type": "Snapshot Disk",
 					"server_type": "Server",
 					"server": self.app_server,
@@ -272,7 +272,7 @@ class ServerSnapshot(Document):
 		self.database_server_snapshot_jcloude_job = (
 			jingrow.get_pg(
 				{
-					"doctype": "Jcloude Job",
+					"pagetype": "Jcloude Job",
 					"job_type": "Snapshot Disk",
 					"server_type": "Database Server",
 					"server": self.database_server,
@@ -306,7 +306,7 @@ class ServerSnapshot(Document):
 
 		if not self.consistent:
 			jingrow.db.set_value(
-				self.doctype,
+				self.pagetype,
 				self.name,
 				"app_server_services_started"
 				if server_type == "Server"
@@ -316,11 +316,11 @@ class ServerSnapshot(Document):
 			)
 			return
 
-		jingrow.db.get_value(self.doctype, self.name, "status", for_update=True)
+		jingrow.db.get_value(self.pagetype, self.name, "status", for_update=True)
 
 		jcloude_job = jingrow.get_pg(
 			{
-				"doctype": "Jcloude Job",
+				"pagetype": "Jcloude Job",
 				"job_type": "Resume Services After Snapshot",
 				"server_type": server_type,
 				"server": self.app_server if server_type == "Server" else self.database_server,
@@ -468,7 +468,7 @@ class ServerSnapshot(Document):
 
 		recover_record = jingrow.get_pg(
 			{
-				"doctype": "Server Snapshot Recovery",
+				"pagetype": "Server Snapshot Recovery",
 				"snapshot": self.name,
 			}
 		)
@@ -539,7 +539,7 @@ class ServerSnapshot(Document):
 			cluster.database_server = database_server
 
 		server, _ = cluster.create_server(
-			doctype=server_type,
+			pagetype=server_type,
 			title=title or self.name,
 			team=team,
 			data_disk_snapshot=self.app_server_snapshot
@@ -611,7 +611,7 @@ class ServerSnapshot(Document):
 
 		jingrow.get_pg(
 			{
-				"doctype": "Subscription",
+				"pagetype": "Subscription",
 				"enabled": 1,
 				"team": self.team,
 				"document_type": "Server Snapshot",
@@ -636,7 +636,7 @@ class ServerSnapshot(Document):
 		)
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Server Snapshot")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Server Snapshot")
 
 
 def move_pending_snapshots_to_processing():
@@ -666,7 +666,7 @@ def move_pending_snapshots_to_processing():
 
 
 def expire_snapshots():
-	Snapshot = jingrow.qb.DocType("Server Snapshot")
+	Snapshot = jingrow.qb.PageType("Server Snapshot")
 	records = (
 		jingrow.qb.from_(Snapshot)
 		.select(Snapshot.name)
@@ -698,7 +698,7 @@ def sync_ongoing_server_snapshots():
 	# But in case if it missed for any reason, this function will ensure
 	# that the Server Snapshot's status is in sync with its Virtual Disk Snapshots
 
-	Snapshot = jingrow.qb.DocType("Server Snapshot")
+	Snapshot = jingrow.qb.PageType("Server Snapshot")
 	records = (
 		jingrow.qb.from_(Snapshot)
 		.select(Snapshot.name)
diff --git a/press/press/doctype/server_snapshot/test_server_snapshot.py b/press/press/doctype/server_snapshot/test_server_snapshot.py
index ce3ff647..5dd6b613 100644
--- a/press/press/doctype/server_snapshot/test_server_snapshot.py
+++ b/press/press/doctype/server_snapshot/test_server_snapshot.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/server_snapshot_plan/server_snapshot_plan.json b/press/press/doctype/server_snapshot_plan/server_snapshot_plan.json
index a8b128fa..e884a0ed 100644
--- a/press/press/doctype/server_snapshot_plan/server_snapshot_plan.json
+++ b/press/press/doctype/server_snapshot_plan/server_snapshot_plan.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "prompt",
  "creation": "2025-08-02 03:08:42.573683",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "enabled",
diff --git a/press/press/doctype/server_snapshot_plan/server_snapshot_plan.py b/press/press/doctype/server_snapshot_plan/server_snapshot_plan.py
index 7655216c..7007dc14 100644
--- a/press/press/doctype/server_snapshot_plan/server_snapshot_plan.py
+++ b/press/press/doctype/server_snapshot_plan/server_snapshot_plan.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2025, JINGROW
 # For license information, please see license.txt
 
-from jcloude.jcloude.doctype.site_plan.plan import Plan
+from jcloude.jcloude.pagetype.site_plan.plan import Plan
 
 
 class ServerSnapshotPlan(Plan):
diff --git a/press/press/doctype/server_snapshot_plan/test_server_snapshot_plan.py b/press/press/doctype/server_snapshot_plan/test_server_snapshot_plan.py
index 029f9e3c..2bb699a3 100644
--- a/press/press/doctype/server_snapshot_plan/test_server_snapshot_plan.py
+++ b/press/press/doctype/server_snapshot_plan/test_server_snapshot_plan.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.json b/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.json
index 807364a3..076a8033 100644
--- a/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.json
+++ b/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-08-04 10:34:26.272832",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "status",
diff --git a/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.py b/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.py
index ca578092..6510c41b 100644
--- a/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.py
+++ b/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.py
@@ -10,15 +10,15 @@ from jingrow.utils import add_to_date
 
 from jcloude.agent import Agent
 from jcloude.api.client import dashboard_whitelist
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
-from jcloude.jcloude.doctype.remote_file.remote_file import delete_remote_backup_objects
-from jcloude.jcloude.doctype.site_backup.site_backup import get_backup_bucket
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.remote_file.remote_file import delete_remote_backup_objects
+from jcloude.jcloude.pagetype.site_backup.site_backup import get_backup_bucket
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.server_snapshot.server_snapshot import ServerSnapshot
-	from jcloude.jcloude.doctype.server_snapshot_site_recovery.server_snapshot_site_recovery import (
+	from jcloude.jcloude.pagetype.server_snapshot.server_snapshot import ServerSnapshot
+	from jcloude.jcloude.pagetype.server_snapshot_site_recovery.server_snapshot_site_recovery import (
 		ServerSnapshotSiteRecovery,
 	)
 
@@ -32,7 +32,7 @@ class ServerSnapshotRecovery(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.server_snapshot_site_recovery.server_snapshot_site_recovery import (
+		from jcloude.jcloude.pagetype.server_snapshot_site_recovery.server_snapshot_site_recovery import (
 			ServerSnapshotSiteRecovery,
 		)
 
@@ -237,7 +237,7 @@ class ServerSnapshotRecovery(Document):
 		self.save()
 		sites = [i.site for i in self.sites]
 		self.server_agent.search_sites_in_snapshot(
-			sites, reference_doctype=self.doctype, reference_name=self.name
+			sites, reference_pagetype=self.pagetype, reference_name=self.name
 		)
 
 	def backup_sites(self):
@@ -249,7 +249,7 @@ class ServerSnapshotRecovery(Document):
 					self.cluster,
 					site.site,
 					site.bench,
-					reference_doctype=self.doctype,
+					reference_pagetype=self.pagetype,
 					reference_name=self.name,
 				).name
 				site.database_backup_job = self.server_agent.backup_site_database_from_snapshot(
@@ -257,7 +257,7 @@ class ServerSnapshotRecovery(Document):
 					site.site,
 					site.database_name,
 					self.database_server,
-					reference_doctype=self.doctype,
+					reference_pagetype=self.pagetype,
 					reference_name=self.name,
 				).name
 
@@ -353,7 +353,7 @@ class ServerSnapshotRecovery(Document):
 		bucket = get_backup_bucket(self.cluster)
 		remote_file = jingrow.get_pg(
 			{
-				"doctype": "Remote File",
+				"pagetype": "Remote File",
 				"file_name": file_name,
 				"file_path": file_path,
 				"file_size": file_size,
@@ -409,7 +409,7 @@ class ServerSnapshotRecovery(Document):
 	@jingrow.whitelist()
 	def expire_backups(self):
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_expire_backups",
 			enqueue_after_commit=True,
@@ -434,7 +434,7 @@ class ServerSnapshotRecovery(Document):
 		delete_remote_backup_objects(remote_files)
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Server Snapshot Recovery")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Server Snapshot Recovery")
 
 
 def resume_warmed_up_restorations():
@@ -460,7 +460,7 @@ def process_search_sites_in_snapshot_job_callback(job: AgentJob):
 	if job.status not in ["Success", "Failure"]:
 		return
 
-	if job.reference_doctype != "Server Snapshot Recovery" or not job.reference_name:
+	if job.reference_pagetype != "Server Snapshot Recovery" or not job.reference_name:
 		return
 
 	record: ServerSnapshotRecovery = jingrow.get_pg("Server Snapshot Recovery", job.reference_name)
@@ -489,7 +489,7 @@ def process_backup_files_from_snapshot_job_callback(job: AgentJob):
 	if job.status not in ["Success", "Failure"]:
 		return
 
-	if job.reference_doctype != "Server Snapshot Recovery" or not job.reference_name:
+	if job.reference_pagetype != "Server Snapshot Recovery" or not job.reference_name:
 		return
 
 	record: ServerSnapshotRecovery = jingrow.get_pg(
@@ -502,7 +502,7 @@ def process_backup_database_from_snapshot_job_callback(job: AgentJob):
 	if job.status not in ["Success", "Failure"]:
 		return
 
-	if job.reference_doctype != "Server Snapshot Recovery" or not job.reference_name:
+	if job.reference_pagetype != "Server Snapshot Recovery" or not job.reference_name:
 		return
 
 	record: ServerSnapshotRecovery = jingrow.get_pg(
diff --git a/press/press/doctype/server_snapshot_recovery/test_server_snapshot_recovery.py b/press/press/doctype/server_snapshot_recovery/test_server_snapshot_recovery.py
index 92c8af6c..397844e2 100644
--- a/press/press/doctype/server_snapshot_recovery/test_server_snapshot_recovery.py
+++ b/press/press/doctype/server_snapshot_recovery/test_server_snapshot_recovery.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/server_snapshot_site_recovery/server_snapshot_site_recovery.json b/press/press/doctype/server_snapshot_site_recovery/server_snapshot_site_recovery.json
index a4d6ad14..c8c166a7 100644
--- a/press/press/doctype/server_snapshot_site_recovery/server_snapshot_site_recovery.json
+++ b/press/press/doctype/server_snapshot_site_recovery/server_snapshot_site_recovery.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-08-04 10:43:26.520507",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/server_storage_plan/patches/add_subscription_for_servers_with_additional_disk.py b/press/press/doctype/server_storage_plan/patches/add_subscription_for_servers_with_additional_disk.py
index c6ff4aaf..d4884cd7 100644
--- a/press/press/doctype/server_storage_plan/patches/add_subscription_for_servers_with_additional_disk.py
+++ b/press/press/doctype/server_storage_plan/patches/add_subscription_for_servers_with_additional_disk.py
@@ -7,10 +7,10 @@ from tqdm import tqdm
 
 
 def execute():
-	Server = jingrow.qb.DocType("Server")
-	DatabaseServer = jingrow.qb.DocType("Database Server")
-	VirtualMachine = jingrow.qb.DocType("Virtual Machine")
-	ServerPlan = jingrow.qb.DocType("Server Plan")
+	Server = jingrow.qb.PageType("Server")
+	DatabaseServer = jingrow.qb.PageType("Database Server")
+	VirtualMachine = jingrow.qb.PageType("Virtual Machine")
+	ServerPlan = jingrow.qb.PageType("Server Plan")
 
 	servers = (
 		jingrow.qb.from_(Server)
diff --git a/press/press/doctype/server_storage_plan/server_storage_plan.json b/press/press/doctype/server_storage_plan/server_storage_plan.json
index 825d248d..59ba1803 100644
--- a/press/press/doctype/server_storage_plan/server_storage_plan.json
+++ b/press/press/doctype/server_storage_plan/server_storage_plan.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "prompt",
  "creation": "2024-06-26 14:03:45.071081",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "enabled",
diff --git a/press/press/doctype/server_storage_plan/server_storage_plan.py b/press/press/doctype/server_storage_plan/server_storage_plan.py
index 46706a76..52e74f76 100644
--- a/press/press/doctype/server_storage_plan/server_storage_plan.py
+++ b/press/press/doctype/server_storage_plan/server_storage_plan.py
@@ -3,7 +3,7 @@
 
 import jingrow
 
-from jcloude.jcloude.doctype.site_plan.plan import Plan
+from jcloude.jcloude.pagetype.site_plan.plan import Plan
 
 
 class ServerStoragePlan(Plan):
diff --git a/press/press/doctype/silenced_alert/silenced_alert.json b/press/press/doctype/silenced_alert/silenced_alert.json
index 3722fe05..3a229dc3 100644
--- a/press/press/doctype/silenced_alert/silenced_alert.json
+++ b/press/press/doctype/silenced_alert/silenced_alert.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-10-18 13:46:51.308480",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -26,7 +26,7 @@
    "fieldname": "instance_type",
    "fieldtype": "Link",
    "label": "Instance Type",
-   "options": "DocType"
+   "options": "PageType"
   },
   {
    "fieldname": "instance",
diff --git a/press/press/doctype/site/archive.py b/press/press/doctype/site/archive.py
index 159fbcce..3f4fd44f 100644
--- a/press/press/doctype/site/archive.py
+++ b/press/press/doctype/site/archive.py
@@ -8,7 +8,7 @@ import jingrow
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.site.site import Site
+	from jcloude.jcloude.pagetype.site.site import Site
 
 
 def archive_suspended_trial_sites():
diff --git a/press/press/doctype/site/backups.py b/press/press/doctype/site/backups.py
index a72ac29f..0694be1f 100644
--- a/press/press/doctype/site/backups.py
+++ b/press/press/doctype/site/backups.py
@@ -13,11 +13,11 @@ from time import time
 import jingrow
 import pytz
 
-from jcloude.jcloude.doctype.jcloude_settings.jcloude_settings import PressSettings
-from jcloude.jcloude.doctype.remote_file.remote_file import delete_remote_backup_objects
-from jcloude.jcloude.doctype.site.site import Literal, Site
-from jcloude.jcloude.doctype.site_backup.site_backup import SiteBackup
-from jcloude.jcloude.doctype.subscription.subscription import Subscription
+from jcloude.jcloude.pagetype.jcloude_settings.jcloude_settings import PressSettings
+from jcloude.jcloude.pagetype.remote_file.remote_file import delete_remote_backup_objects
+from jcloude.jcloude.pagetype.site.site import Literal, Site
+from jcloude.jcloude.pagetype.site_backup.site_backup import SiteBackup
+from jcloude.jcloude.pagetype.subscription.subscription import Subscription
 from jcloude.utils import log_error
 
 
@@ -383,7 +383,7 @@ def schedule_physical_backups():
 
 def cleanup_offsite():
 	"""Delete expired (based on policy) offsite backups and mark em as Unavailable."""
-	jingrow.enqueue("jcloude.jcloude.doctype.site.backups._cleanup_offsite", queue="long", timeout=3600)
+	jingrow.enqueue("jcloude.jcloude.pagetype.site.backups._cleanup_offsite", queue="long", timeout=3600)
 
 
 def _cleanup_offsite():
@@ -405,7 +405,7 @@ def cleanup_local():
 
 def expire_physical():
 	"""Mark physical snapshot as expired (based on policy) and backups mark em as Unavailable."""
-	jingrow.enqueue("jcloude.jcloude.doctype.site.backups._expire_physical_backups")
+	jingrow.enqueue("jcloude.jcloude.pagetype.site.backups._expire_physical_backups")
 
 
 def _expire_physical_backups():
diff --git a/press/press/doctype/site/erpnext_site.py b/press/press/doctype/site/erpnext_site.py
index 434a7a33..84f1c351 100644
--- a/press/press/doctype/site/erpnext_site.py
+++ b/press/press/doctype/site/erpnext_site.py
@@ -4,9 +4,9 @@
 
 import jingrow
 
-from jcloude.jcloude.doctype.account_request.account_request import AccountRequest
-from jcloude.jcloude.doctype.erpnext_consultant.erpnext_consultant import ERPNextConsultant
-from jcloude.jcloude.doctype.site.site import Site
+from jcloude.jcloude.pagetype.account_request.account_request import AccountRequest
+from jcloude.jcloude.pagetype.erpnext_consultant.erpnext_consultant import ERPNextConsultant
+from jcloude.jcloude.pagetype.site.site import Site
 
 
 class ERPNextSite(Site):
@@ -16,7 +16,7 @@ class ERPNextSite(Site):
 		elif account_request:
 			super().__init__(
 				{
-					"doctype": "Site",
+					"pagetype": "Site",
 					"subdomain": account_request.subdomain,
 					"domain": get_erpnext_domain(),
 					"bench": get_erpnext_bench(),
diff --git a/press/press/doctype/site/patches/set_database_access_credentials.py b/press/press/doctype/site/patches/set_database_access_credentials.py
index a5e955d0..31af2ddf 100644
--- a/press/press/doctype/site/patches/set_database_access_credentials.py
+++ b/press/press/doctype/site/patches/set_database_access_credentials.py
@@ -5,7 +5,7 @@ from tqdm import tqdm
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "site")
+	jingrow.reload_pg("jcloude", "pagetype", "site")
 	sites = jingrow.get_all(
 		"Site",
 		{
diff --git a/press/press/doctype/site/patches/set_plan_in_site.py b/press/press/doctype/site/patches/set_plan_in_site.py
index 34b77cbe..13043b03 100644
--- a/press/press/doctype/site/patches/set_plan_in_site.py
+++ b/press/press/doctype/site/patches/set_plan_in_site.py
@@ -5,7 +5,7 @@ import jingrow
 
 def execute():
 	# set plan in all non-archived sites that have active subscription
-	jingrow.reload_doctype("Site")
+	jingrow.reload_pagetype("Site")
 
 	jingrow.db.sql(
 		"""
diff --git a/press/press/doctype/site/patches/set_plan_limit_in_site_config.py b/press/press/doctype/site/patches/set_plan_limit_in_site_config.py
index 812b9e1e..c8e9d77a 100644
--- a/press/press/doctype/site/patches/set_plan_limit_in_site_config.py
+++ b/press/press/doctype/site/patches/set_plan_limit_in_site_config.py
@@ -9,7 +9,7 @@ def execute():
 	if not jingrow.db.exists("Site Config Key", {"key": key_name}):
 		jingrow.get_pg(
 			{
-				"doctype": "Site Config Key",
+				"pagetype": "Site Config Key",
 				"key": key_name,
 				"type": "JSON",
 				"internal": True,
diff --git a/press/press/doctype/site/patches/set_status_wizard_check_next_retry_datetime_in_site.py b/press/press/doctype/site/patches/set_status_wizard_check_next_retry_datetime_in_site.py
index 64ad9fbb..5c512102 100644
--- a/press/press/doctype/site/patches/set_status_wizard_check_next_retry_datetime_in_site.py
+++ b/press/press/doctype/site/patches/set_status_wizard_check_next_retry_datetime_in_site.py
@@ -4,7 +4,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("Site")
+	jingrow.reload_pagetype("Site")
 	# set setup_wizard_status_check_next_retry_on to current datetime
 	# in saas sites that has setup_wizard_complete = false
 	# and setup_wizard_status_check_next_retry_on is null
diff --git a/press/press/doctype/site/pool.py b/press/press/doctype/site/pool.py
index c9886359..8898c5f3 100644
--- a/press/press/doctype/site/pool.py
+++ b/press/press/doctype/site/pool.py
@@ -5,7 +5,7 @@
 import jingrow
 from jingrow.model.naming import make_autoname
 
-from jcloude.jcloude.doctype.site.erpnext_site import (
+from jcloude.jcloude.pagetype.site.erpnext_site import (
 	get_erpnext_apps,
 	get_erpnext_bench,
 	get_erpnext_domain,
@@ -35,7 +35,7 @@ class SitePool:
 			apps = get_erpnext_apps()
 			jingrow.get_pg(
 				{
-					"doctype": "Site",
+					"pagetype": "Site",
 					"subdomain": subdomain,
 					"domain": domain,
 					"is_standby": True,
diff --git a/press/press/doctype/site/saas_pool.py b/press/press/doctype/site/saas_pool.py
index 97a26a45..96e0115d 100644
--- a/press/press/doctype/site/saas_pool.py
+++ b/press/press/doctype/site/saas_pool.py
@@ -1,7 +1,7 @@
 import jingrow
 from jingrow.model.naming import make_autoname
 
-from jcloude.jcloude.doctype.site.saas_site import (
+from jcloude.jcloude.pagetype.site.saas_site import (
 	create_app_subscriptions,
 	get_pool_apps,
 	get_saas_apps,
@@ -49,7 +49,7 @@ class SaasSitePool:
 				apps.extend(get_pool_apps(pool_name))
 			site = jingrow.get_pg(
 				{
-					"doctype": "Site",
+					"pagetype": "Site",
 					"subdomain": subdomain,
 					"domain": domain,
 					"is_standby": True,
diff --git a/press/press/doctype/site/saas_site.py b/press/press/doctype/site/saas_site.py
index a7b393ab..da4a6f81 100644
--- a/press/press/doctype/site/saas_site.py
+++ b/press/press/doctype/site/saas_site.py
@@ -3,8 +3,8 @@ import json
 
 import jingrow
 
-from jcloude.jcloude.doctype.account_request.account_request import AccountRequest
-from jcloude.jcloude.doctype.site.site import Site
+from jcloude.jcloude.pagetype.account_request.account_request import AccountRequest
+from jcloude.jcloude.pagetype.site.site import Site
 
 
 class SaasSite(Site):
@@ -30,7 +30,7 @@ class SaasSite(Site):
 
 			super().__init__(
 				{
-					"doctype": "Site",
+					"pagetype": "Site",
 					"subdomain": subdomain,
 					"domain": get_saas_domain(self.app),
 					"bench": get_saas_bench(self.app),
@@ -228,7 +228,7 @@ def get_app_subscriptions(apps=None, standby_for=None):
 		if free_plan:
 			new_subscription = jingrow.get_pg(
 				{
-					"doctype": "Subscription",
+					"pagetype": "Subscription",
 					"document_type": "Marketplace App",
 					"document_name": app,
 					"plan_type": "Marketplace App Plan",
diff --git a/press/press/doctype/site/site.json b/press/press/doctype/site/site.json
index 034ed7a1..f646a1bf 100644
--- a/press/press/doctype/site/site.json
+++ b/press/press/doctype/site/site.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-03-06 20:52:45.544397",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -740,77 +740,77 @@
  "links": [
   {
    "group": "Usage",
-   "link_doctype": "Site Usage",
+   "link_pagetype": "Site Usage",
    "link_fieldname": "site"
   },
   {
    "group": "Usage",
-   "link_doctype": "Remote File",
+   "link_pagetype": "Remote File",
    "link_fieldname": "site"
   },
   {
    "group": "Related Documents",
-   "link_doctype": "Site Domain",
+   "link_pagetype": "Site Domain",
    "link_fieldname": "site"
   },
   {
    "group": "Related Documents",
-   "link_doctype": "Site Activity",
+   "link_pagetype": "Site Activity",
    "link_fieldname": "site"
   },
   {
    "group": "Related Documents",
-   "link_doctype": "Site Plan Change",
+   "link_pagetype": "Site Plan Change",
    "link_fieldname": "site"
   },
   {
    "group": "Related Documents",
-   "link_doctype": "Subscription",
+   "link_pagetype": "Subscription",
    "link_fieldname": "document_name"
   },
   {
    "group": "Logs",
-   "link_doctype": "Agent Job",
+   "link_pagetype": "Agent Job",
    "link_fieldname": "site"
   },
   {
    "group": "Logs",
-   "link_doctype": "Site Backup",
+   "link_pagetype": "Site Backup",
    "link_fieldname": "site"
   },
   {
    "group": "Logs",
-   "link_doctype": "Site Update",
+   "link_pagetype": "Site Update",
    "link_fieldname": "site"
   },
   {
    "group": "Related Documents",
-   "link_doctype": "ERPNext Site Settings",
+   "link_pagetype": "ERPNext Site Settings",
    "link_fieldname": "site"
   },
   {
    "group": "Related Documents",
-   "link_doctype": "Site Migration",
+   "link_pagetype": "Site Migration",
    "link_fieldname": "site"
   },
   {
    "group": "Related Documents",
-   "link_doctype": "Marketplace App Subscription",
+   "link_pagetype": "Marketplace App Subscription",
    "link_fieldname": "site"
   },
   {
    "group": "Related Documents",
-   "link_doctype": "Site Access Token",
+   "link_pagetype": "Site Access Token",
    "link_fieldname": "site"
   },
   {
    "group": "Related Documents",
-   "link_doctype": "Site Database User",
+   "link_pagetype": "Site Database User",
    "link_fieldname": "site"
   },
   {
    "group": "Related Documents",
-   "link_doctype": "Physical Backup Restoration",
+   "link_pagetype": "Physical Backup Restoration",
    "link_fieldname": "site"
   }
  ],
diff --git a/press/press/doctype/site/site.py b/press/press/doctype/site/site.py
index aaa341ca..d611754f 100644
--- a/press/press/doctype/site/site.py
+++ b/press/press/doctype/site/site.py
@@ -44,12 +44,12 @@ from jcloude.exceptions import (
 	VolumeResizeLimitError,
 )
 from jcloude.guards import role_guard
-from jcloude.marketplace.doctype.marketplace_app_plan.marketplace_app_plan import (
+from jcloude.marketplace.pagetype.marketplace_app_plan.marketplace_app_plan import (
 	MarketplaceAppPlan,
 )
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
-from jcloude.jcloude.doctype.server.server import Server
-from jcloude.saas.doctype.product_trial.product_trial import create_free_app_subscription
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.server.server import Server
+from jcloude.saas.pagetype.product_trial.product_trial import create_free_app_subscription
 from jcloude.utils.jobs import has_job_timeout_exceeded
 from jcloude.utils.telemetry import capture
 from jcloude.utils.webhook import create_webhook_event
@@ -68,18 +68,18 @@ from jingrow.utils.password import get_decrypted_password
 
 from jcloude.agent import Agent, AgentRequestSkippedException
 from jcloude.api.client import dashboard_whitelist
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.marketplace_app.marketplace_app import (
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.marketplace_app.marketplace_app import (
 	get_plans_for_app,
 	marketplace_app_hook,
 )
-from jcloude.jcloude.doctype.resource_tag.tag_helpers import TagHelpers
-from jcloude.jcloude.doctype.server.server import is_dedicated_server
-from jcloude.jcloude.doctype.site_activity.site_activity import log_site_activity
-from jcloude.jcloude.doctype.site_analytics.site_analytics import create_site_analytics
-from jcloude.jcloude.doctype.site_plan.site_plan import UNLIMITED_PLANS, get_plan_config
+from jcloude.jcloude.pagetype.resource_tag.tag_helpers import TagHelpers
+from jcloude.jcloude.pagetype.server.server import is_dedicated_server
+from jcloude.jcloude.pagetype.site_activity.site_activity import log_site_activity
+from jcloude.jcloude.pagetype.site_analytics.site_analytics import create_site_analytics
+from jcloude.jcloude.pagetype.site_plan.site_plan import UNLIMITED_PLANS, get_plan_config
 from jcloude.jcloude.report.mariadb_slow_queries.mariadb_slow_queries import (
-	get_doctype_name,
+	get_pagetype_name,
 )
 from jcloude.utils import (
 	convert,
@@ -102,18 +102,18 @@ if TYPE_CHECKING:
 	from jingrow.types import DF
 	from jingrow.types.DF import Table
 
-	from jcloude.jcloude.doctype.account_request.account_request import AccountRequest
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.bench.bench import Bench
-	from jcloude.jcloude.doctype.bench_app.bench_app import BenchApp
-	from jcloude.jcloude.doctype.database_server.database_server import DatabaseServer
-	from jcloude.jcloude.doctype.deploy_candidate.deploy_candidate import DeployCandidate
-	from jcloude.jcloude.doctype.deploy_candidate_app.deploy_candidate_app import DeployCandidateApp
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
-	from jcloude.jcloude.doctype.server.server import BaseServer, Server
-	from jcloude.jcloude.doctype.site_backup.site_backup import SiteBackup
-	from jcloude.jcloude.doctype.site_domain.site_domain import SiteDomain
-	from jcloude.jcloude.doctype.tls_certificate.tls_certificate import TLSCertificate
+	from jcloude.jcloude.pagetype.account_request.account_request import AccountRequest
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.bench.bench import Bench
+	from jcloude.jcloude.pagetype.bench_app.bench_app import BenchApp
+	from jcloude.jcloude.pagetype.database_server.database_server import DatabaseServer
+	from jcloude.jcloude.pagetype.deploy_candidate.deploy_candidate import DeployCandidate
+	from jcloude.jcloude.pagetype.deploy_candidate_app.deploy_candidate_app import DeployCandidateApp
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.server.server import BaseServer, Server
+	from jcloude.jcloude.pagetype.site_backup.site_backup import SiteBackup
+	from jcloude.jcloude.pagetype.site_domain.site_domain import SiteDomain
+	from jcloude.jcloude.pagetype.tls_certificate.tls_certificate import TLSCertificate
 
 DOCTYPE_SERVER_TYPE_MAP = {
 	"Server": "Application",
@@ -137,11 +137,11 @@ class Site(Document, TagHelpers):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.communication_info.communication_info import CommunicationInfo
-		from jcloude.jcloude.doctype.resource_tag.resource_tag import ResourceTag
-		from jcloude.jcloude.doctype.site_app.site_app import SiteApp
-		from jcloude.jcloude.doctype.site_backup_time.site_backup_time import SiteBackupTime
-		from jcloude.jcloude.doctype.site_config.site_config import SiteConfig
+		from jcloude.jcloude.pagetype.communication_info.communication_info import CommunicationInfo
+		from jcloude.jcloude.pagetype.resource_tag.resource_tag import ResourceTag
+		from jcloude.jcloude.pagetype.site_app.site_app import SiteApp
+		from jcloude.jcloude.pagetype.site_backup_time.site_backup_time import SiteBackupTime
+		from jcloude.jcloude.pagetype.site_config.site_config import SiteConfig
 
 		_keys_removed_in_last_update: DF.Data | None
 		_site_usages: DF.Data | None
@@ -259,11 +259,11 @@ class Site(Document, TagHelpers):
 
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
-		from jcloude.jcloude.doctype.site_update.site_update import (
+		from jcloude.jcloude.pagetype.site_update.site_update import (
 			benches_with_available_update,
 		)
 
-		Site = jingrow.qb.DocType("Site")
+		Site = jingrow.qb.PageType("Site")
 
 		status = filters.get("status")
 		if status == "Archived":
@@ -366,9 +366,9 @@ class Site(Document, TagHelpers):
 				)
 				if user_type == "System User":
 					return func(inst, *args, **kwargs)
-				if has_support_access(inst.doctype, inst.name):
+				if has_support_access(inst.pagetype, inst.name):
 					return func(inst, *args, **kwargs)
-				status = jingrow.get_value(inst.doctype, inst.name, "status", for_update=True)
+				status = jingrow.get_value(inst.pagetype, inst.name, "status", for_update=True)
 				if status not in allowed_status:
 					if disallowed_message and isinstance(disallowed_message, str):
 						jingrow.throw(disallowed_message)
@@ -811,7 +811,7 @@ class Site(Document, TagHelpers):
 	@dashboard_whitelist()
 	@site_action(["Active"])
 	def uninstall_app(self, app: str, feedback: str = "") -> str:
-		from jcloude.marketplace.doctype.marketplace_app_feedback.marketplace_app_feedback import (
+		from jcloude.marketplace.pagetype.marketplace_app_feedback.marketplace_app_feedback import (
 			collect_app_uninstall_feedback,
 		)
 
@@ -831,7 +831,7 @@ class Site(Document, TagHelpers):
 		"""Create Site Domain with Site name."""
 		return jingrow.get_pg(
 			{
-				"doctype": "Site Domain",
+				"pagetype": "Site Domain",
 				"site": self.name,
 				"domain": self.name,
 				"status": "Active",
@@ -863,7 +863,7 @@ class Site(Document, TagHelpers):
 		if hasattr(self, "share_details_consent") and self.share_details_consent:
 			# create partner lead
 			jingrow.get_pg(
-				doctype="Site Partner Lead",
+				pagetype="Site Partner Lead",
 				team=self.team,
 				site=self.name,
 				created_on=jingrow.utils.now_datetime(),
@@ -934,7 +934,7 @@ class Site(Document, TagHelpers):
 		mountpoint = server.guess_data_disk_mountpoint()
 		free_space = server.free_space(mountpoint)
 		if (diff := free_space - space_required) <= 0:
-			msg = f"Insufficient estimated space on {DOCTYPE_SERVER_TYPE_MAP[server.doctype]} server to {purpose}. Required: {human_readable(space_required)}, Available: {human_readable(free_space)} (Need {human_readable(abs(diff))} more)."
+			msg = f"Insufficient estimated space on {DOCTYPE_SERVER_TYPE_MAP[server.pagetype]} server to {purpose}. Required: {human_readable(space_required)}, Available: {human_readable(free_space)} (Need {human_readable(abs(diff))} more)."
 			if server.public and not no_increase:
 				self.try_increasing_disk(server, mountpoint, diff, msg)
 			else:
@@ -1114,7 +1114,7 @@ class Site(Document, TagHelpers):
 
 		pg = jingrow.get_pg(
 			{
-				"doctype": "Physical Backup Restoration",
+				"pagetype": "Physical Backup Restoration",
 				"site": self.name,
 				"status": "Pending",
 				"site_backup": backup,
@@ -1183,7 +1183,7 @@ class Site(Document, TagHelpers):
 
 		return jingrow.get_pg(
 			{
-				"doctype": "Site Backup",
+				"pagetype": "Site Backup",
 				"site": self.name,
 				"with_files": with_files,
 				"offsite": offsite,
@@ -1251,7 +1251,7 @@ class Site(Document, TagHelpers):
 
 		pg = jingrow.get_pg(
 			{
-				"doctype": "Site Update",
+				"pagetype": "Site Update",
 				"site": self.name,
 				"backup_type": "Physical" if physical_backup else "Logical",
 				"skipped_failing_patches": skip_failing_patches,
@@ -1301,7 +1301,7 @@ class Site(Document, TagHelpers):
 
 		return jingrow.get_pg(
 			{
-				"doctype": "Site Update",
+				"pagetype": "Site Update",
 				"site": self.name,
 				"destination_group": group,
 				"skipped_failing_patches": skip_failing_patches,
@@ -1345,7 +1345,7 @@ class Site(Document, TagHelpers):
 
 		jingrow.get_pg(
 			{
-				"doctype": "Site Update",
+				"pagetype": "Site Update",
 				"site": self.name,
 				"skipped_backups": 1,
 			}
@@ -1363,7 +1363,7 @@ class Site(Document, TagHelpers):
 			log_site_activity(self.name, "Add Domain")
 			jingrow.get_pg(
 				{
-					"doctype": "Site Domain",
+					"pagetype": "Site Domain",
 					"status": "Pending",
 					"site": self.name,
 					"domain": domain,
@@ -1378,7 +1378,7 @@ class Site(Document, TagHelpers):
 		create_dns_record(pg=self, record_name=domain)
 		jingrow.get_pg(
 			{
-				"doctype": "Site Domain",
+				"pagetype": "Site Domain",
 				"status": "Pending",
 				"site": self.name,
 				"domain": domain,
@@ -1452,7 +1452,7 @@ class Site(Document, TagHelpers):
 			site_domain.retry()
 
 	def _check_if_domain_belongs_to_site(self, domain: str):
-		if not jingrow.db.exists({"doctype": "Site Domain", "site": self.name, "domain": domain}):
+		if not jingrow.db.exists({"pagetype": "Site Domain", "site": self.name, "domain": domain}):
 			jingrow.throw(
 				msg=f"Site Domain {domain} for site {self.name} does not exist",
 				exc=jingrow.exceptions.LinkValidationError,
@@ -1582,7 +1582,7 @@ class Site(Document, TagHelpers):
 			jingrow.get_pg("Virtual Disk Snapshot", snapshot, for_update=True).delete_snapshot()
 
 	def delete_offsite_backups(self):
-		from jcloude.jcloude.doctype.remote_file.remote_file import (
+		from jcloude.jcloude.pagetype.remote_file.remote_file import (
 			delete_remote_backup_objects,
 		)
 
@@ -1646,7 +1646,7 @@ class Site(Document, TagHelpers):
 		key = jingrow.generate_hash("Site Transfer Link", 20)
 		jingrow.get_pg(
 			{
-				"doctype": "Team Change",
+				"pagetype": "Team Change",
 				"document_type": "Site",
 				"document_name": self.name,
 				"to_team": jingrow.db.get_value("Team", {"user": team_mail_id, "enabled": 1}),
@@ -1882,7 +1882,7 @@ class Site(Document, TagHelpers):
 			if current_usages["creation"] and equivalent_site_time < current_usages["creation"]:
 				return
 
-		site_usage = jingrow.get_pg({"doctype": "Site Usage", **site_usage_data}).insert()
+		site_usage = jingrow.get_pg({"pagetype": "Site Usage", **site_usage_data}).insert()
 
 		if equivalent_site_time:
 			site_usage.db_set("creation", equivalent_site_time)
@@ -1948,9 +1948,9 @@ class Site(Document, TagHelpers):
 		- One for user record deletion
 		"""
 		conn = self.get_connection_as_admin()
-		doctype_data = {
-			"doctype": "Webhook",
-			"webhook_doctype": "User",
+		pagetype_data = {
+			"pagetype": "Webhook",
+			"webhook_pagetype": "User",
 			"enabled": 1,
 			"request_url": "https://jcloud.jingrow.com/api/method/jcloude.api.site_login.sync_product_site_user",
 			"request_method": "POST",
@@ -1981,13 +1981,13 @@ class Site(Document, TagHelpers):
 
 		for webhook in webhook_data:
 			try:
-				conn.insert({**doctype_data, **webhook})
+				conn.insert({**pagetype_data, **webhook})
 			except FrappeException as ex:
 				if "jingrow.exceptions.DuplicateEntryError" not in str(ex):
 					raise ex
 
 	def sync_users_to_product_site(self, analytics=None):
-		from jcloude.jcloude.doctype.site_user.site_user import create_user_for_product_site
+		from jcloude.jcloude.pagetype.site_user.site_user import create_user_for_product_site
 
 		if self.is_standby:
 			return
@@ -2459,7 +2459,7 @@ class Site(Document, TagHelpers):
 		self._update_configuration(plan_config)
 		ret = jingrow.get_pg(
 			{
-				"doctype": "Site Plan Change",
+				"pagetype": "Site Plan Change",
 				"site": self.name,
 				"from_plan": self.plan,
 				"to_plan": plan,
@@ -2479,7 +2479,7 @@ class Site(Document, TagHelpers):
 			self.save()
 
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"revoke_database_access_on_plan_change",
 			enqueue_after_commit=True,
@@ -2553,7 +2553,7 @@ class Site(Document, TagHelpers):
 		self.deactivate_app_subscriptions()
 
 		if self.standby_for_product:
-			from jcloude.saas.doctype.product_trial.product_trial import send_suspend_mail
+			from jcloude.saas.pagetype.product_trial.product_trial import send_suspend_mail
 
 			send_suspend_mail(self.name, self.standby_for_product)
 
@@ -2672,8 +2672,8 @@ class Site(Document, TagHelpers):
 	def _get_benches_for_(self, proxy_servers, release_group_names=None):
 		from pypika.terms import PseudoColumn
 
-		benches = jingrow.qb.DocType("Bench")
-		servers = jingrow.qb.DocType("Server")
+		benches = jingrow.qb.PageType("Bench")
+		servers = jingrow.qb.PageType("Server")
 
 		bench_query = (
 			jingrow.qb.from_(benches)
@@ -2694,7 +2694,7 @@ class Site(Document, TagHelpers):
 			.limit(1)
 		)
 		if release_group_names:
-			groups = jingrow.qb.DocType("Release Group")
+			groups = jingrow.qb.PageType("Release Group")
 			bench_query = (
 				bench_query.where(benches.group.isin(release_group_names))
 				.join(groups)
@@ -2766,7 +2766,7 @@ class Site(Document, TagHelpers):
 	def _create_initial_site_plan_change(self, plan):
 		jingrow.get_pg(
 			{
-				"doctype": "Site Plan Change",
+				"pagetype": "Site Plan Change",
 				"site": self.name,
 				"from_plan": "",
 				"to_plan": plan,
@@ -2800,7 +2800,7 @@ class Site(Document, TagHelpers):
 		return {field: self.get(field) for field in fields}
 
 	def get_update_information(self):
-		from jcloude.jcloude.doctype.site_update.site_update import (
+		from jcloude.jcloude.pagetype.site_update.site_update import (
 			benches_with_available_update,
 		)
 
@@ -2984,7 +2984,7 @@ class Site(Document, TagHelpers):
 		invoice_items = jingrow.get_all(
 			"Invoice Item",
 			{
-				"document_type": self.doctype,
+				"document_type": self.pagetype,
 				"document_name": self.name,
 				"Amount": (">", 0),
 			},
@@ -3055,7 +3055,7 @@ class Site(Document, TagHelpers):
 
 	@classmethod
 	def get_sites_with_backup_time(cls, backup_type: Literal["Logical", "Physical"]) -> list[dict]:
-		site_backup_times = jingrow.qb.DocType("Site Backup Time")
+		site_backup_times = jingrow.qb.PageType("Site Backup Time")
 		site_filters: dict[str, Any] = {"status": "Active"}
 		if backup_type == "Logical":
 			site_filters.update(
@@ -3462,7 +3462,7 @@ class Site(Document, TagHelpers):
 			return {"success": False, "output": "SQL Query cannot be empty"}
 		pg = jingrow.get_pg(
 			{
-				"doctype": "SQL Playground Log",
+				"pagetype": "SQL Playground Log",
 				"site": self.name,
 				"team": self.team,
 				"query": query,
@@ -3547,9 +3547,9 @@ class Site(Document, TagHelpers):
 				"message": "There is already a job running for adding database index. Please wait until finished.",
 				"job_name": record,
 			}
-		doctype = get_doctype_name(table)
+		pagetype = get_pagetype_name(table)
 		agent = Agent(self.server)
-		job = agent.add_database_index(self, doctype=doctype, columns=[column])
+		job = agent.add_database_index(self, pagetype=pagetype, columns=[column])
 		return {
 			"success": True,
 			"message": "Database index will be added on site.",
@@ -3744,7 +3744,7 @@ class Site(Document, TagHelpers):
 
 	@dashboard_whitelist()
 	def update_communication_infos(self, values: list[dict]):
-		from jcloude.jcloude.doctype.communication_info.communication_info import (
+		from jcloude.jcloude.pagetype.communication_info.communication_info import (
 			update_communication_infos as update_infos,
 		)
 
@@ -3752,7 +3752,7 @@ class Site(Document, TagHelpers):
 
 	@property
 	def recent_offsite_backups_(self):
-		site_backups = jingrow.qb.DocType("Site Backup")
+		site_backups = jingrow.qb.PageType("Site Backup")
 		return (
 			jingrow.qb.from_(site_backups)
 			.select(site_backups.name)
@@ -3766,14 +3766,14 @@ class Site(Document, TagHelpers):
 
 	@property
 	def recent_offsite_backup_exists(self):
-		site_backups = jingrow.qb.DocType("Site Backup")
+		site_backups = jingrow.qb.PageType("Site Backup")
 		return self.recent_offsite_backups_.where(
 			(site_backups.status == "Success") & (site_backups.files_availability == "Available")
 		).run()
 
 	@property
 	def recent_offsite_backup_pending(self):
-		site_backups = jingrow.qb.DocType("Site Backup")
+		site_backups = jingrow.qb.PageType("Site Backup")
 		return self.recent_offsite_backups_.where(site_backups.status.isin(["Pending", "Running"])).run()
 
 	@property
@@ -4361,7 +4361,7 @@ def process_create_user_job_update(job):
 		update_product_trial_request_status_based_on_site_status(job.site, False, job.data)
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Site")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Site")
 
 
 def prepare_site(site: str, subdomain: str | None = None) -> dict:
@@ -4529,7 +4529,7 @@ def sync_sites_setup_wizard_complete_status():
 	)
 	for site in sites:
 		jingrow.enqueue(
-			"jcloude.jcloude.doctype.site.site.fetch_setup_wizard_complete_status_if_site_exists",
+			"jcloude.jcloude.pagetype.site.site.fetch_setup_wizard_complete_status_if_site_exists",
 			site=site,
 			queue="sync",
 			job_id=f"fetch_setup_wizard_complete_status:{site}",
diff --git a/press/press/doctype/site/site_usages.py b/press/press/doctype/site/site_usages.py
index 351f91de..560c2e0f 100644
--- a/press/press/doctype/site/site_usages.py
+++ b/press/press/doctype/site/site_usages.py
@@ -5,11 +5,11 @@ import jingrow
 import rq
 
 from jcloude.api.analytics import get_current_cpu_usage_for_sites_on_server
-from jcloude.jcloude.doctype.site_plan.site_plan import get_plan_config
+from jcloude.jcloude.pagetype.site_plan.site_plan import get_plan_config
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.site.site import Site
+	from jcloude.jcloude.pagetype.site.site import Site
 
 
 @functools.lru_cache(maxsize=128)
@@ -37,7 +37,7 @@ def update_cpu_usages():
 	servers = jingrow.get_all("Server", filters={"status": "Active", "is_primary": True}, pluck="name")
 	for server in servers:
 		jingrow.enqueue(
-			"jcloude.jcloude.doctype.site.site_usages.update_cpu_usage_server",
+			"jcloude.jcloude.pagetype.site.site_usages.update_cpu_usage_server",
 			server=server,
 			queue="long",
 			deduplicate=True,
diff --git a/press/press/doctype/site/test_backups.py b/press/press/doctype/site/test_backups.py
index 18f207ba..5568f7ae 100644
--- a/press/press/doctype/site/test_backups.py
+++ b/press/press/doctype/site/test_backups.py
@@ -4,19 +4,19 @@ from unittest.mock import MagicMock, Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.site.backups import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.site.backups import (
 	ScheduledBackupJob,
 	schedule_logical_backups_for_sites_with_backup_time,
 	schedule_physical_backups_for_sites_with_backup_time,
 )
-from jcloude.jcloude.doctype.site.site import Site
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.site_backup.test_site_backup import create_test_site_backup
+from jcloude.jcloude.pagetype.site.site import Site
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.site_backup.test_site_backup import create_test_site_backup
 
 
-@patch("jcloude.jcloude.doctype.site.backups.jingrow.db.commit", new=MagicMock)
-@patch("jcloude.jcloude.doctype.site.backups.jingrow.db.rollback", new=MagicMock)
+@patch("jcloude.jcloude.pagetype.site.backups.jingrow.db.commit", new=MagicMock)
+@patch("jcloude.jcloude.pagetype.site.backups.jingrow.db.rollback", new=MagicMock)
 @patch.object(AgentJob, "after_insert", new=Mock())
 class TestScheduledBackupJob(FrappeTestCase):
 	def tearDown(self):
diff --git a/press/press/doctype/site/test_site.py b/press/press/doctype/site/test_site.py
index f051bfc8..40c323f3 100644
--- a/press/press/doctype/site/test_site.py
+++ b/press/press/doctype/site/test_site.py
@@ -13,40 +13,40 @@ from jingrow.model.naming import make_autoname
 from jingrow.tests.utils import FrappeTestCase
 
 from jcloude.exceptions import InsufficientSpaceOnServer
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob, poll_pending_jobs
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.app_source.app_source import AppSource
-from jcloude.jcloude.doctype.database_server.test_database_server import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob, poll_pending_jobs
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.app_source.app_source import AppSource
+from jcloude.jcloude.pagetype.database_server.test_database_server import (
 	create_test_database_server,
 )
-from jcloude.jcloude.doctype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.deploy_candidate_build.deploy_candidate_build import DeployCandidateBuild
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.remote_file.remote_file import RemoteFile
-from jcloude.jcloude.doctype.remote_file.test_remote_file import (
+from jcloude.jcloude.pagetype.remote_file.remote_file import RemoteFile
+from jcloude.jcloude.pagetype.remote_file.test_remote_file import (
 	create_test_remote_file,
 )
-from jcloude.jcloude.doctype.server.server import BaseServer, Server
-from jcloude.jcloude.doctype.site.site import (
+from jcloude.jcloude.pagetype.server.server import BaseServer, Server
+from jcloude.jcloude.pagetype.site.site import (
 	ARCHIVE_AFTER_SUSPEND_DAYS,
 	Site,
 	archive_suspended_sites,
 	process_rename_site_job_update,
 	suspend_sites_exceeding_disk_usage_for_last_14_days,
 )
-from jcloude.jcloude.doctype.site_activity.test_site_activity import create_test_site_activity
-from jcloude.jcloude.doctype.site_plan.test_site_plan import create_test_plan
-from jcloude.jcloude.doctype.team.test_team import create_test_team
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
-from jcloude.saas.doctype.saas_settings.test_saas_settings import create_test_saas_settings
+from jcloude.jcloude.pagetype.site_activity.test_site_activity import create_test_site_activity
+from jcloude.jcloude.pagetype.site_plan.test_site_plan import create_test_plan
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
+from jcloude.saas.pagetype.saas_settings.test_saas_settings import create_test_saas_settings
 from jcloude.utils import get_current_team
 
 if typing.TYPE_CHECKING:
 	from datetime import datetime
 
-	from jcloude.jcloude.doctype.bench.bench import Bench
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.bench.bench import Bench
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
 
 
 @patch.object(DeployCandidateBuild, "pre_build", new=Mock())
@@ -63,8 +63,8 @@ def create_test_bench(
 
 	API call to agent will be faked when creating the pg.
 	"""
-	from jcloude.jcloude.doctype.proxy_server.test_proxy_server import create_test_proxy_server
-	from jcloude.jcloude.doctype.server.test_server import create_test_server
+	from jcloude.jcloude.pagetype.proxy_server.test_proxy_server import create_test_proxy_server
+	from jcloude.jcloude.pagetype.server.test_server import create_test_server
 
 	creation = creation or jingrow.utils.now_datetime()
 	user = user or jingrow.session.user
@@ -83,7 +83,7 @@ def create_test_bench(
 	bench = jingrow.get_pg(
 		{
 			"name": f"Test Bench{name}",
-			"doctype": "Bench",
+			"pagetype": "Bench",
 			"status": "Active",
 			"background_workers": 1,
 			"gunicorn_workers": 2,
@@ -120,7 +120,7 @@ def create_test_site(
 
 	Installs all apps present in bench.
 	"""
-	from jcloude.jcloude.doctype.agent_job.test_agent_job import fake_agent_job
+	from jcloude.jcloude.pagetype.agent_job.test_agent_job import fake_agent_job
 
 	if fake_agent_jobs:
 		context = fake_agent_job(
@@ -148,7 +148,7 @@ def create_test_site(
 
 		site = jingrow.get_pg(
 			{
-				"doctype": "Site",
+				"pagetype": "Site",
 				"status": status,
 				"subdomain": subdomain,
 				"server": bench.server,
@@ -174,7 +174,7 @@ def create_test_site(
 
 
 @patch.object(AgentJob, "enqueue_http_request", new=Mock())
-@patch("jcloude.jcloude.doctype.site.site._change_dns_record", new=Mock())
+@patch("jcloude.jcloude.pagetype.site.site._change_dns_record", new=Mock())
 class TestSite(FrappeTestCase):
 	"""Tests for Site Document methods."""
 
@@ -377,7 +377,7 @@ class TestSite(FrappeTestCase):
 
 	def test_site_rename_doesnt_update_host_name_for_custom_domain(self):
 		"""Ensure site configuration isn't updated after rename when custom domain is host_name."""
-		from jcloude.jcloude.doctype.site_domain.test_site_domain import create_test_site_domain
+		from jcloude.jcloude.pagetype.site_domain.test_site_domain import create_test_site_domain
 
 		site = create_test_site("old-name")
 		site_domain1 = create_test_site_domain(site.name, "sitedomain1.com")
@@ -401,7 +401,7 @@ class TestSite(FrappeTestCase):
 		private = create_test_remote_file().name
 		config = create_test_remote_file().name
 		plan = jingrow.get_pg(
-			doctype="Site Plan",
+			pagetype="Site Plan",
 			name="Plan-10",
 			document_type="Site",
 			interval="Daily",
@@ -523,8 +523,8 @@ class TestSite(FrappeTestCase):
 		self.assertEqual(site.apps[1].app, "erpnext")
 		self.assertEqual(site.apps[2].app, "crm")
 
-	@patch("jcloude.jcloude.doctype.site.site.jingrow.db.commit", new=Mock())
-	@patch("jcloude.jcloude.doctype.site.site.jingrow.db.rollback", new=Mock())
+	@patch("jcloude.jcloude.pagetype.site.site.jingrow.db.commit", new=Mock())
+	@patch("jcloude.jcloude.pagetype.site.site.jingrow.db.rollback", new=Mock())
 	def test_archive_suspended_sites_archives_only_sites_suspended_longer_than_days(self):
 		site = create_test_site()
 		site.db_set("status", "Suspended")
@@ -550,8 +550,8 @@ class TestSite(FrappeTestCase):
 		self.assertEqual(site2.status, "Suspended")
 		self.assertEqual(site3.status, "Active")
 
-	@patch("jcloude.jcloude.doctype.site.site.jingrow.db.commit", new=Mock())
-	@patch("jcloude.jcloude.doctype.site.site.jingrow.db.rollback", new=Mock())
+	@patch("jcloude.jcloude.pagetype.site.site.jingrow.db.commit", new=Mock())
+	@patch("jcloude.jcloude.pagetype.site.site.jingrow.db.rollback", new=Mock())
 	def test_suspension_of_10_usd_site_triggers_backup_if_it_does_not_exist(self):
 		plan_10 = create_test_plan("Site", price_usd=10.0, price_inr=750.0, plan_name="USD 10")
 
@@ -570,7 +570,7 @@ class TestSite(FrappeTestCase):
 		site2_activity.db_set(
 			"creation", jingrow.utils.add_days(jingrow.utils.now_datetime(), -ARCHIVE_AFTER_SUSPEND_DAYS - 1)
 		)
-		from jcloude.jcloude.doctype.site_backup.test_site_backup import create_test_site_backup
+		from jcloude.jcloude.pagetype.site_backup.test_site_backup import create_test_site_backup
 
 		create_test_site_backup(site2.name)
 
diff --git a/press/press/doctype/site_activity/site_activity.json b/press/press/doctype/site_activity/site_activity.json
index 46f2c1d4..480005c4 100644
--- a/press/press/doctype/site_activity/site_activity.json
+++ b/press/press/doctype/site_activity/site_activity.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2022-01-28 20:07:38.369240",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_activity/site_activity.py b/press/press/doctype/site_activity/site_activity.py
index e8f981b3..aec1f763 100644
--- a/press/press/doctype/site_activity/site_activity.py
+++ b/press/press/doctype/site_activity/site_activity.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
 
 
 class SiteActivity(Document):
@@ -65,7 +65,7 @@ class SiteActivity(Document):
 					subject="Administrator login to your site",
 					template="admin_login",
 					args={"site": self.site, "user": self.owner, "reason": self.reason},
-					reference_doctype=self.doctype,
+					reference_pagetype=self.pagetype,
 					reference_name=self.name,
 				)
 
@@ -77,12 +77,12 @@ class SiteActivity(Document):
 					subject="Site Monitoring Disabled",
 					template="disabled_site_monitoring",
 					args={"site": self.site, "reason": self.reason},
-					reference_doctype=self.doctype,
+					reference_pagetype=self.pagetype,
 					reference_name=self.name,
 				)
 
 
 def log_site_activity(site, action, reason=None, job=None):
 	return jingrow.get_pg(
-		{"doctype": "Site Activity", "site": site, "action": action, "reason": reason, "job": job}
+		{"pagetype": "Site Activity", "site": site, "action": action, "reason": reason, "job": job}
 	).insert()
diff --git a/press/press/doctype/site_activity/test_site_activity.py b/press/press/doctype/site_activity/test_site_activity.py
index 03910714..a89eb73c 100644
--- a/press/press/doctype/site_activity/test_site_activity.py
+++ b/press/press/doctype/site_activity/test_site_activity.py
@@ -10,13 +10,13 @@ from jingrow.tests.utils import FrappeTestCase
 from jcloude.utils import get_current_team
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.site_activity.site_activity import SiteActivity
+	from jcloude.jcloude.pagetype.site_activity.site_activity import SiteActivity
 
 
 def create_test_site_activity(site: str, action: str) -> SiteActivity:
 	return jingrow.get_pg(
 		{  # type: ignore
-			"doctype": "Site Activity",
+			"pagetype": "Site Activity",
 			"site": site,
 			"action": action,
 			"team": get_current_team(),
diff --git a/press/press/doctype/site_analytics/site_analytics.json b/press/press/doctype/site_analytics/site_analytics.json
index 79f5e112..a8607654 100644
--- a/press/press/doctype/site_analytics/site_analytics.json
+++ b/press/press/doctype/site_analytics/site_analytics.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2022-05-02 23:26:52.559658",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -165,7 +165,7 @@
    "fieldname": "sales_data",
    "fieldtype": "Table",
    "label": "Sales Data",
-   "options": "Site Analytics DocType",
+   "options": "Site Analytics PageType",
    "read_only": 1
   },
   {
diff --git a/press/press/doctype/site_analytics/site_analytics.py b/press/press/doctype/site_analytics/site_analytics.py
index a44989d5..a31471b9 100644
--- a/press/press/doctype/site_analytics/site_analytics.py
+++ b/press/press/doctype/site_analytics/site_analytics.py
@@ -16,17 +16,17 @@ class SiteAnalytics(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.site_analytics_active.site_analytics_active import (
+		from jcloude.jcloude.pagetype.site_analytics_active.site_analytics_active import (
 			SiteAnalyticsActive,
 		)
-		from jcloude.jcloude.doctype.site_analytics_app.site_analytics_app import SiteAnalyticsApp
-		from jcloude.jcloude.doctype.site_analytics_doctype.site_analytics_doctype import (
+		from jcloude.jcloude.pagetype.site_analytics_app.site_analytics_app import SiteAnalyticsApp
+		from jcloude.jcloude.pagetype.site_analytics_pagetype.site_analytics_pagetype import (
 			SiteAnalyticsDocType,
 		)
-		from jcloude.jcloude.doctype.site_analytics_login.site_analytics_login import (
+		from jcloude.jcloude.pagetype.site_analytics_login.site_analytics_login import (
 			SiteAnalyticsLogin,
 		)
-		from jcloude.jcloude.doctype.site_analytics_user.site_analytics_user import (
+		from jcloude.jcloude.pagetype.site_analytics_user.site_analytics_user import (
 			SiteAnalyticsUser,
 		)
 
@@ -59,11 +59,11 @@ class SiteAnalytics(Document):
 			"Site Analytics User",
 			"Site Analytics Login",
 			"Site Analytics App",
-			"Site Analytics DocType",
+			"Site Analytics PageType",
 			"Site Analytics Active",
 		]
 		for table in tables:
-			table = jingrow.qb.DocType(table)
+			table = jingrow.qb.PageType(table)
 			jingrow.db.delete(table, filters=(table.modified < (Now() - Interval(days=days))))
 			jingrow.db.commit()
 
@@ -84,11 +84,11 @@ def create_site_analytics(site, data):
 	def get_sales_data(analytics):
 		sales_data = []
 		for row in analytics.get("activation", {}).get("sales_data", []):
-			doctype, count = tuple(row.items())[0]
+			pagetype, count = tuple(row.items())[0]
 			if count:
 				sales_data.append(
 					{
-						"document_type": doctype,
+						"document_type": pagetype,
 						"count": count,
 					}
 				)
@@ -107,7 +107,7 @@ def create_site_analytics(site, data):
 	if not jingrow.db.exists("Site Analytics", {"site": site, "timestamp": timestamp}):
 		pg = jingrow.get_pg(
 			{
-				"doctype": "Site Analytics",
+				"pagetype": "Site Analytics",
 				"site": site,
 				"timestamp": timestamp,
 				"country": analytics.get("country"),
diff --git a/press/press/doctype/site_analytics_active/site_analytics_active.json b/press/press/doctype/site_analytics_active/site_analytics_active.json
index 7948de41..da2c1ed3 100644
--- a/press/press/doctype/site_analytics_active/site_analytics_active.json
+++ b/press/press/doctype/site_analytics_active/site_analytics_active.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-09-29 17:09:45.285414",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "email",
diff --git a/press/press/doctype/site_analytics_app/site_analytics_app.json b/press/press/doctype/site_analytics_app/site_analytics_app.json
index 28522ee1..5f664f68 100644
--- a/press/press/doctype/site_analytics_app/site_analytics_app.json
+++ b/press/press/doctype/site_analytics_app/site_analytics_app.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-05-02 23:37:43.357398",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "app_name",
diff --git a/press/press/doctype/site_analytics_doctype/site_analytics_doctype.json b/press/press/doctype/site_analytics_doctype/site_analytics_doctype.json
index e91d62c2..c3c69a6d 100644
--- a/press/press/doctype/site_analytics_doctype/site_analytics_doctype.json
+++ b/press/press/doctype/site_analytics_doctype/site_analytics_doctype.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-05-02 23:39:27.920170",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "document_type",
@@ -28,7 +28,7 @@
  "modified": "2022-05-05 09:27:41.077818",
  "modified_by": "Administrator",
  "module": "Jcloude",
- "name": "Site Analytics DocType",
+ "name": "Site Analytics PageType",
  "naming_rule": "Autoincrement",
  "owner": "Administrator",
  "permissions": [],
diff --git a/press/press/doctype/site_analytics_login/site_analytics_login.json b/press/press/doctype/site_analytics_login/site_analytics_login.json
index 4e0d7f58..00f79474 100644
--- a/press/press/doctype/site_analytics_login/site_analytics_login.json
+++ b/press/press/doctype/site_analytics_login/site_analytics_login.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-05-02 23:36:42.966427",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "user",
diff --git a/press/press/doctype/site_analytics_user/site_analytics_user.json b/press/press/doctype/site_analytics_user/site_analytics_user.json
index 4de8ad92..f110039d 100644
--- a/press/press/doctype/site_analytics_user/site_analytics_user.json
+++ b/press/press/doctype/site_analytics_user/site_analytics_user.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-05-02 23:35:08.922911",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "email",
diff --git a/press/press/doctype/site_app/site_app.json b/press/press/doctype/site_app/site_app.json
index 6a5f0b29..74888897 100644
--- a/press/press/doctype/site_app/site_app.json
+++ b/press/press/doctype/site_app/site_app.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-01-14 14:14:41.801519",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_backup/site_backup.json b/press/press/doctype/site_backup/site_backup.json
index 13a74257..a424561d 100644
--- a/press/press/doctype/site_backup/site_backup.json
+++ b/press/press/doctype/site_backup/site_backup.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2023-06-06 19:43:02.419970",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -303,7 +303,7 @@
  ],
  "links": [
   {
-   "link_doctype": "Agent Job",
+   "link_pagetype": "Agent Job",
    "link_fieldname": "reference_name"
   }
  ],
diff --git a/press/press/doctype/site_backup/site_backup.py b/press/press/doctype/site_backup/site_backup.py
index 7ae9e759..abae8560 100644
--- a/press/press/doctype/site_backup/site_backup.py
+++ b/press/press/doctype/site_backup/site_backup.py
@@ -10,20 +10,20 @@ from typing import TYPE_CHECKING
 
 import jingrow
 import jingrow.utils
-from jingrow.desk.doctype.tag.tag import add_tag
+from jingrow.desk.pagetype.tag.tag import add_tag
 from jingrow.model.document import Document
 
 from jcloude.agent import Agent
 from jcloude.exceptions import SiteTooManyPendingBackups
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.ansible_console.ansible_console import AnsibleAdHoc
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.ansible_console.ansible_console import AnsibleAdHoc
 
 if TYPE_CHECKING:
 	from datetime import datetime
 
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.site_update.site_update import SiteUpdate
-	from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.site_update.site_update import SiteUpdate
+	from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 
 
 class SiteBackup(Document):
@@ -102,7 +102,7 @@ class SiteBackup(Document):
 		"""
 		Remove records with `Success` but files_availability is `Unavailable`
 		"""
-		sb = jingrow.qb.DocType("Site Backup")
+		sb = jingrow.qb.PageType("Site Backup")
 		query = query.where(~((sb.files_availability == "Unavailable") & (sb.status == "Success")))
 		if filters.get("backup_date"):
 			with contextlib.suppress(Exception):
@@ -187,7 +187,7 @@ class SiteBackup(Document):
 		if self.deactivate_site_during_backup:
 			agent = Agent(self.server)
 			agent.deactivate_site(
-				jingrow.get_pg("Site", self.site), reference_doctype=self.doctype, reference_name=self.name
+				jingrow.get_pg("Site", self.site), reference_pagetype=self.pagetype, reference_name=self.name
 			)
 		else:
 			self.start_backup()
@@ -195,7 +195,7 @@ class SiteBackup(Document):
 	def start_backup(self):
 		if self.physical:
 			jingrow.enqueue_pg(
-				doctype=self.doctype,
+				pagetype=self.pagetype,
 				name=self.name,
 				method="_create_physical_backup",
 				enqueue_after_commit=True,
@@ -225,7 +225,7 @@ class SiteBackup(Document):
 					site_update.activate_site(backup_failed=True)
 
 			jingrow.enqueue_pg(
-				self.doctype,
+				self.pagetype,
 				self.name,
 				method="_rollback_db_directory_permissions",
 				enqueue_after_commit=True,
@@ -238,7 +238,7 @@ class SiteBackup(Document):
 		):
 			agent = Agent(self.server)
 			agent.activate_site(
-				jingrow.get_pg("Site", self.site), reference_doctype=self.doctype, reference_name=self.name
+				jingrow.get_pg("Site", self.site), reference_pagetype=self.pagetype, reference_name=self.name
 			)
 
 		try:
@@ -251,7 +251,7 @@ class SiteBackup(Document):
 		except Exception:
 			jingrow.log_error(
 				"Failed to correct bench permissions",
-				reference_doctype=self.doctype,
+				reference_pagetype=self.pagetype,
 				reference_name=self.name,
 			)
 
@@ -281,7 +281,7 @@ class SiteBackup(Document):
 			"""
 			jingrow.log_error(
 				"Failed to rollback the permission changes of the database directory",
-				reference_doctype=self.doctype,
+				reference_pagetype=self.pagetype,
 				reference_name=self.name,
 			)
 
@@ -319,7 +319,7 @@ class SiteBackup(Document):
 			jingrow.log_error(
 				"During physical backup creation, failed to execute command in database server",
 				message=pretty_result,
-				reference_doctype=self.doctype,
+				reference_pagetype=self.pagetype,
 				reference_name=self.name,
 			)
 			comment = f"<pre><code>{command}</code></pre><pre><code>{pretty_result}</pre></code>"
@@ -389,7 +389,7 @@ class SiteBackup(Document):
 			except Exception:
 				jingrow.log_error(
 					"Failed to correct bench permissions.",
-					reference_doctype=self.doctype,
+					reference_pagetype=self.pagetype,
 					reference_name=self.name,
 				)
 				return False
@@ -408,7 +408,7 @@ class SiteBackup(Document):
 			except Exception:
 				jingrow.log_error(
 					"Failed to fix global search indexes",
-					reference_doctype=self.doctype,
+					reference_pagetype=self.pagetype,
 					reference_name=self.name,
 				)
 
@@ -430,7 +430,7 @@ class SiteBackup(Document):
 		return cls.backup_exists(site, day, {"with_files": True})
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Site Backup")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Site Backup")
 
 
 class OngoingSnapshotError(Exception):
@@ -455,7 +455,7 @@ def track_offsite_backups(site: str, backup_data: dict, offsite_backup_data: dic
 			if file_path:
 				remote_file = jingrow.get_pg(
 					{
-						"doctype": "Remote File",
+						"pagetype": "Remote File",
 						"site": site,
 						"file_name": file_name,
 						"file_path": file_path,
@@ -465,7 +465,7 @@ def track_offsite_backups(site: str, backup_data: dict, offsite_backup_data: dic
 					}
 				)
 				remote_file.save()
-				add_tag("Offsite Backup", remote_file.doctype, remote_file.name)
+				add_tag("Offsite Backup", remote_file.pagetype, remote_file.name)
 				remote_files[type] = remote_file.name
 
 	return (
@@ -552,7 +552,7 @@ def get_backup_bucket(cluster, region=False):
 
 
 def process_deactivate_site_job_update(job: AgentJob):
-	if job.reference_doctype != "Site Backup":
+	if job.reference_pagetype != "Site Backup":
 		return
 
 	if job.status not in ["Success", "Failure", "Delivery Failure"]:
@@ -575,5 +575,5 @@ def process_deactivate_site_job_update(job: AgentJob):
 		backup.start_backup()
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	jingrow.db.add_index("Site Backup", ["files_availability", "job"])
diff --git a/press/press/doctype/site_backup/test_site_backup.py b/press/press/doctype/site_backup/test_site_backup.py
index 6fc71cad..7455f106 100644
--- a/press/press/doctype/site_backup/test_site_backup.py
+++ b/press/press/doctype/site_backup/test_site_backup.py
@@ -9,9 +9,9 @@ from unittest.mock import Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob, process_job_updates
-from jcloude.jcloude.doctype.remote_file.test_remote_file import create_test_remote_file
-from jcloude.jcloude.doctype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob, process_job_updates
+from jcloude.jcloude.pagetype.remote_file.test_remote_file import create_test_remote_file
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
 
 if TYPE_CHECKING:
 	from datetime import datetime
@@ -32,7 +32,7 @@ def create_test_site_backup(
 	"""
 	creation = creation or jingrow.utils.now_datetime()
 	params_dict = {
-		"doctype": "Site Backup",
+		"pagetype": "Site Backup",
 		"status": status,
 		"site": site,
 		"files_availability": files_availability,
diff --git a/press/press/doctype/site_backup_time/site_backup_time.json b/press/press/doctype/site_backup_time/site_backup_time.json
index 9ae6a615..b9b62c1e 100644
--- a/press/press/doctype/site_backup_time/site_backup_time.json
+++ b/press/press/doctype/site_backup_time/site_backup_time.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-04-11 13:34:22.125288",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_config/site_config.json b/press/press/doctype/site_config/site_config.json
index 67647dbf..a6d3e278 100644
--- a/press/press/doctype/site_config/site_config.json
+++ b/press/press/doctype/site_config/site_config.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-09-11 11:55:45.987702",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_config/site_config.py b/press/press/doctype/site_config/site_config.py
index 1d23faa6..37634aae 100644
--- a/press/press/doctype/site_config/site_config.py
+++ b/press/press/doctype/site_config/site_config.py
@@ -49,7 +49,7 @@ class SiteConfig(Config):
 
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
-		Config = jingrow.qb.DocType("Site Config")
+		Config = jingrow.qb.PageType("Site Config")
 		query = query.where(Config.internal == 0)
 		configs = query.run(as_dict=True)
 		return SiteConfig.format_config_for_list(configs)
diff --git a/press/press/doctype/site_config_key/site_config_key.json b/press/press/doctype/site_config_key/site_config_key.json
index 57fe72cd..3acf0dce 100644
--- a/press/press/doctype/site_config_key/site_config_key.json
+++ b/press/press/doctype/site_config_key/site_config_key.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "field:key",
  "creation": "2020-09-15 12:24:29.013894",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_config_key_blacklist/site_config_key_blacklist.json b/press/press/doctype/site_config_key_blacklist/site_config_key_blacklist.json
index a704b6d9..cfad9fbf 100644
--- a/press/press/doctype/site_config_key_blacklist/site_config_key_blacklist.json
+++ b/press/press/doctype/site_config_key_blacklist/site_config_key_blacklist.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "field:key",
  "creation": "2020-09-15 12:39:37.408188",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_database_table_permission/site_database_table_permission.json b/press/press/doctype/site_database_table_permission/site_database_table_permission.json
index 06c1682d..f14d76dd 100644
--- a/press/press/doctype/site_database_table_permission/site_database_table_permission.json
+++ b/press/press/doctype/site_database_table_permission/site_database_table_permission.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-10-31 17:08:37.280675",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_database_user/site_database_user.json b/press/press/doctype/site_database_user/site_database_user.json
index 9ab683d4..91fc3d84 100644
--- a/press/press/doctype/site_database_user/site_database_user.json
+++ b/press/press/doctype/site_database_user/site_database_user.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-10-31 16:54:56.752608",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "status",
@@ -144,7 +144,7 @@
  "links": [
   {
    "group": "Related Documents",
-   "link_doctype": "Agent Job",
+   "link_pagetype": "Agent Job",
    "link_fieldname": "reference_name"
   }
  ],
diff --git a/press/press/doctype/site_database_user/site_database_user.py b/press/press/doctype/site_database_user/site_database_user.py
index 20f1713d..cc4ee3c3 100644
--- a/press/press/doctype/site_database_user/site_database_user.py
+++ b/press/press/doctype/site_database_user/site_database_user.py
@@ -14,11 +14,11 @@ from jingrow.utils.password import get_decrypted_password
 
 from jcloude.agent import Agent
 from jcloude.api.client import dashboard_whitelist
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.site_activity.site_activity import log_site_activity
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.site_activity.site_activity import log_site_activity
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.site.site import Site
+	from jcloude.jcloude.pagetype.site.site import Site
 
 
 class SiteDatabaseUser(Document):
@@ -30,7 +30,7 @@ class SiteDatabaseUser(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.site_database_table_permission.site_database_table_permission import (
+		from jcloude.jcloude.pagetype.site_database_table_permission.site_database_table_permission import (
 			SiteDatabaseTablePermission,
 		)
 
@@ -111,7 +111,7 @@ class SiteDatabaseUser(Document):
 		)
 		if hasattr(self.flags, "ignore_after_insert_hooks") and self.flags.ignore_after_insert_hooks:
 			"""
-			Added for make it easy to migrate records of db access users from site doctype to site database user
+			Added for make it easy to migrate records of db access users from site pagetype to site database user
 			"""
 			return
 		self.apply_changes()
@@ -227,7 +227,7 @@ class SiteDatabaseUser(Document):
 			self.get_password("password"),
 			self.max_connections,
 			database_server,
-			reference_doctype="Site Database User",
+			reference_pagetype="Site Database User",
 			reference_name=self.name,
 		)
 
@@ -240,7 +240,7 @@ class SiteDatabaseUser(Document):
 		agent.remove_proxysql_user(
 			jingrow.get_pg("Site", self.site),
 			self.username,
-			reference_doctype="Site Database User",
+			reference_pagetype="Site Database User",
 			reference_name=self.name,
 		)
 
@@ -446,4 +446,4 @@ class SiteDatabaseUser(Document):
 		return default_error_msg
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Site Database User")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Site Database User")
diff --git a/press/press/doctype/site_domain/site_domain.json b/press/press/doctype/site_domain/site_domain.json
index 6d7bf6bb..11c9931c 100644
--- a/press/press/doctype/site_domain/site_domain.json
+++ b/press/press/doctype/site_domain/site_domain.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "field:domain",
  "creation": "2020-03-17 16:35:11.520003",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_domain/site_domain.py b/press/press/doctype/site_domain/site_domain.py
index b92075e5..4f59d75d 100644
--- a/press/press/doctype/site_domain/site_domain.py
+++ b/press/press/doctype/site_domain/site_domain.py
@@ -13,13 +13,13 @@ from jcloude.agent import Agent
 from jcloude.exceptions import (
 	DNSValidationError,
 )
-from jcloude.overrides import get_permission_query_conditions_for_doctype
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
 from jcloude.utils import log_error
 from jcloude.utils.dns import check_dns_cname_a, create_dns_record
 from jcloude.utils.jobs import has_job_timeout_exceeded
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.site.site import Site
+	from jcloude.jcloude.pagetype.site.site import Site
 
 
 class SiteDomain(Document):
@@ -58,7 +58,7 @@ class SiteDomain(Document):
 		return None
 
 	def before_insert(self):
-		Site = jingrow.qb.DocType("Site")
+		Site = jingrow.qb.PageType("Site")
 
 		site = (
 			jingrow.qb.from_(Site)
@@ -136,7 +136,7 @@ class SiteDomain(Document):
 	def create_tls_certificate(self):
 		certificate = jingrow.get_pg(
 			{
-				"doctype": "TLS Certificate",
+				"pagetype": "TLS Certificate",
 				"wildcard": False,
 				"domain": self.domain,
 				"team": self.team,
@@ -239,8 +239,8 @@ def process_add_domain_to_upstream_job_update(job):
 
 
 def update_dns_type():
-	Domain = jingrow.qb.DocType("Site Domain")
-	Certificate = jingrow.qb.DocType("TLS Certificate")
+	Domain = jingrow.qb.PageType("Site Domain")
+	Certificate = jingrow.qb.PageType("TLS Certificate")
 	query = (
 		jingrow.qb.from_(Domain)
 		.left_join(Certificate)
@@ -287,4 +287,4 @@ def update_dns_type():
 			log_error("DNS Check Failed", domain=domain)
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Site Domain")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Site Domain")
diff --git a/press/press/doctype/site_domain/test_site_domain.py b/press/press/doctype/site_domain/test_site_domain.py
index b460e9ff..8cd81e21 100644
--- a/press/press/doctype/site_domain/test_site_domain.py
+++ b/press/press/doctype/site_domain/test_site_domain.py
@@ -8,11 +8,11 @@ import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
 from jcloude.agent import Agent
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.site.site import site_cleanup_after_archive
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.site_domain.site_domain import SiteDomain
-from jcloude.jcloude.doctype.tls_certificate.tls_certificate import TLSCertificate
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.site.site import site_cleanup_after_archive
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.site_domain.site_domain import SiteDomain
+from jcloude.jcloude.pagetype.tls_certificate.tls_certificate import TLSCertificate
 
 
 def create_test_site_domain(site: str, domain: str, status: str = "Active") -> SiteDomain:
@@ -20,7 +20,7 @@ def create_test_site_domain(site: str, domain: str, status: str = "Active") -> S
 	with patch.object(TLSCertificate, "obtain_certificate"):
 		site_domain = jingrow.get_pg(
 			{
-				"doctype": "Site Domain",
+				"pagetype": "Site Domain",
 				"site": site,
 				"domain": domain,
 				"status": status,
@@ -33,7 +33,7 @@ def create_test_site_domain(site: str, domain: str, status: str = "Active") -> S
 
 
 @patch.object(AgentJob, "after_insert", new=Mock())
-@patch("jcloude.jcloude.doctype.site.site._change_dns_record", new=Mock())
+@patch("jcloude.jcloude.pagetype.site.site._change_dns_record", new=Mock())
 class TestSiteDomain(FrappeTestCase):
 	"""Tests for Site Domain Document methods."""
 
@@ -44,7 +44,7 @@ class TestSiteDomain(FrappeTestCase):
 		self.site_subdomain = "testsubdomain"
 
 	def test_set_host_name(self):
-		"""Test set_host_name() method of Site doctype sets host_name property."""
+		"""Test set_host_name() method of Site pagetype sets host_name property."""
 		site = create_test_site(self.site_subdomain)
 		domain_name = jingrow.mock("domain_name")
 
@@ -68,7 +68,7 @@ class TestSiteDomain(FrappeTestCase):
 	def test_default_site_domain_cannot_be_deleted(self):
 		"""Ensure default site domain for a site cannot be deleted."""
 		site = create_test_site(self.site_subdomain)
-		default_domain = jingrow.get_pg({"doctype": "Site Domain", "site": site.name, "name": site.name})
+		default_domain = jingrow.get_pg({"pagetype": "Site Domain", "site": site.name, "name": site.name})
 		site_domain2 = create_test_site_domain(site.name, "hellohello.com")
 		site.set_host_name(site_domain2.name)
 		self.assertRaises(Exception, site.remove_domain, default_domain.name)
@@ -160,7 +160,7 @@ class TestSiteDomain(FrappeTestCase):
 		with patch.object(Agent, "setup_redirects") as mock_setup_redirects:
 			site_domain = jingrow.get_pg(
 				{
-					"doctype": "Site Domain",
+					"pagetype": "Site Domain",
 					"site": site.name,
 					"domain": "hellohello.com",
 					"status": "Active",
@@ -177,7 +177,7 @@ class TestSiteDomain(FrappeTestCase):
 		site_domain = create_test_site_domain(site.name, "hellohello.com")
 
 		site.archive()
-		with patch("jcloude.jcloude.doctype.site.site.jingrow.delete_pg") as mock_jingrow_del:
+		with patch("jcloude.jcloude.pagetype.site.site.jingrow.delete_pg") as mock_jingrow_del:
 			site_cleanup_after_archive(site.name)
 		mock_jingrow_del.assert_has_calls(
 			[call("Site Domain", site.name), call("Site Domain", site_domain.name)],
diff --git a/press/press/doctype/site_group_deploy/site_group_deploy.json b/press/press/doctype/site_group_deploy/site_group_deploy.json
index 5c00b2d9..d717d5cb 100644
--- a/press/press/doctype/site_group_deploy/site_group_deploy.json
+++ b/press/press/doctype/site_group_deploy/site_group_deploy.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "hash",
  "creation": "2024-08-28 14:35:33.621134",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "status",
diff --git a/press/press/doctype/site_group_deploy/site_group_deploy.py b/press/press/doctype/site_group_deploy/site_group_deploy.py
index d546874b..15b33d4e 100644
--- a/press/press/doctype/site_group_deploy/site_group_deploy.py
+++ b/press/press/doctype/site_group_deploy/site_group_deploy.py
@@ -15,7 +15,7 @@ class SiteGroupDeploy(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.site_group_deploy_app.site_group_deploy_app import (
+		from jcloude.jcloude.pagetype.site_group_deploy_app.site_group_deploy_app import (
 			SiteGroupDeployApp,
 		)
 
@@ -62,7 +62,7 @@ class SiteGroupDeploy(Document):
 		self.version = jingrow.db.get_value("Jingrow Version", {"status": "stable"}, order_by="number desc")
 
 	def check_if_rg_or_site_exists(self):
-		from jcloude.jcloude.doctype.site.site import Site
+		from jcloude.jcloude.pagetype.site.site import Site
 
 		if jingrow.db.exists("Release Group", {"title": self.subdomain}):
 			jingrow.throw(f"Release Group with title {self.subdomain} already exists")
@@ -72,7 +72,7 @@ class SiteGroupDeploy(Document):
 			jingrow.throw(f"Site with subdomain {self.subdomain} already exists")
 
 	def create_release_group(self):
-		from jcloude.jcloude.doctype.release_group.release_group import new_release_group
+		from jcloude.jcloude.pagetype.release_group.release_group import new_release_group
 
 		apps = [{"app": app.app, "source": app.source} for app in self.apps]
 
@@ -107,7 +107,7 @@ class SiteGroupDeploy(Document):
 		try:
 			site = jingrow.get_pg(
 				{
-					"doctype": "Site",
+					"pagetype": "Site",
 					"team": self.team,
 					"subdomain": self.subdomain,
 					"apps": apps,
diff --git a/press/press/doctype/site_group_deploy_app/site_group_deploy_app.json b/press/press/doctype/site_group_deploy_app/site_group_deploy_app.json
index 48c43473..acc82ea5 100644
--- a/press/press/doctype/site_group_deploy_app/site_group_deploy_app.json
+++ b/press/press/doctype/site_group_deploy_app/site_group_deploy_app.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-08-28 16:22:16.613931",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_migration/site_migration.json b/press/press/doctype/site_migration/site_migration.json
index 8d8c80be..81527ca1 100644
--- a/press/press/doctype/site_migration/site_migration.json
+++ b/press/press/doctype/site_migration/site_migration.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-01-19 15:10:34.077966",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_migration/site_migration.py b/press/press/doctype/site_migration/site_migration.py
index fa36818e..b5c214fc 100644
--- a/press/press/doctype/site_migration/site_migration.py
+++ b/press/press/doctype/site_migration/site_migration.py
@@ -22,11 +22,11 @@ from jcloude.exceptions import (
 	SiteAlreadyArchived,
 	SiteUnderMaintenance,
 )
-from jcloude.jcloude.doctype.jcloude_notification.jcloude_notification import (
+from jcloude.jcloude.pagetype.jcloude_notification.jcloude_notification import (
 	create_new_notification,
 )
-from jcloude.jcloude.doctype.site.site import Site
-from jcloude.jcloude.doctype.site_backup.site_backup import (
+from jcloude.jcloude.pagetype.site.site import Site
+from jcloude.jcloude.pagetype.site_backup.site_backup import (
 	SiteBackup,
 	process_backup_site_job_update,
 )
@@ -35,10 +35,10 @@ from jcloude.utils import log_error
 if TYPE_CHECKING:
 	from jingrow.types.DF import Link
 
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.cluster.cluster import Cluster
-	from jcloude.jcloude.doctype.server.server import Server
-	from jcloude.jcloude.doctype.site_domain.site_domain import SiteDomain
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.cluster.cluster import Cluster
+	from jcloude.jcloude.pagetype.server.server import Server
+	from jcloude.jcloude.pagetype.site_domain.site_domain import SiteDomain
 
 
 def get_ongoing_migration(site: Link, scheduled=False):
@@ -62,7 +62,7 @@ class SiteMigration(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.site_migration_step.site_migration_step import SiteMigrationStep
+		from jcloude.jcloude.pagetype.site_migration_step.site_migration_step import SiteMigrationStep
 
 		backup: DF.Link | None
 		destination_bench: DF.Link
@@ -455,7 +455,7 @@ class SiteMigration(Document):
 				site.create_dns_record()
 
 	def send_fail_notification(self, reason: str | None = None):
-		from jcloude.jcloude.doctype.agent_job.agent_job_notifications import create_job_failed_notification
+		from jcloude.jcloude.pagetype.agent_job.agent_job_notifications import create_job_failed_notification
 
 		site = Site("Site", self.site)
 		message = f"Site Migration ({self.migration_type}) for site <b>{site.host_name}</b> failed"
@@ -834,5 +834,5 @@ def run_scheduled_migrations():
 			log_error("Site Migration Start Error", exception=e)
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	jingrow.db.add_index("Site Migration", ["site"])
diff --git a/press/press/doctype/site_migration/test_site_migration.py b/press/press/doctype/site_migration/test_site_migration.py
index 973d55ee..c4ff70f6 100644
--- a/press/press/doctype/site_migration/test_site_migration.py
+++ b/press/press/doctype/site_migration/test_site_migration.py
@@ -7,16 +7,16 @@ import jingrow
 from jingrow.core.utils import find
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.agent_job.agent_job import poll_pending_jobs
-from jcloude.jcloude.doctype.agent_job.test_agent_job import fake_agent_job
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import poll_pending_jobs
+from jcloude.jcloude.pagetype.agent_job.test_agent_job import fake_agent_job
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.remote_file.remote_file import RemoteFile
-from jcloude.jcloude.doctype.site.site import Site
-from jcloude.jcloude.doctype.site.test_site import create_test_bench, create_test_site
-from jcloude.jcloude.doctype.site_migration.site_migration import (
+from jcloude.jcloude.pagetype.remote_file.remote_file import RemoteFile
+from jcloude.jcloude.pagetype.site.site import Site
+from jcloude.jcloude.pagetype.site.test_site import create_test_bench, create_test_site
+from jcloude.jcloude.pagetype.site_migration.site_migration import (
 	SiteMigration,
 	run_scheduled_migrations,
 )
@@ -70,7 +70,7 @@ class TestSiteMigration(FrappeTestCase):
 		bench = create_test_bench()
 		site_migration = jingrow.get_pg(
 			{
-				"doctype": "Site Migration",
+				"pagetype": "Site Migration",
 				"site": site.name,
 				"destination_bench": bench.name,
 			}
@@ -114,7 +114,7 @@ class TestSiteMigration(FrappeTestCase):
 		bench = create_test_bench()
 		site_migration: SiteMigration = jingrow.get_pg(
 			{
-				"doctype": "Site Migration",
+				"pagetype": "Site Migration",
 				"site": site.name,
 				"destination_bench": bench.name,
 			}
@@ -144,7 +144,7 @@ class TestSiteMigration(FrappeTestCase):
 		bench = create_test_bench()
 		site_migration: SiteMigration = jingrow.get_pg(
 			{
-				"doctype": "Site Migration",
+				"pagetype": "Site Migration",
 				"site": site.name,
 				"destination_bench": bench.name,
 			}
@@ -180,7 +180,7 @@ class TestSiteMigration(FrappeTestCase):
 		bench = create_test_bench()
 		site_migration: SiteMigration = jingrow.get_pg(
 			{
-				"doctype": "Site Migration",
+				"pagetype": "Site Migration",
 				"site": site.name,
 				"destination_bench": bench.name,
 			}
@@ -234,7 +234,7 @@ class TestSiteMigration(FrappeTestCase):
 		dest_bench = create_test_bench()
 		site_migration: SiteMigration = jingrow.get_pg(
 			{
-				"doctype": "Site Migration",
+				"pagetype": "Site Migration",
 				"site": site.name,
 				"destination_bench": dest_bench.name,
 				"scheduled_time": jingrow.utils.now_datetime(),
diff --git a/press/press/doctype/site_migration_step/site_migration_step.json b/press/press/doctype/site_migration_step/site_migration_step.json
index 2e45c5b5..2ad5d5be 100644
--- a/press/press/doctype/site_migration_step/site_migration_step.json
+++ b/press/press/doctype/site_migration_step/site_migration_step.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-05-03 13:57:25.931529",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_partner_lead/site_partner_lead.json b/press/press/doctype/site_partner_lead/site_partner_lead.json
index bd3c4c68..f7d63fc6 100644
--- a/press/press/doctype/site_partner_lead/site_partner_lead.json
+++ b/press/press/doctype/site_partner_lead/site_partner_lead.json
@@ -3,7 +3,7 @@
  "allow_import": 1,
  "allow_rename": 1,
  "creation": "2025-09-20 12:47:50.193116",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "team",
diff --git a/press/press/doctype/site_partner_lead/test_site_partner_lead.py b/press/press/doctype/site_partner_lead/test_site_partner_lead.py
index 30648a08..f90c7084 100644
--- a/press/press/doctype/site_partner_lead/test_site_partner_lead.py
+++ b/press/press/doctype/site_partner_lead/test_site_partner_lead.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests import IntegrationTestCase
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/site_plan/plan.py b/press/press/doctype/site_plan/plan.py
index a2e49890..4ea40f24 100644
--- a/press/press/doctype/site_plan/plan.py
+++ b/press/press/doctype/site_plan/plan.py
@@ -26,7 +26,7 @@ class Plan(Document):
 		return jingrow.utils.get_last_day(None).day
 
 	@classmethod
-	def get_plans(cls, doctype, fields=None, filters=None):
+	def get_plans(cls, pagetype, fields=None, filters=None):
 		or_filters = None
 		filters = filters or {}
 		if not fields:
@@ -36,7 +36,7 @@ class Plan(Document):
 
 		fields.append("`tabHas Role`.role")
 		plans = jingrow.get_all(
-			doctype, filters=filters, fields=fields, order_by="price_usd asc", or_filters=or_filters
+			pagetype, filters=filters, fields=fields, order_by="price_usd asc", or_filters=or_filters
 		)
 		return filter_by_roles(plans)
 
diff --git a/press/press/doctype/site_plan/site_plan.json b/press/press/doctype/site_plan/site_plan.json
index 1b67b87b..c7c976b7 100644
--- a/press/press/doctype/site_plan/site_plan.json
+++ b/press/press/doctype/site_plan/site_plan.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "Prompt",
  "creation": "2022-01-28 20:07:37.055861",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -58,7 +58,7 @@
    "fieldname": "document_type",
    "fieldtype": "Link",
    "label": "Document Type",
-   "options": "DocType",
+   "options": "PageType",
    "reqd": 1
   },
   {
diff --git a/press/press/doctype/site_plan/site_plan.py b/press/press/doctype/site_plan/site_plan.py
index 3ae4ce31..16b91ed8 100644
--- a/press/press/doctype/site_plan/site_plan.py
+++ b/press/press/doctype/site_plan/site_plan.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import jingrow
 
-from jcloude.jcloude.doctype.site_plan.plan import Plan
+from jcloude.jcloude.pagetype.site_plan.plan import Plan
 
 UNLIMITED_PLANS = ["Unlimited", "Unlimited - Supported"]
 
@@ -16,11 +16,11 @@ class SitePlan(Plan):
 	from typing import TYPE_CHECKING
 
 	if TYPE_CHECKING:
-		from jingrow.core.doctype.has_role.has_role import HasRole
+		from jingrow.core.pagetype.has_role.has_role import HasRole
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.site_plan_allowed_app.site_plan_allowed_app import SitePlanAllowedApp
-		from jcloude.jcloude.doctype.site_plan_release_group.site_plan_release_group import SitePlanReleaseGroup
+		from jcloude.jcloude.pagetype.site_plan_allowed_app.site_plan_allowed_app import SitePlanAllowedApp
+		from jcloude.jcloude.pagetype.site_plan_release_group.site_plan_release_group import SitePlanReleaseGroup
 
 		allow_downgrading_from_other_plan: DF.Check
 		allowed_apps: DF.Table[SitePlanAllowedApp]
diff --git a/press/press/doctype/site_plan/test_site_plan.py b/press/press/doctype/site_plan/test_site_plan.py
index c234862e..b23ee2f4 100644
--- a/press/press/doctype/site_plan/test_site_plan.py
+++ b/press/press/doctype/site_plan/test_site_plan.py
@@ -31,7 +31,7 @@ def create_test_plan(
 	plan_title = plan_name
 	plan = jingrow.get_pg(
 		{
-			"doctype": "Site Plan",
+			"pagetype": "Site Plan",
 			"document_type": "Site",
 			"name": plan_name,
 			"plan_title": plan_title,
diff --git a/press/press/doctype/site_plan_allowed_app/site_plan_allowed_app.json b/press/press/doctype/site_plan_allowed_app/site_plan_allowed_app.json
index 8f68c045..5b2d0e6b 100644
--- a/press/press/doctype/site_plan_allowed_app/site_plan_allowed_app.json
+++ b/press/press/doctype/site_plan_allowed_app/site_plan_allowed_app.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-07-09 23:27:13.919845",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_plan_change/site_plan_change.json b/press/press/doctype/site_plan_change/site_plan_change.json
index 4373dd39..143640a5 100644
--- a/press/press/doctype/site_plan_change/site_plan_change.json
+++ b/press/press/doctype/site_plan_change/site_plan_change.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-05-05 16:37:23.906627",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_plan_change/site_plan_change.py b/press/press/doctype/site_plan_change/site_plan_change.py
index 2637c56e..a66dc1f5 100644
--- a/press/press/doctype/site_plan_change/site_plan_change.py
+++ b/press/press/doctype/site_plan_change/site_plan_change.py
@@ -75,7 +75,7 @@ class SitePlanChange(Document):
 
 	def create_subscription(self):
 		jingrow.get_pg(
-			doctype="Subscription",
+			pagetype="Subscription",
 			team=self.team,
 			document_type="Site",
 			document_name=self.site,
@@ -98,7 +98,7 @@ class SitePlanChange(Document):
 
 		subscription.plan = self.to_plan
 		subscription.flags.updater_reference = {
-			"doctype": self.doctype,
+			"pagetype": self.pagetype,
 			"docname": self.name,
 			"label": _("via Site Plan Change"),
 		}
diff --git a/press/press/doctype/site_plan_change/test_site_plan_change.py b/press/press/doctype/site_plan_change/test_site_plan_change.py
index f216a171..2401fd3d 100644
--- a/press/press/doctype/site_plan_change/test_site_plan_change.py
+++ b/press/press/doctype/site_plan_change/test_site_plan_change.py
@@ -5,8 +5,8 @@
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.site_plan.test_site_plan import create_test_plan
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.site_plan.test_site_plan import create_test_plan
 
 
 class TestSitePlanChange(FrappeTestCase):
@@ -50,7 +50,7 @@ class TestSitePlanChange(FrappeTestCase):
 		with self.assertRaises(jingrow.exceptions.ValidationError) as context:
 			jingrow.get_pg(
 				{
-					"doctype": "Site Plan Change",
+					"pagetype": "Site Plan Change",
 					"site": self.site.name,
 					"from_plan": self.unlimited_plan.name,
 					"to_plan": self.tiny_plan.name,
@@ -69,7 +69,7 @@ class TestSitePlanChange(FrappeTestCase):
 		# Try to downgrade to `Nano Plan` from `Unlimited Plan`
 		jingrow.get_pg(
 			{
-				"doctype": "Site Plan Change",
+				"pagetype": "Site Plan Change",
 				"site": self.site.name,
 				"from_plan": self.unlimited_plan.name,
 				"to_plan": self.nano_plan.name,
diff --git a/press/press/doctype/site_plan_release_group/site_plan_release_group.json b/press/press/doctype/site_plan_release_group/site_plan_release_group.json
index fe58fdbf..c04ef61a 100644
--- a/press/press/doctype/site_plan_release_group/site_plan_release_group.json
+++ b/press/press/doctype/site_plan_release_group/site_plan_release_group.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-07-09 12:42:51.268467",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_replication/site_replication.json b/press/press/doctype/site_replication/site_replication.json
index 252115db..fe822be3 100644
--- a/press/press/doctype/site_replication/site_replication.json
+++ b/press/press/doctype/site_replication/site_replication.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format: SR-{#####}",
  "creation": "2022-12-13 15:28:46.433511",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_replication/site_replication.py b/press/press/doctype/site_replication/site_replication.py
index 85fe68fa..d0fc2c35 100644
--- a/press/press/doctype/site_replication/site_replication.py
+++ b/press/press/doctype/site_replication/site_replication.py
@@ -7,7 +7,7 @@ import jingrow
 from jingrow.model.document import Document
 
 from jcloude.api.site import _new
-from jcloude.jcloude.doctype.site.site import prepare_site
+from jcloude.jcloude.pagetype.site.site import prepare_site
 
 
 class SiteReplication(Document):
@@ -28,7 +28,7 @@ class SiteReplication(Document):
 		subdomain: DF.Data | None
 	# end: auto-generated types
 
-	doctype = "Site Replication"
+	pagetype = "Site Replication"
 
 	def validate(self):
 		self.validate_duplicate()
@@ -71,12 +71,12 @@ class SiteReplication(Document):
 
 	@classmethod
 	def get_all_running_site_replications(cls) -> List[Document]:
-		replications = jingrow.get_all(cls.doctype, dict(status="Running"), pluck="name")
+		replications = jingrow.get_all(cls.pagetype, dict(status="Running"), pluck="name")
 		return cls.get_docs(replications)
 
 	@classmethod
 	def get_docs(cls, names: List[str]) -> List[Document]:
-		return [jingrow.get_pg(cls.doctype, name) for name in names]
+		return [jingrow.get_pg(cls.pagetype, name) for name in names]
 
 
 def update_from_site():
diff --git a/press/press/doctype/site_update/scheduled_auto_updates.py b/press/press/doctype/site_update/scheduled_auto_updates.py
index 8fa3d212..2213e0c7 100644
--- a/press/press/doctype/site_update/scheduled_auto_updates.py
+++ b/press/press/doctype/site_update/scheduled_auto_updates.py
@@ -7,8 +7,8 @@ from calendar import monthrange
 import jingrow
 from jingrow.utils import get_datetime, get_time, now_datetime
 
-from jcloude.jcloude.doctype.site.site import Site
-from jcloude.jcloude.doctype.site_update.site_update import benches_with_available_update
+from jcloude.jcloude.pagetype.site.site import Site
+from jcloude.jcloude.pagetype.site_update.site_update import benches_with_available_update
 from jcloude.utils import log_error
 
 
@@ -43,7 +43,7 @@ def trigger():
 	for site in trigger_for_sites:
 		auto_update_log = jingrow.get_pg(
 			{
-				"doctype": "Scheduled Auto Update Log",
+				"pagetype": "Scheduled Auto Update Log",
 				"document_type": "Site",
 				"document_name": site.name,
 				"status": "Success",
diff --git a/press/press/doctype/site_update/site_update.json b/press/press/doctype/site_update/site_update.json
index 06748865..baf14965 100644
--- a/press/press/doctype/site_update/site_update.json
+++ b/press/press/doctype/site_update/site_update.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2022-01-28 20:07:33.955528",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_update/site_update.py b/press/press/doctype/site_update/site_update.py
index 86059b1c..d6c62102 100644
--- a/press/press/doctype/site_update/site_update.py
+++ b/press/press/doctype/site_update/site_update.py
@@ -20,23 +20,23 @@ from jingrow.utils.data import cint
 from jcloude.agent import Agent
 from jcloude.api.client import dashboard_whitelist
 from jcloude.exceptions import SiteAlreadyArchived, SiteUnderMaintenance
-from jcloude.jcloude.doctype.logical_replication_backup.logical_replication_backup import (
+from jcloude.jcloude.pagetype.logical_replication_backup.logical_replication_backup import (
 	get_logical_replication_backup_restoration_steps,
 )
-from jcloude.jcloude.doctype.physical_backup_restoration.physical_backup_restoration import (
+from jcloude.jcloude.pagetype.physical_backup_restoration.physical_backup_restoration import (
 	get_physical_backup_restoration_steps,
 )
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.logical_replication_backup.logical_replication_backup import (
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.logical_replication_backup.logical_replication_backup import (
 		LogicalReplicationBackup,
 	)
-	from jcloude.jcloude.doctype.physical_backup_restoration.physical_backup_restoration import (
+	from jcloude.jcloude.pagetype.physical_backup_restoration.physical_backup_restoration import (
 		PhysicalBackupRestoration,
 	)
-	from jcloude.jcloude.doctype.site.site import Site
+	from jcloude.jcloude.pagetype.site.site import Site
 
 
 class SiteUpdate(Document):
@@ -380,7 +380,7 @@ class SiteUpdate(Document):
 
 	def create_logical_replication_backup_record(self):
 		record: LogicalReplicationBackup = jingrow.get_pg(
-			{"doctype": "Logical Replication Backup", "site": self.site, "execution_stage": "Pre-Migrate"}
+			{"pagetype": "Logical Replication Backup", "site": self.site, "execution_stage": "Pre-Migrate"}
 		).insert(ignore_permissions=True)
 		jingrow.db.set_value("Site Update", self.name, "logical_replication_backup", record.name)
 		record.execute()
@@ -438,7 +438,7 @@ class SiteUpdate(Document):
 	def activate_site(self, backup_failed=False):
 		agent = Agent(self.server)
 		job = agent.activate_site(
-			jingrow.get_pg("Site", self.site), reference_doctype="Site Update", reference_name=self.name
+			jingrow.get_pg("Site", self.site), reference_pagetype="Site Update", reference_name=self.name
 		)
 		jingrow.db.set_value("Site Update", self.name, "activate_site_job", job.name)
 		if backup_failed:
@@ -447,7 +447,7 @@ class SiteUpdate(Document):
 	def deactivate_site(self):
 		agent = Agent(self.server)
 		job = agent.deactivate_site(
-			jingrow.get_pg("Site", self.site), reference_doctype="Site Update", reference_name=self.name
+			jingrow.get_pg("Site", self.site), reference_pagetype="Site Update", reference_name=self.name
 		)
 		jingrow.db.set_value("Site Update", self.name, {"deactivate_site_job": job.name, "status": "Running"})
 
@@ -537,7 +537,7 @@ class SiteUpdate(Document):
 				# Perform Physical Backup Restoration if not already done
 				pg: PhysicalBackupRestoration = jingrow.get_pg(
 					{
-						"doctype": "Physical Backup Restoration",
+						"pagetype": "Physical Backup Restoration",
 						"site": self.site,
 						"status": "Pending",
 						"site_backup": self.site_backup,
@@ -549,7 +549,7 @@ class SiteUpdate(Document):
 					}
 				)
 				pg.insert(ignore_permissions=True)
-				jingrow.db.set_value(self.doctype, self.name, "physical_backup_restoration", pg.name)
+				jingrow.db.set_value(self.pagetype, self.name, "physical_backup_restoration", pg.name)
 				pg.execute()
 				# After physical backup restoration, that will trigger recovery job again
 				# via site_update.process_physical_backup_restoration_status_update(...) method
@@ -837,7 +837,7 @@ def schedule_updates():
 	servers = jingrow.get_all("Server", {"status": "Active"}, pluck="name")
 	for server in servers:
 		jingrow.enqueue(
-			"jcloude.jcloude.doctype.site_update.site_update.schedule_updates_server",
+			"jcloude.jcloude.pagetype.site_update.site_update.schedule_updates_server",
 			server=server,
 			job_id=f"schedule_updates:{server}",
 			deduplicate=True,
@@ -967,11 +967,11 @@ def process_physical_backup_restoration_status_update(name: str):
 
 
 def process_activate_site_job_update(job: AgentJob):
-	if job.reference_doctype != "Site Update" or not job.reference_name:
+	if job.reference_pagetype != "Site Update" or not job.reference_name:
 		return
 	if job.status == "Success":
 		# If `Site Update` successful, then mark site as `Active`
-		if jingrow.db.get_value(job.reference_doctype, job.reference_name, "status") == "Success":
+		if jingrow.db.get_value(job.reference_pagetype, job.reference_name, "status") == "Success":
 			jingrow.get_pg("Site", job.site).reset_previous_status(fix_broken=True)
 		else:
 			# Set status to `status_before_update`
@@ -983,7 +983,7 @@ def process_activate_site_job_update(job: AgentJob):
 
 
 def process_deactivate_site_job_update(job):
-	if job.reference_doctype != "Site Update":
+	if job.reference_pagetype != "Site Update":
 		return
 	if job.status == "Success":
 		# proceed to backup stage
@@ -1169,7 +1169,7 @@ def run_scheduled_updates():
 			jingrow.db.rollback()
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	jingrow.db.add_index("Site Update", ["site", "source_candidate", "destination_candidate"])
 	jingrow.db.add_index("Site Update", ["server", "status"])
 
diff --git a/press/press/doctype/site_update/test_site_update.py b/press/press/doctype/site_update/test_site_update.py
index 0850cc99..97f56d8d 100644
--- a/press/press/doctype/site_update/test_site_update.py
+++ b/press/press/doctype/site_update/test_site_update.py
@@ -8,27 +8,27 @@ from unittest.mock import MagicMock, Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob, poll_pending_jobs
-from jcloude.jcloude.doctype.agent_job.test_agent_job import fake_agent_job
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.app_release.test_app_release import create_test_app_release
-from jcloude.jcloude.doctype.app_source.test_app_source import create_test_app_source
-from jcloude.jcloude.doctype.deploy_candidate_difference.test_deploy_candidate_difference import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob, poll_pending_jobs
+from jcloude.jcloude.pagetype.agent_job.test_agent_job import fake_agent_job
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.app_release.test_app_release import create_test_app_release
+from jcloude.jcloude.pagetype.app_source.test_app_source import create_test_app_source
+from jcloude.jcloude.pagetype.deploy_candidate_difference.test_deploy_candidate_difference import (
 	create_test_deploy_candidate_differences,
 )
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.site.test_site import create_test_bench, create_test_site
-from jcloude.jcloude.doctype.site_plan.test_site_plan import create_test_plan
-from jcloude.jcloude.doctype.site_update.site_update import SiteUpdate
-from jcloude.jcloude.doctype.subscription.test_subscription import create_test_subscription
+from jcloude.jcloude.pagetype.site.test_site import create_test_bench, create_test_site
+from jcloude.jcloude.pagetype.site_plan.test_site_plan import create_test_plan
+from jcloude.jcloude.pagetype.site_update.site_update import SiteUpdate
+from jcloude.jcloude.pagetype.subscription.test_subscription import create_test_subscription
 
 
 @patch.object(SiteUpdate, "start", new=Mock())
 def create_test_site_update(site: str, destination_group: str, status: str):
 	return jingrow.get_pg(
-		dict(doctype="Site Update", site=site, destination_group=destination_group, status=status)
+		dict(pagetype="Site Update", site=site, destination_group=destination_group, status=status)
 	).insert(ignore_if_duplicate=True)
 
 
@@ -108,7 +108,7 @@ class TestSiteUpdate(FrappeTestCase):
 			site.schedule_update,
 		)
 
-	@patch("jcloude.jcloude.doctype.server.server.jingrow.db.commit", new=MagicMock)
+	@patch("jcloude.jcloude.pagetype.server.server.jingrow.db.commit", new=MagicMock)
 	def test_site_update_callback_reallocates_workers_after_disable_maintenance_mode_job(
 		self,
 	):
@@ -123,7 +123,7 @@ class TestSiteUpdate(FrappeTestCase):
 		create_test_deploy_candidate_differences(bench2.candidate)  # for site update to be available
 
 		site = create_test_site(bench=bench1.name)
-		plan = create_test_plan(site.doctype, cpu_time=8)
+		plan = create_test_plan(site.pagetype, cpu_time=8)
 		create_test_subscription(site.name, plan.name, site.team)
 		site.reload()
 
diff --git a/press/press/doctype/site_usage/site_usage.json b/press/press/doctype/site_usage/site_usage.json
index c884503d..2c74389c 100644
--- a/press/press/doctype/site_usage/site_usage.json
+++ b/press/press/doctype/site_usage/site_usage.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-08-18 13:35:32.151920",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/site_usage/site_usage.py b/press/press/doctype/site_usage/site_usage.py
index 1e8c5baf..02fd6905 100644
--- a/press/press/doctype/site_usage/site_usage.py
+++ b/press/press/doctype/site_usage/site_usage.py
@@ -29,5 +29,5 @@ class SiteUsage(Document):
 
 	@staticmethod
 	def clear_old_logs(days=60):
-		table = jingrow.qb.DocType("Site Usage")
+		table = jingrow.qb.PageType("Site Usage")
 		jingrow.db.delete(table, filters=(table.creation < (Now() - Interval(days=days))))
diff --git a/press/press/doctype/site_user/site_user.json b/press/press/doctype/site_user/site_user.json
index 77ba888f..dd73a42b 100644
--- a/press/press/doctype/site_user/site_user.json
+++ b/press/press/doctype/site_user/site_user.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-01-16 15:02:28.939437",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "user",
diff --git a/press/press/doctype/site_user/site_user.py b/press/press/doctype/site_user/site_user.py
index 2540e581..4e9cd678 100644
--- a/press/press/doctype/site_user/site_user.py
+++ b/press/press/doctype/site_user/site_user.py
@@ -42,6 +42,6 @@ def create_user_for_product_site(site, data):
 				jingrow.db.set_value("Site User", user.name, "enabled", enabled)
 		else:
 			user = jingrow.get_pg(
-				{"doctype": "Site User", "site": site, "user": user_mail, "enabled": enabled}
+				{"pagetype": "Site User", "site": site, "user": user_mail, "enabled": enabled}
 			)
 			user.insert(ignore_permissions=True)
diff --git a/press/press/doctype/site_user_session/site_user_session.json b/press/press/doctype/site_user_session/site_user_session.json
index eedf6037..9f5a202e 100644
--- a/press/press/doctype/site_user_session/site_user_session.json
+++ b/press/press/doctype/site_user_session/site_user_session.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-01-26 21:54:39.279966",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "user",
diff --git a/press/press/doctype/sql_playground_log/sql_playground_log.json b/press/press/doctype/sql_playground_log/sql_playground_log.json
index b923b751..dee8ad09 100644
--- a/press/press/doctype/sql_playground_log/sql_playground_log.json
+++ b/press/press/doctype/sql_playground_log/sql_playground_log.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-10-16 16:18:15.770106",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "site",
diff --git a/press/press/doctype/sql_playground_log/sql_playground_log.py b/press/press/doctype/sql_playground_log/sql_playground_log.py
index e89882af..e579dfec 100644
--- a/press/press/doctype/sql_playground_log/sql_playground_log.py
+++ b/press/press/doctype/sql_playground_log/sql_playground_log.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from jingrow.model.document import Document
 
-from jcloude.overrides import get_permission_query_conditions_for_doctype
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
 
 
 class SQLPlaygroundLog(Document):
@@ -30,4 +30,4 @@ class SQLPlaygroundLog(Document):
 	)
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("SQL Playground Log")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("SQL Playground Log")
diff --git a/press/press/doctype/ssh_certificate/ssh_certificate.json b/press/press/doctype/ssh_certificate/ssh_certificate.json
index f9ebc3ca..0f4bd656 100644
--- a/press/press/doctype/ssh_certificate/ssh_certificate.json
+++ b/press/press/doctype/ssh_certificate/ssh_certificate.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "CERT-.########",
  "creation": "2022-01-28 20:07:35.389554",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/ssh_certificate/ssh_certificate.py b/press/press/doctype/ssh_certificate/ssh_certificate.py
index f1cbfc58..cb336731 100644
--- a/press/press/doctype/ssh_certificate/ssh_certificate.py
+++ b/press/press/doctype/ssh_certificate/ssh_certificate.py
@@ -16,7 +16,7 @@ from jingrow.model.document import Document
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.ssh_certificate_authority.ssh_certificate_authority import (
+	from jcloude.jcloude.pagetype.ssh_certificate_authority.ssh_certificate_authority import (
 		SSHCertificateAuthority,
 	)
 
diff --git a/press/press/doctype/ssh_certificate/test_ssh_certificate.py b/press/press/doctype/ssh_certificate/test_ssh_certificate.py
index 0e28ce23..733b5633 100644
--- a/press/press/doctype/ssh_certificate/test_ssh_certificate.py
+++ b/press/press/doctype/ssh_certificate/test_ssh_certificate.py
@@ -6,11 +6,11 @@ from unittest.mock import Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.site.test_site import create_test_bench
-from jcloude.jcloude.doctype.ssh_certificate.ssh_certificate import SSHCertificate
-from jcloude.jcloude.doctype.team.test_team import create_test_jcloude_admin_team
-from jcloude.jcloude.doctype.user_ssh_key.test_user_ssh_key import create_test_user_ssh_key
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.site.test_site import create_test_bench
+from jcloude.jcloude.pagetype.ssh_certificate.ssh_certificate import SSHCertificate
+from jcloude.jcloude.pagetype.team.test_team import create_test_jcloude_admin_team
+from jcloude.jcloude.pagetype.user_ssh_key.test_user_ssh_key import create_test_user_ssh_key
 
 
 @patch.object(SSHCertificate, "validate_certificate_authority", new=Mock())
@@ -35,7 +35,7 @@ class TestSSHCertificate(FrappeTestCase):
 		user_ssh_key = create_test_user_ssh_key(user=self.user)
 		return jingrow.get_pg(
 			{
-				"doctype": "SSH Certificate",
+				"pagetype": "SSH Certificate",
 				"certificate_type": "User",
 				"group": group,
 				"user": jingrow.session.user,
diff --git a/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.json b/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.json
index 60021569..edbb0e1e 100644
--- a/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.json
+++ b/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "Prompt",
  "creation": "2022-01-12 12:54:04.864137",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.py b/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.py
index b194ae1b..aebf2bf2 100644
--- a/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.py
+++ b/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.py
@@ -104,7 +104,7 @@ class SSHCertificateAuthority(Document):
 
 	@jingrow.whitelist()
 	def build_image(self):
-		jingrow.enqueue_pg(self.doctype, self.name, "_build_image", timeout=2400)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_build_image", timeout=2400)
 
 	def _build_image(self):
 		self._prepare_build_directory()
diff --git a/press/press/doctype/ssh_key/ssh_key.json b/press/press/doctype/ssh_key/ssh_key.json
index 72ce1f87..89fd7d4b 100644
--- a/press/press/doctype/ssh_key/ssh_key.json
+++ b/press/press/doctype/ssh_key/ssh_key.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "Prompt",
  "creation": "2021-09-08 12:43:09.290608",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/ssh_key/test_ssh_key.py b/press/press/doctype/ssh_key/test_ssh_key.py
index ab8b0567..0787ad93 100644
--- a/press/press/doctype/ssh_key/test_ssh_key.py
+++ b/press/press/doctype/ssh_key/test_ssh_key.py
@@ -4,13 +4,13 @@
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.ssh_key.ssh_key import SSHKey
+from jcloude.jcloude.pagetype.ssh_key.ssh_key import SSHKey
 
 
 def create_test_ssh_key() -> SSHKey:
 	return jingrow.get_pg(
 		{
-			"doctype": "SSH Key",
+			"pagetype": "SSH Key",
 			"name": "Test SSH Key",
 			"public_key": "ssh-rsa AAAAB3",
 		}
diff --git a/press/press/doctype/storage_integration_bucket/storage_integration_bucket.json b/press/press/doctype/storage_integration_bucket/storage_integration_bucket.json
index 96c2412c..35a33cc5 100644
--- a/press/press/doctype/storage_integration_bucket/storage_integration_bucket.json
+++ b/press/press/doctype/storage_integration_bucket/storage_integration_bucket.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "field:minio_server_on",
  "creation": "2022-02-14 21:03:35.091019",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/storage_integration_subscription/storage_integration_subscription.js b/press/press/doctype/storage_integration_subscription/storage_integration_subscription.js
index 7dda4d5d..a6bbba39 100644
--- a/press/press/doctype/storage_integration_subscription/storage_integration_subscription.js
+++ b/press/press/doctype/storage_integration_subscription/storage_integration_subscription.js
@@ -8,7 +8,7 @@ jingrow.ui.form.on('Storage Integration Subscription', {
 	enabled(frm, cdt, cdn) {
 		jingrow.call({
 			method:
-				'jcloude.jcloude.doctype.storage_integration_subscription.storage_integration_subscription.toggle_user_status',
+				'jcloude.jcloude.pagetype.storage_integration_subscription.storage_integration_subscription.toggle_user_status',
 			args: {
 				docname: frm.docname,
 				status: frm.fields_dict.enabled.value,
diff --git a/press/press/doctype/storage_integration_subscription/storage_integration_subscription.json b/press/press/doctype/storage_integration_subscription/storage_integration_subscription.json
index cb9980cd..a9b16447 100644
--- a/press/press/doctype/storage_integration_subscription/storage_integration_subscription.json
+++ b/press/press/doctype/storage_integration_subscription/storage_integration_subscription.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-03-06 20:52:37.142455",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/storage_integration_subscription/storage_integration_subscription.py b/press/press/doctype/storage_integration_subscription/storage_integration_subscription.py
index 079595c2..293d62ba 100644
--- a/press/press/doctype/storage_integration_subscription/storage_integration_subscription.py
+++ b/press/press/doctype/storage_integration_subscription/storage_integration_subscription.py
@@ -117,16 +117,16 @@ def create_after_insert(pg, method):
 		return
 
 	if pg.app == "storage_integration":
-		sub_exists = jingrow.db.exists({"doctype": "Storage Integration Subscription", "site": pg.site})
+		sub_exists = jingrow.db.exists({"pagetype": "Storage Integration Subscription", "site": pg.site})
 		if sub_exists:
 			return
 
-		jingrow.get_pg({"doctype": "Storage Integration Subscription", "site": pg.site}).insert(
+		jingrow.get_pg({"pagetype": "Storage Integration Subscription", "site": pg.site}).insert(
 			ignore_permissions=True
 		)
 
 	if pg.app == "email_delivery_service":
-		# TODO: add a separate doctype to track email service setup completion
+		# TODO: add a separate pagetype to track email service setup completion
 		from jcloude.api.email import setup
 
 		setup(pg.site)
diff --git a/press/press/doctype/stripe_micro_charge_record/stripe_micro_charge_record.json b/press/press/doctype/stripe_micro_charge_record/stripe_micro_charge_record.json
index 6497fd73..0560a054 100644
--- a/press/press/doctype/stripe_micro_charge_record/stripe_micro_charge_record.json
+++ b/press/press/doctype/stripe_micro_charge_record/stripe_micro_charge_record.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-10-14 19:22:39.833212",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/stripe_payment_event/stripe_payment_event.json b/press/press/doctype/stripe_payment_event/stripe_payment_event.json
index b8ce7be6..954fcae8 100644
--- a/press/press/doctype/stripe_payment_event/stripe_payment_event.json
+++ b/press/press/doctype/stripe_payment_event/stripe_payment_event.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2021-10-31 12:05:38.633463",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/stripe_payment_method/stripe_payment_method.js b/press/press/doctype/stripe_payment_method/stripe_payment_method.js
index 44c5332f..b60a5f44 100644
--- a/press/press/doctype/stripe_payment_method/stripe_payment_method.js
+++ b/press/press/doctype/stripe_payment_method/stripe_payment_method.js
@@ -6,7 +6,7 @@ jingrow.ui.form.on('Stripe Payment Method', {
 		jingrow.dynamic_link = {
 			pg: frm.pg,
 			fieldname: 'name',
-			doctype: 'Stripe Payment Method',
+			pagetype: 'Stripe Payment Method',
 		};
 		jingrow.contacts.render_address_and_contact(frm);
 
diff --git a/press/press/doctype/stripe_payment_method/stripe_payment_method.json b/press/press/doctype/stripe_payment_method/stripe_payment_method.json
index 46765e6a..d91699fc 100644
--- a/press/press/doctype/stripe_payment_method/stripe_payment_method.json
+++ b/press/press/doctype/stripe_payment_method/stripe_payment_method.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "format:PM{#####}",
  "creation": "2020-04-10 12:24:49.998168",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/stripe_payment_method/stripe_payment_method.py b/press/press/doctype/stripe_payment_method/stripe_payment_method.py
index 80af9c15..69c24f2c 100644
--- a/press/press/doctype/stripe_payment_method/stripe_payment_method.py
+++ b/press/press/doctype/stripe_payment_method/stripe_payment_method.py
@@ -8,7 +8,7 @@ from jingrow.model.document import Document
 
 from jcloude.api.billing import get_stripe
 from jcloude.api.client import dashboard_whitelist
-from jcloude.overrides import get_permission_query_conditions_for_doctype
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
 from jcloude.utils import log_error
 from jcloude.utils.telemetry import capture
 
@@ -52,8 +52,8 @@ class StripePaymentMethod(Document):
 
 	@staticmethod
 	def get_list_query(query, filters=None, **list_args):
-		StripeWebhookLog = jingrow.qb.DocType("Stripe Webhook Log")
-		StripePaymentMethod = jingrow.qb.DocType("Stripe Payment Method")
+		StripeWebhookLog = jingrow.qb.PageType("Stripe Webhook Log")
+		StripePaymentMethod = jingrow.qb.PageType("Stripe Payment Method")
 
 		query = (
 			query.select(StripeWebhookLog.stripe_payment_method)
@@ -120,7 +120,7 @@ class StripePaymentMethod(Document):
 	def remove_address_links(self):
 		address_links = jingrow.db.get_all(
 			"Dynamic Link",
-			{"link_doctype": "Stripe Payment Method", "link_name": self.name},
+			{"link_pagetype": "Stripe Payment Method", "link_name": self.name},
 			pluck="parent",
 		)
 		address_links = list(set(address_links))
@@ -129,7 +129,7 @@ class StripePaymentMethod(Document):
 			pg = jingrow.get_pg("Address", address)
 			for link in pg.links:
 				print(link)
-				if link.link_doctype == "Stripe Payment Method" and link.link_name == self.name:
+				if link.link_pagetype == "Stripe Payment Method" and link.link_name == self.name:
 					found = True
 					pg.remove(link)
 			if found:
@@ -161,8 +161,8 @@ class StripePaymentMethod(Document):
 		return mandate.status
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Stripe Payment Method")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Stripe Payment Method")
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	jingrow.db.add_index("Stripe Payment Method", ["team", "is_verified_with_micro_charge"])
diff --git a/press/press/doctype/stripe_webhook_log/stripe_webhook_log.json b/press/press/doctype/stripe_webhook_log/stripe_webhook_log.json
index 1dab7ab4..28601f07 100644
--- a/press/press/doctype/stripe_webhook_log/stripe_webhook_log.json
+++ b/press/press/doctype/stripe_webhook_log/stripe_webhook_log.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "Prompt",
  "creation": "2020-03-30 15:42:28.497505",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/stripe_webhook_log/stripe_webhook_log.py b/press/press/doctype/stripe_webhook_log/stripe_webhook_log.py
index a20683e4..8cebe6a1 100644
--- a/press/press/doctype/stripe_webhook_log/stripe_webhook_log.py
+++ b/press/press/doctype/stripe_webhook_log/stripe_webhook_log.py
@@ -99,7 +99,7 @@ def stripe_webhook_handler():
 		# set user to Administrator, to not have to do ignore_permissions everywhere
 		jingrow.set_user("Administrator")
 		jingrow.get_pg(
-			doctype="Stripe Webhook Log",
+			pagetype="Stripe Webhook Log",
 			payload=jingrow.as_json(event),
 		).insert()
 	except Exception:
diff --git a/press/press/doctype/subscription/subscription.json b/press/press/doctype/subscription/subscription.json
index 10dbfbe2..4ca8996a 100644
--- a/press/press/doctype/subscription/subscription.json
+++ b/press/press/doctype/subscription/subscription.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "hash",
  "creation": "2020-10-19 19:01:35.606131",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -33,7 +33,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Document Type",
-   "options": "DocType",
+   "options": "PageType",
    "reqd": 1
   },
   {
@@ -77,7 +77,7 @@
    "fieldname": "plan_type",
    "fieldtype": "Link",
    "label": "Plan Type",
-   "options": "DocType",
+   "options": "PageType",
    "reqd": 1,
    "search_index": 1
   },
@@ -104,7 +104,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Usage Record",
+   "link_pagetype": "Usage Record",
    "link_fieldname": "subscription"
   }
  ],
diff --git a/press/press/doctype/subscription/subscription.py b/press/press/doctype/subscription/subscription.py
index 999e0a96..56f43b62 100644
--- a/press/press/doctype/subscription/subscription.py
+++ b/press/press/doctype/subscription/subscription.py
@@ -11,8 +11,8 @@ from jingrow.model.document import Document
 from jingrow.query_builder.functions import Coalesce, Count
 from jingrow.utils import cint, flt
 
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.site_plan.site_plan import SitePlan
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.site_plan.site_plan import SitePlan
 from jcloude.utils import log_error
 from jcloude.utils.jobs import has_job_timeout_exceeded
 
@@ -52,9 +52,9 @@ class Subscription(Document):
 
 	@staticmethod
 	def get_list_query(query, **list_args):
-		Subscription = jingrow.qb.DocType("Subscription")
-		UsageRecord = jingrow.qb.DocType("Usage Record")
-		Plan = jingrow.qb.DocType("Marketplace App Plan")
+		Subscription = jingrow.qb.PageType("Subscription")
+		UsageRecord = jingrow.qb.PageType("Usage Record")
+		Plan = jingrow.qb.PageType("Marketplace App Plan")
 		price_field = Plan.price_inr if jingrow.local.team().currency == "INR" else Plan.price_usd
 		filters = list_args.get("filters", {})
 
@@ -92,7 +92,7 @@ class Subscription(Document):
 			self.secret_key = jingrow.utils.generate_hash(length=40)
 			if not jingrow.db.exists("Site Config Key", {"key": f"sk_{self.document_name}"}):
 				jingrow.get_pg(
-					doctype="Site Config Key", internal=True, key=f"sk_{self.document_name}"
+					pagetype="Site Config Key", internal=True, key=f"sk_{self.document_name}"
 				).insert(ignore_permissions=True)
 
 	def validate(self):
@@ -190,7 +190,7 @@ class Subscription(Document):
 				return None  # If the server is a secondary application server don't create a usage record
 
 		usage_record = jingrow.get_pg(
-			doctype="Usage Record",
+			pagetype="Usage Record",
 			team=team.name,
 			document_type=self.document_type,
 			document_name=self.document_name,
@@ -341,21 +341,21 @@ def paid_plans():
 	]
 
 	for name in doctypes:
-		doctype = jingrow.qb.DocType(name)
+		pagetype = jingrow.qb.PageType(name)
 		if name in ("Server Plan", "Site Plan"):
 			paid_plans += (
-				jingrow.qb.from_(doctype)
-				.select(doctype.name)
-				.where(doctype.price_inr > 0)
-				.where((doctype.enabled == 1) | (doctype.legacy_plan == 1))
+				jingrow.qb.from_(pagetype)
+				.select(pagetype.name)
+				.where(pagetype.price_inr > 0)
+				.where((pagetype.enabled == 1) | (pagetype.legacy_plan == 1))
 				.run(pluck=True)
 			)
 		else:
 			paid_plans += (
-				jingrow.qb.from_(doctype)
-				.select(doctype.name)
-				.where(doctype.price_inr > 0)
-				.where(doctype.enabled == 1)
+				jingrow.qb.from_(pagetype)
+				.select(pagetype.name)
+				.where(pagetype.price_inr > 0)
+				.where(pagetype.enabled == 1)
 				.run(pluck=True)
 			)
 
@@ -409,4 +409,4 @@ def created_usage_records(free_sites, date=None):
 	)
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Subscription")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Subscription")
diff --git a/press/press/doctype/subscription/test_subscription.py b/press/press/doctype/subscription/test_subscription.py
index 41b38e4b..d37f481f 100644
--- a/press/press/doctype/subscription/test_subscription.py
+++ b/press/press/doctype/subscription/test_subscription.py
@@ -7,9 +7,9 @@ from unittest.mock import patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.subscription.subscription import sites_with_free_hosting
-from jcloude.jcloude.doctype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.subscription.subscription import sites_with_free_hosting
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
 
 
 def create_test_subscription(
@@ -21,7 +21,7 @@ def create_test_subscription(
 ):
 	subscription = jingrow.get_pg(
 		{
-			"doctype": "Subscription",
+			"pagetype": "Subscription",
 			"document_type": document_type,
 			"document_name": document_name,
 			"team": team,
@@ -49,9 +49,9 @@ class TestSubscription(FrappeTestCase):
 		jingrow.db.rollback()
 
 	def test_subscription_daily(self):
-		todo = jingrow.get_pg(doctype="ToDo", description="Test todo").insert()
+		todo = jingrow.get_pg(pagetype="ToDo", description="Test todo").insert()
 		plan = jingrow.get_pg(
-			doctype="Site Plan",
+			pagetype="Site Plan",
 			name="Plan-10",
 			document_type="ToDo",
 			interval="Daily",
@@ -60,7 +60,7 @@ class TestSubscription(FrappeTestCase):
 		).insert()
 
 		subscription = jingrow.get_pg(
-			doctype="Subscription",
+			pagetype="Subscription",
 			team=self.team.name,
 			document_type="ToDo",
 			document_name=todo.name,
@@ -95,9 +95,9 @@ class TestSubscription(FrappeTestCase):
 		self.assertEqual(invoice.total, desired_value)
 
 	def test_subscription_for_non_chargeable_document(self):
-		todo = jingrow.get_pg(doctype="ToDo", description="Test todo").insert()
+		todo = jingrow.get_pg(pagetype="ToDo", description="Test todo").insert()
 		plan = jingrow.get_pg(
-			doctype="Site Plan",
+			pagetype="Site Plan",
 			name="Plan-10",
 			document_type="ToDo",
 			interval="Daily",
@@ -106,7 +106,7 @@ class TestSubscription(FrappeTestCase):
 		).insert()
 
 		subscription = jingrow.get_pg(
-			doctype="Subscription",
+			pagetype="Subscription",
 			team=self.team.name,
 			document_type="ToDo",
 			document_name=todo.name,
@@ -134,7 +134,7 @@ class TestSubscription(FrappeTestCase):
 		site.save()
 
 		plan = jingrow.get_pg(
-			doctype="Site Plan",
+			pagetype="Site Plan",
 			name="Plan-10",
 			document_type="Site",
 			interval="Daily",
@@ -144,7 +144,7 @@ class TestSubscription(FrappeTestCase):
 		).insert()
 
 		subscription = jingrow.get_pg(
-			doctype="Subscription",
+			pagetype="Subscription",
 			team=self.team.name,
 			document_type="Site",
 			document_name=site.name,
diff --git a/press/press/doctype/support_access/support_access.json b/press/press/doctype/support_access/support_access.json
index 40f91ee2..ea069c24 100644
--- a/press/press/doctype/support_access/support_access.json
+++ b/press/press/doctype/support_access/support_access.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "hash",
  "creation": "2025-09-25 15:21:55.641624",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "access_expired",
diff --git a/press/press/doctype/support_access/support_access.py b/press/press/doctype/support_access/support_access.py
index 34b29a09..ae7da8cc 100644
--- a/press/press/doctype/support_access/support_access.py
+++ b/press/press/doctype/support_access/support_access.py
@@ -20,7 +20,7 @@ class SupportAccess(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.support_access_resource.support_access_resource import SupportAccessResource
+		from jcloude.jcloude.pagetype.support_access_resource.support_access_resource import SupportAccessResource
 
 		access_allowed_till: DF.Datetime | None
 		allowed_for: DF.Literal["3", "6", "12", "24", "72"]
@@ -54,8 +54,8 @@ class SupportAccess(Document):
 	def get_list_query(query, filters: dict | None, **args):
 		filters = filters or {}
 		team = get_current_team()
-		Access = jingrow.qb.DocType("Support Access")
-		AccessResource = jingrow.qb.DocType("Support Access Resource")
+		Access = jingrow.qb.PageType("Support Access")
+		AccessResource = jingrow.qb.PageType("Support Access Resource")
 		query = (
 			query.join(AccessResource, JoinType.left)
 			.on(AccessResource.parent == Access.name)
@@ -239,7 +239,7 @@ class SupportAccess(Document):
 
 		jingrow.get_pg(
 			{
-				"doctype": "Jcloude Notification",
+				"pagetype": "Jcloude Notification",
 				"team": self.requested_team,
 				"type": "Support Access",
 				"document_type": "Support Access",
@@ -251,7 +251,7 @@ class SupportAccess(Document):
 
 		jingrow.publish_realtime(
 			"jcloude_notification",
-			doctype="Jcloude Notification",
+			pagetype="Jcloude Notification",
 			message={
 				"team": self.requested_team,
 			},
@@ -275,7 +275,7 @@ class SupportAccess(Document):
 
 		jingrow.get_pg(
 			{
-				"doctype": "Jcloude Notification",
+				"pagetype": "Jcloude Notification",
 				"team": self.target_team,
 				"type": "Support Access",
 				"document_type": "Support Access",
@@ -287,7 +287,7 @@ class SupportAccess(Document):
 
 		jingrow.publish_realtime(
 			"jcloude_notification",
-			doctype="Jcloude Notification",
+			pagetype="Jcloude Notification",
 			message={
 				"team": self.target_team,
 			},
diff --git a/press/press/doctype/support_access/test_support_access.py b/press/press/doctype/support_access/test_support_access.py
index f185f539..67869f91 100644
--- a/press/press/doctype/support_access/test_support_access.py
+++ b/press/press/doctype/support_access/test_support_access.py
@@ -7,9 +7,9 @@ import jingrow
 from jingrow.tests import IntegrationTestCase, UnitTestCase
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.support_access.support_access import SupportAccess
+	from jcloude.jcloude.pagetype.support_access.support_access import SupportAccess
 
-# On IntegrationTestCase, the doctype test records and all
+# On IntegrationTestCase, the pagetype test records and all
 # link-field test record dependencies are recursively loaded
 # Use these module variables to add/remove to/from that list
 EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
diff --git a/press/press/doctype/support_access_resource/support_access_resource.json b/press/press/doctype/support_access_resource/support_access_resource.json
index 5e6a52af..93fcfb81 100644
--- a/press/press/doctype/support_access_resource/support_access_resource.json
+++ b/press/press/doctype/support_access_resource/support_access_resource.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-10-07 16:52:18.845514",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -15,7 +15,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Document Type",
-   "options": "DocType"
+   "options": "PageType"
   },
   {
    "fieldname": "document_name",
diff --git a/press/press/doctype/team/patches/set_partner_email.py b/press/press/doctype/team/patches/set_partner_email.py
index 0823f734..fa02ff42 100644
--- a/press/press/doctype/team/patches/set_partner_email.py
+++ b/press/press/doctype/team/patches/set_partner_email.py
@@ -2,8 +2,8 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "team")
-	jingrow.reload_pg("jcloude", "doctype", "invoice")
+	jingrow.reload_pg("jcloude", "pagetype", "team")
+	jingrow.reload_pg("jcloude", "pagetype", "invoice")
 
 	partners = jingrow.db.get_all("Team", filters={"erpnext_partner": True})
 
diff --git a/press/press/doctype/team/patches/set_payment_mode.py b/press/press/doctype/team/patches/set_payment_mode.py
index bfd07211..4895aa57 100644
--- a/press/press/doctype/team/patches/set_payment_mode.py
+++ b/press/press/doctype/team/patches/set_payment_mode.py
@@ -6,7 +6,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("Team")
+	jingrow.reload_pagetype("Team")
 	jingrow.db.sql(
 		"""
 		UPDATE tabTeam
diff --git a/press/press/doctype/team/patches/set_referrer_id.py b/press/press/doctype/team/patches/set_referrer_id.py
index baad3121..21c7dabd 100644
--- a/press/press/doctype/team/patches/set_referrer_id.py
+++ b/press/press/doctype/team/patches/set_referrer_id.py
@@ -3,7 +3,7 @@ from jingrow.utils import update_progress_bar
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "team")
+	jingrow.reload_pg("jcloude", "pagetype", "team")
 
 	teams = jingrow.db.get_all(
 		"Team", filters={"referrer_id": ("is", "not set")}, pluck="name"
diff --git a/press/press/doctype/team/patches/set_team_title.py b/press/press/doctype/team/patches/set_team_title.py
index 77027f53..91d93af5 100644
--- a/press/press/doctype/team/patches/set_team_title.py
+++ b/press/press/doctype/team/patches/set_team_title.py
@@ -5,7 +5,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("Team")
+	jingrow.reload_pagetype("Team")
 	jingrow.db.sql(
 		"""
 		UPDATE `tabTeam`
diff --git a/press/press/doctype/team/suspend_sites.py b/press/press/doctype/team/suspend_sites.py
index f4a3674e..0bc3cccf 100644
--- a/press/press/doctype/team/suspend_sites.py
+++ b/press/press/doctype/team/suspend_sites.py
@@ -68,7 +68,7 @@ def get_teams_with_unpaid_invoices():
 	# last day of previous month
 	last_day = get_last_day(jingrow.utils.add_months(today, -1))
 
-	plan = jingrow.qb.DocType("Site Plan")
+	plan = jingrow.qb.PageType("Site Plan")
 	query = (
 		jingrow.qb.from_(plan)
 		.select(plan.name)
@@ -76,9 +76,9 @@ def get_teams_with_unpaid_invoices():
 	).run(as_dict=True)
 	ignorable_plans = [d.name for d in query]
 
-	invoice = jingrow.qb.DocType("Invoice")
-	team = jingrow.qb.DocType("Team")
-	site = jingrow.qb.DocType("Site")
+	invoice = jingrow.qb.PageType("Invoice")
+	team = jingrow.qb.PageType("Team")
+	site = jingrow.qb.PageType("Site")
 
 	query = (
 		jingrow.qb.from_(invoice)
diff --git a/press/press/doctype/team/team.js b/press/press/doctype/team/team.js
index 93d2aee9..0f5eb4dd 100644
--- a/press/press/doctype/team/team.js
+++ b/press/press/doctype/team/team.js
@@ -3,7 +3,7 @@
 
 jingrow.ui.form.on('Team', {
 	refresh: function (frm) {
-		jingrow.dynamic_link = { pg: frm.pg, fieldname: 'name', doctype: 'Team' };
+		jingrow.dynamic_link = { pg: frm.pg, fieldname: 'name', pagetype: 'Team' };
 		jingrow.contacts.render_address_and_contact(frm);
 
 		if (!frm.pg.erpnext_partner) {
@@ -98,7 +98,7 @@ jingrow.ui.form.on('Team', {
 });
 
 jingrow.ui.form.on('Team Member', {
-	impersonate: function (frm, doctype, member) {
+	impersonate: function (frm, pagetype, member) {
 		jingrow.prompt(
 			[
 				{
diff --git a/press/press/doctype/team/team.json b/press/press/doctype/team/team.json
index 9645b0b9..3d531248 100644
--- a/press/press/doctype/team/team.json
+++ b/press/press/doctype/team/team.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "hash",
  "creation": "2022-01-28 20:07:37.989538",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -643,62 +643,62 @@
  "links": [
   {
    "group": "General",
-   "link_doctype": "Release Group",
+   "link_pagetype": "Release Group",
    "link_fieldname": "team"
   },
   {
    "group": "General",
-   "link_doctype": "Site",
+   "link_pagetype": "Site",
    "link_fieldname": "team"
   },
   {
    "group": "General",
-   "link_doctype": "App",
+   "link_pagetype": "App",
    "link_fieldname": "team"
   },
   {
    "group": "Billing",
-   "link_doctype": "Invoice",
+   "link_pagetype": "Invoice",
    "link_fieldname": "team"
   },
   {
    "group": "Billing",
-   "link_doctype": "Usage Record",
+   "link_pagetype": "Usage Record",
    "link_fieldname": "team"
   },
   {
    "group": "Billing",
-   "link_doctype": "Subscription",
+   "link_pagetype": "Subscription",
    "link_fieldname": "team"
   },
   {
    "group": "Billing",
-   "link_doctype": "Balance Transaction",
+   "link_pagetype": "Balance Transaction",
    "link_fieldname": "team"
   },
   {
    "group": "Billing",
-   "link_doctype": "Stripe Webhook Log",
+   "link_pagetype": "Stripe Webhook Log",
    "link_fieldname": "team"
   },
   {
    "group": "Marketplace",
-   "link_doctype": "Marketplace App",
+   "link_pagetype": "Marketplace App",
    "link_fieldname": "team"
   },
   {
    "group": "Marketplace",
-   "link_doctype": "Marketplace Publisher Profile",
+   "link_pagetype": "Marketplace Publisher Profile",
    "link_fieldname": "team"
   },
   {
    "group": "Billing",
-   "link_doctype": "Stripe Payment Method",
+   "link_pagetype": "Stripe Payment Method",
    "link_fieldname": "team"
   },
   {
    "group": "Billing",
-   "link_doctype": "Payment Due Extension",
+   "link_pagetype": "Payment Due Extension",
    "link_fieldname": "team"
   }
  ],
diff --git a/press/press/doctype/team/team.py b/press/press/doctype/team/team.py
index 317f9504..42393d48 100644
--- a/press/press/doctype/team/team.py
+++ b/press/press/doctype/team/team.py
@@ -17,8 +17,8 @@ from jingrow.utils import get_fullname, get_last_day, get_url_to_form, getdate,
 
 from jcloude.api.client import dashboard_whitelist
 from jcloude.exceptions import FrappeioServerNotSet
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 from jcloude.utils import get_valid_teams_for_user, has_role, log_error
 from jcloude.utils.billing import (
 	get_jingrow_io_connection,
@@ -29,7 +29,7 @@ from jcloude.utils.billing import (
 from jcloude.utils.telemetry import capture
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.account_request.account_request import AccountRequest
+	from jcloude.jcloude.pagetype.account_request.account_request import AccountRequest
 
 
 class Team(Document):
@@ -41,10 +41,10 @@ class Team(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.child_team_member.child_team_member import ChildTeamMember
-		from jcloude.jcloude.doctype.communication_info.communication_info import CommunicationInfo
-		from jcloude.jcloude.doctype.invoice_discount.invoice_discount import InvoiceDiscount
-		from jcloude.jcloude.doctype.team_member.team_member import TeamMember
+		from jcloude.jcloude.pagetype.child_team_member.child_team_member import ChildTeamMember
+		from jcloude.jcloude.pagetype.communication_info.communication_info import CommunicationInfo
+		from jcloude.jcloude.pagetype.invoice_discount.invoice_discount import InvoiceDiscount
+		from jcloude.jcloude.pagetype.team_member.team_member import TeamMember
 
 		account_request: DF.Link | None
 		apply_npo_discount: DF.Check
@@ -263,7 +263,7 @@ class Team(Document):
 			return super().delete()
 
 		if workflow:
-			return jingrow.get_pg({"doctype": "Team Deletion Request", "team": self.name}).insert()
+			return jingrow.get_pg({"pagetype": "Team Deletion Request", "team": self.name}).insert()
 
 		jingrow.throw(
 			f"You are only deleting the Team Document for {self.name}. To continue to"
@@ -299,7 +299,7 @@ class Team(Document):
 		"""Create new team along with user (user created first)."""
 		team: "Team" = jingrow.get_pg(
 			{
-				"doctype": "Team",
+				"pagetype": "Team",
 				"user": account_request.email,
 				"country": country,
 				"enabled": 1,
@@ -383,8 +383,8 @@ class Team(Document):
 		if member_to_remove:
 			self.remove(member_to_remove)
 
-			PressRole = jingrow.qb.DocType("Jcloude Role")
-			PressRoleUser = jingrow.qb.DocType("Jcloude Role User")
+			PressRole = jingrow.qb.PageType("Jcloude Role")
+			PressRoleUser = jingrow.qb.PageType("Jcloude Role User")
 			roles = (
 				jingrow.qb.from_(PressRole)
 				.join(PressRoleUser)
@@ -510,7 +510,7 @@ class Team(Document):
 		user = jingrow.db.get_value("Team Member", member, "user")
 		impersonation = jingrow.get_pg(
 			{
-				"doctype": "Team Member Impersonation",
+				"pagetype": "Team Member Impersonation",
 				"user": user,
 				"impersonator": jingrow.session.user,
 				"team": self.name,
@@ -561,7 +561,7 @@ class Team(Document):
 		# Get team name with this this referrer id
 		referrer_team = jingrow.db.get_value("Team", {"referrer_id": referrer_id})
 		jingrow.get_pg(
-			{"doctype": "Referral Bonus", "for_team": self.name, "referred_by": referrer_team}
+			{"pagetype": "Referral Bonus", "for_team": self.name, "referred_by": referrer_team}
 		).insert(ignore_permissions=True)
 
 	def has_member(self, user):
@@ -604,7 +604,7 @@ class Team(Document):
 
 	@dashboard_whitelist()
 	def update_communication_infos(self, values: list[dict]):
-		from jcloude.jcloude.doctype.communication_info.communication_info import (
+		from jcloude.jcloude.pagetype.communication_info.communication_info import (
 			update_communication_infos as update_infos,
 		)
 
@@ -627,7 +627,7 @@ class Team(Document):
 			address_pg.address_title = billing_details.billing_name or self.billing_name
 			address_pg.append(
 				"links",
-				{"link_doctype": self.doctype, "link_name": self.name, "link_title": self.name},
+				{"link_pagetype": self.pagetype, "link_name": self.name, "link_title": self.name},
 			)
 
 		address_pg.update(
@@ -719,7 +719,7 @@ class Team(Document):
 		try:
 			pg = jingrow.get_pg(
 				{
-					"doctype": "Stripe Payment Method",
+					"pagetype": "Stripe Payment Method",
 					"stripe_payment_method_id": payment_method["id"],
 					"last_4": payment_method["card"]["last4"],
 					"name_on_card": payment_method["billing_details"]["name"],
@@ -802,7 +802,7 @@ class Team(Document):
 
 	def allocate_credit_amount(self, amount, source, remark=None, type="Adjustment"):
 		pg = jingrow.get_pg(
-			doctype="Balance Transaction",
+			pagetype="Balance Transaction",
 			team=self.name,
 			type=type,
 			source=source,
@@ -839,8 +839,8 @@ class Team(Document):
 		"""
 		Checks if the current user has admin access in the team via roles.
 		"""
-		PressRole = jingrow.qb.DocType("Jcloude Role")
-		PressRoleUser = jingrow.qb.DocType("Jcloude Role User")
+		PressRole = jingrow.qb.PageType("Jcloude Role")
+		PressRoleUser = jingrow.qb.PageType("Jcloude Role User")
 		return (
 			jingrow.qb.from_(PressRoleUser)
 			.left_join(PressRole)
@@ -864,8 +864,8 @@ class Team(Document):
 	def invite_team_member(self, email, roles=None):
 		from jingrow.utils.user import is_system_user
 
-		PressRole = jingrow.qb.DocType("Jcloude Role")
-		PressRoleUser = jingrow.qb.DocType("Jcloude Role User")
+		PressRole = jingrow.qb.PageType("Jcloude Role")
+		PressRoleUser = jingrow.qb.PageType("Jcloude Role User")
 
 		has_admin_access = (
 			jingrow.qb.from_(PressRole)
@@ -897,7 +897,7 @@ class Team(Document):
 
 		account_request = jingrow.get_pg(
 			{
-				"doctype": "Account Request",
+				"pagetype": "Account Request",
 				"team": self.name,
 				"email": email,
 				"role": "Jcloude Member",
@@ -1118,7 +1118,7 @@ class Team(Document):
 
 	@jingrow.whitelist()
 	def suspend_sites(self, reason=None):
-		from jcloude.jcloude.doctype.site.site import Site
+		from jcloude.jcloude.pagetype.site.site import Site
 
 		sites_to_suspend = self.get_sites_to_suspend()
 		for site in sites_to_suspend:
@@ -1129,7 +1129,7 @@ class Team(Document):
 		return sites_to_suspend
 
 	def get_sites_to_suspend(self):
-		plan = jingrow.qb.DocType("Site Plan")
+		plan = jingrow.qb.PageType("Site Plan")
 		query = (
 			jingrow.qb.from_(plan)
 			.select(plan.name)
@@ -1164,8 +1164,8 @@ class Team(Document):
 
 	@jingrow.whitelist()
 	def unsuspend_sites(self, reason=None):
-		from jcloude.jcloude.doctype.bench.bench import Bench
-		from jcloude.jcloude.doctype.site.site import Site
+		from jcloude.jcloude.pagetype.bench.bench import Bench
+		from jcloude.jcloude.pagetype.site.site import Site
 
 		suspended_sites = [
 			d.name for d in jingrow.db.get_all("Site", {"team": self.name, "status": "Suspended"})
@@ -1216,7 +1216,7 @@ class Team(Document):
 	def create_upcoming_invoice(self):
 		today = jingrow.utils.today()
 		return jingrow.get_pg(
-			doctype="Invoice", team=self.name, period_start=today, type="Subscription"
+			pagetype="Invoice", team=self.name, period_start=today, type="Subscription"
 		).insert()
 
 	@jingrow.whitelist()
@@ -1371,7 +1371,7 @@ def handle_payment_intent_succeeded(payment_intent):  # noqa: C901
 
 	team.remove_subscription_config_in_trial_sites()
 	invoice = jingrow.get_pg(
-		doctype="Invoice",
+		pagetype="Invoice",
 		team=team.name,
 		type="Prepaid Credits",
 		status="Paid",
@@ -1420,7 +1420,7 @@ def handle_payment_intent_succeeded(payment_intent):  # noqa: C901
 def _enqueue_finalize_unpaid_invoices_for_team(team: str):
 	# Enqueue a background job to call finalize_draft_invoice for unpaid invoices
 	jingrow.enqueue(
-		"jcloude.jcloude.doctype.team.team.enqueue_finalize_unpaid_for_team",
+		"jcloude.jcloude.pagetype.team.team.enqueue_finalize_unpaid_for_team",
 		team=team,
 		enqueue_after_commit=True,
 	)
@@ -1461,7 +1461,7 @@ def process_partnership_fee(payment_intent):
 	)
 
 	invoice = jingrow.get_pg(
-		doctype="Invoice",
+		pagetype="Invoice",
 		team=team.name,
 		type="Partnership Fees",
 		status="Paid",
@@ -1659,7 +1659,7 @@ def check_budget_alerts():
 				invoices_to_update.append(invoice["name"])
 
 	if invoices_to_update:
-		Invoice = jingrow.qb.DocType("Invoice")
+		Invoice = jingrow.qb.PageType("Invoice")
 		(
 			jingrow.qb.update(Invoice)
 			.set(Invoice.budget_alert_sent, 1)
@@ -1695,7 +1695,7 @@ def send_budget_alert_email(team_info, invoice):
 				"period_start": invoice["period_start"],
 				"period_end": invoice["period_end"],
 			},
-			reference_doctype="Invoice",
+			reference_pagetype="Invoice",
 			reference_name=invoice["name"],
 		)
 		return True
diff --git a/press/press/doctype/team/test_team.py b/press/press/doctype/team/test_team.py
index 93bf3117..d3f90946 100644
--- a/press/press/doctype/team/test_team.py
+++ b/press/press/doctype/team/test_team.py
@@ -8,10 +8,10 @@ import jingrow
 from jingrow.tests.ui_test_helpers import create_test_user
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.account_request.test_account_request import (
+from jcloude.jcloude.pagetype.account_request.test_account_request import (
 	create_test_account_request,
 )
-from jcloude.jcloude.doctype.team.team import Team
+from jcloude.jcloude.pagetype.team.team import Team
 
 
 def create_test_jcloude_admin_team(
@@ -42,7 +42,7 @@ def create_test_team(
 	user = jingrow.get_value("User", {"email": email}, "name")
 	team = jingrow.get_pg(
 		{
-			"doctype": "Team",
+			"pagetype": "Team",
 			"user": user,
 			"enabled": 1,
 			"country": country,
diff --git a/press/press/doctype/team_change/team_change.json b/press/press/doctype/team_change/team_change.json
index ab8035e1..237579d8 100644
--- a/press/press/doctype/team_change/team_change.json
+++ b/press/press/doctype/team_change/team_change.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-01-16 11:13:22.843011",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "document_type",
@@ -20,7 +20,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Document Type",
-   "options": "DocType",
+   "options": "PageType",
    "reqd": 1
   },
   {
diff --git a/press/press/doctype/team_deletion_request/team_deletion_request.json b/press/press/doctype/team_deletion_request/team_deletion_request.json
index 7d307143..ce1fcb3e 100644
--- a/press/press/doctype/team_deletion_request/team_deletion_request.json
+++ b/press/press/doctype/team_deletion_request/team_deletion_request.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "format:deleted-team-{####}@deleted.com",
  "creation": "2021-02-11 18:39:37.910757",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/team_deletion_request/team_deletion_request.py b/press/press/doctype/team_deletion_request/team_deletion_request.py
index e70bc75b..54f4f4c0 100644
--- a/press/press/doctype/team_deletion_request/team_deletion_request.py
+++ b/press/press/doctype/team_deletion_request/team_deletion_request.py
@@ -4,7 +4,7 @@
 import jingrow
 from jingrow.core.utils import find
 from jingrow.utils.verified_command import get_signed_params
-from jingrow.website.doctype.personal_data_deletion_request.personal_data_deletion_request import (
+from jingrow.website.pagetype.personal_data_deletion_request.personal_data_deletion_request import (
 	PersonalDataDeletionRequest,
 )
 
@@ -24,11 +24,11 @@ class TeamDeletionRequest(PersonalDataDeletionRequest):
 
 	if TYPE_CHECKING:
 		from jingrow.types import DF
-		from jingrow.website.doctype.personal_data_deletion_step.personal_data_deletion_step import (
+		from jingrow.website.pagetype.personal_data_deletion_step.personal_data_deletion_step import (
 			PersonalDataDeletionStep,
 		)
 
-		from jcloude.jcloude.doctype.team_member_deletion_request.team_member_deletion_request import (
+		from jcloude.jcloude.pagetype.team_member_deletion_request.team_member_deletion_request import (
 			TeamMemberDeletionRequest,
 		)
 
@@ -89,8 +89,8 @@ class TeamDeletionRequest(PersonalDataDeletionRequest):
 		jingrow.throw("You need to be a Team owner to request account deletion", exc=jingrow.PermissionError)
 
 	def validate_duplicate_request(self):
-		if jingrow.db.exists(self.doctype, {"team": self.team}):
-			jingrow.throw(f"{self.doctype} for {self.team} already exists!", exc=jingrow.DuplicateEntryError)
+		if jingrow.db.exists(self.pagetype, {"team": self.team}):
+			jingrow.throw(f"{self.pagetype} for {self.team} already exists!", exc=jingrow.DuplicateEntryError)
 
 	def delete_team_data(self):
 		self.db_set("status", "Processing Deletion")
@@ -124,7 +124,7 @@ class TeamDeletionRequest(PersonalDataDeletionRequest):
 		url = f"{api}?{params}"
 
 		if jingrow.conf.developer_mode:
-			print(f"URL generated for {self.doctype} {self.name}: {url}")
+			print(f"URL generated for {self.pagetype} {self.name}: {url}")
 
 		return url
 
@@ -268,16 +268,16 @@ class TeamDeletionRequest(PersonalDataDeletionRequest):
 
 def process_team_deletion_requests():
 	# order in desc since deleting jcloude data takes the most time
-	doctype = "Team Deletion Request"
+	pagetype = "Team Deletion Request"
 	deletion_requests = jingrow.get_all(
-		doctype,
+		pagetype,
 		filters={"status": ("in", ["Deletion Verified", "Processing Deletion"])},
 		pluck="name",
 		order_by="creation desc",
 	)
 	for name in deletion_requests:
 		try:
-			tdr = jingrow.get_pg(doctype, name)
+			tdr = jingrow.get_pg(pagetype, name)
 			tdr.delete_team_data()
 			jingrow.db.commit()
 		except Exception:
diff --git a/press/press/doctype/team_deletion_request/test_team_deletion_request.py b/press/press/doctype/team_deletion_request/test_team_deletion_request.py
index 78a41670..72c97133 100644
--- a/press/press/doctype/team_deletion_request/test_team_deletion_request.py
+++ b/press/press/doctype/team_deletion_request/test_team_deletion_request.py
@@ -4,8 +4,8 @@
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.team.test_team import create_test_team
-from jcloude.jcloude.doctype.team_deletion_request.team_deletion_request import (
+from jcloude.jcloude.pagetype.team.test_team import create_test_team
+from jcloude.jcloude.pagetype.team_deletion_request.team_deletion_request import (
 	TeamDeletionRequest,
 )
 from jcloude.utils.test import request_locally_with_host_rewrite
diff --git a/press/press/doctype/team_member/team_member.json b/press/press/doctype/team_member/team_member.json
index 71170c6a..e84958b0 100644
--- a/press/press/doctype/team_member/team_member.json
+++ b/press/press/doctype/team_member/team_member.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-03-05 18:26:34.180580",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/team_member_deletion_request/team_member_deletion_request.json b/press/press/doctype/team_member_deletion_request/team_member_deletion_request.json
index ba72faa7..6dc88652 100644
--- a/press/press/doctype/team_member_deletion_request/team_member_deletion_request.json
+++ b/press/press/doctype/team_member_deletion_request/team_member_deletion_request.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2021-04-26 13:13:13.385392",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/team_member_impersonation/team_member_impersonation.json b/press/press/doctype/team_member_impersonation/team_member_impersonation.json
index 5532f9e9..dbcb6b44 100644
--- a/press/press/doctype/team_member_impersonation/team_member_impersonation.json
+++ b/press/press/doctype/team_member_impersonation/team_member_impersonation.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-07-31 11:36:50.175646",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/team_onboarding/team_onboarding.json b/press/press/doctype/team_onboarding/team_onboarding.json
index fcaf2011..d19fe151 100644
--- a/press/press/doctype/team_onboarding/team_onboarding.json
+++ b/press/press/doctype/team_onboarding/team_onboarding.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-08-27 17:41:18.658299",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/telegram_group/patches/create_groups_from_press_settings.py b/press/press/doctype/telegram_group/patches/create_groups_from_press_settings.py
index 76655d9f..56e336fe 100644
--- a/press/press/doctype/telegram_group/patches/create_groups_from_press_settings.py
+++ b/press/press/doctype/telegram_group/patches/create_groups_from_press_settings.py
@@ -4,14 +4,14 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "telegram_group_topic")
-	jingrow.reload_pg("jcloude", "doctype", "telegram_group")
-	jingrow.reload_pg("jcloude", "doctype", "jcloude_settings")
+	jingrow.reload_pg("jcloude", "pagetype", "telegram_group_topic")
+	jingrow.reload_pg("jcloude", "pagetype", "telegram_group")
+	jingrow.reload_pg("jcloude", "pagetype", "jcloude_settings")
 	settings = jingrow.get_pg("Jcloude Settings")
 	if settings.telegram_alert_chat_id:
 		group = jingrow.get_pg(
 			{
-				"doctype": "Telegram Group",
+				"pagetype": "Telegram Group",
 				"name": "Alerts",
 				"chat_id": settings.telegram_alert_chat_id,
 			}
diff --git a/press/press/doctype/telegram_group/telegram_group.json b/press/press/doctype/telegram_group/telegram_group.json
index 87222d7a..4f77f02c 100644
--- a/press/press/doctype/telegram_group/telegram_group.json
+++ b/press/press/doctype/telegram_group/telegram_group.json
@@ -4,7 +4,7 @@
  "autoname": "prompt",
  "creation": "2023-05-11 17:40:05.778395",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/telegram_group/telegram_group.py b/press/press/doctype/telegram_group/telegram_group.py
index 0805107f..1d79dccd 100644
--- a/press/press/doctype/telegram_group/telegram_group.py
+++ b/press/press/doctype/telegram_group/telegram_group.py
@@ -14,7 +14,7 @@ class TelegramGroup(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.telegram_group_topic.telegram_group_topic import (
+		from jcloude.jcloude.pagetype.telegram_group_topic.telegram_group_topic import (
 			TelegramGroupTopic,
 		)
 
diff --git a/press/press/doctype/telegram_group_topic/telegram_group_topic.json b/press/press/doctype/telegram_group_topic/telegram_group_topic.json
index 474251ad..32bd5b9f 100644
--- a/press/press/doctype/telegram_group_topic/telegram_group_topic.json
+++ b/press/press/doctype/telegram_group_topic/telegram_group_topic.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-05-11 17:39:50.237287",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/telegram_message/telegram_message.json b/press/press/doctype/telegram_message/telegram_message.json
index 8cbf1070..436b18b9 100644
--- a/press/press/doctype/telegram_message/telegram_message.json
+++ b/press/press/doctype/telegram_message/telegram_message.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-05-21 16:45:23.323529",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "priority",
diff --git a/press/press/doctype/telegram_message/telegram_message.py b/press/press/doctype/telegram_message/telegram_message.py
index edcbb56d..bba57612 100644
--- a/press/press/doctype/telegram_message/telegram_message.py
+++ b/press/press/doctype/telegram_message/telegram_message.py
@@ -69,7 +69,7 @@ class TelegramMessage(Document):
 		"""Enqueue message for sending"""
 		return jingrow.get_pg(
 			{
-				"doctype": "Telegram Message",
+				"pagetype": "Telegram Message",
 				"message": message,
 				"priority": priority,
 				"topic": topic,
@@ -97,7 +97,7 @@ class TelegramMessage(Document):
 
 	@staticmethod
 	def clear_old_logs(days=30):
-		table = jingrow.qb.DocType("Telegram Message")
+		table = jingrow.qb.PageType("Telegram Message")
 		jingrow.db.delete(table, filters=(table.modified < (Now() - Interval(days=days))))
 		jingrow.db.commit()
 
diff --git a/press/press/doctype/telegram_message/test_telegram_message.py b/press/press/doctype/telegram_message/test_telegram_message.py
index 3cde909a..a499fded 100644
--- a/press/press/doctype/telegram_message/test_telegram_message.py
+++ b/press/press/doctype/telegram_message/test_telegram_message.py
@@ -7,7 +7,7 @@ import jingrow
 from jingrow.tests.utils import FrappeTestCase
 from telegram.error import RetryAfter, TimedOut
 
-from jcloude.jcloude.doctype.telegram_message.telegram_message import (
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import (
 	TelegramMessage,
 	send_telegram_message,
 )
diff --git a/press/press/doctype/tls_certificate/test_tls_certificate.py b/press/press/doctype/tls_certificate/test_tls_certificate.py
index ed093613..ef956caf 100644
--- a/press/press/doctype/tls_certificate/test_tls_certificate.py
+++ b/press/press/doctype/tls_certificate/test_tls_certificate.py
@@ -7,11 +7,11 @@ from unittest.mock import Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.proxy_server.proxy_server import ProxyServer
-from jcloude.jcloude.doctype.proxy_server.test_proxy_server import create_test_proxy_server
-from jcloude.jcloude.doctype.root_domain.test_root_domain import create_test_root_domain
-from jcloude.jcloude.doctype.tls_certificate.tls_certificate import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.proxy_server.proxy_server import ProxyServer
+from jcloude.jcloude.pagetype.proxy_server.test_proxy_server import create_test_proxy_server
+from jcloude.jcloude.pagetype.root_domain.test_root_domain import create_test_root_domain
+from jcloude.jcloude.pagetype.tls_certificate.tls_certificate import (
 	BaseCA,
 	LetsEncrypt,
 	TLSCertificate,
@@ -24,7 +24,7 @@ def create_test_tls_certificate(
 ) -> TLSCertificate:
 	certificate = jingrow.get_pg(
 		{
-			"doctype": "TLS Certificate",
+			"pagetype": "TLS Certificate",
 			"domain": domain,
 			"rsa_key_size": 2048,
 			"wildcard": wildcard,
diff --git a/press/press/doctype/tls_certificate/tls_certificate.json b/press/press/doctype/tls_certificate/tls_certificate.json
index ced8042e..f4eb2717 100644
--- a/press/press/doctype/tls_certificate/tls_certificate.json
+++ b/press/press/doctype/tls_certificate/tls_certificate.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2020-03-30 01:11:37.983494",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/tls_certificate/tls_certificate.py b/press/press/doctype/tls_certificate/tls_certificate.py
index ee8c49ed..19e64d21 100644
--- a/press/press/doctype/tls_certificate/tls_certificate.py
+++ b/press/press/doctype/tls_certificate/tls_certificate.py
@@ -20,14 +20,14 @@ from jcloude.exceptions import (
 	DNSValidationError,
 	TLSRetryLimitExceeded,
 )
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
 from jcloude.runner import Ansible
 from jcloude.utils import get_current_team, log_error
 from jcloude.utils.dns import check_dns_cname_a
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.ansible_play.ansible_play import AnsiblePlay
+	from jcloude.jcloude.pagetype.ansible_play.ansible_play import AnsiblePlay
 
 AUTO_RETRY_LIMIT = 5
 MANUAL_RETRY_LIMIT = 8
@@ -104,7 +104,7 @@ class TLSCertificate(Document):
 
 		jingrow.set_user(jingrow.get_value("Team", team, "user"))
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_obtain_certificate",
 			enqueue_after_commit=True,
@@ -139,7 +139,7 @@ class TLSCertificate(Document):
 				if "Another instance of Certbot is already running" in out:
 					time.sleep(5)
 					jingrow.enqueue_pg(
-						self.doctype,
+						self.pagetype,
 						self.name,
 						"_obtain_certificate",
 						job_id=f"obtain_certificate:{self.name}",
@@ -191,9 +191,9 @@ class TLSCertificate(Document):
 			"Trace Server",
 		]
 
-		for server_doctype in server_doctypes:
+		for server_pagetype in server_doctypes:
 			servers = jingrow.get_all(
-				server_doctype,
+				server_pagetype,
 				filters={
 					"status": ("not in", ["Archived", "Installing"]),
 					"name": ("like", f"%.{self.domain}"),
@@ -203,15 +203,15 @@ class TLSCertificate(Document):
 			for server in servers:
 				if server.status == "Active":
 					jingrow.enqueue(
-						"jcloude.jcloude.doctype.tls_certificate.tls_certificate.update_server_tls_certifcate",
-						server=jingrow.get_pg(server_doctype, server.name),
+						"jcloude.jcloude.pagetype.tls_certificate.tls_certificate.update_server_tls_certifcate",
+						server=jingrow.get_pg(server_pagetype, server.name),
 						certificate=self,
 						enqueue_after_commit=True,
 					)
 				else:
 					# If server is not active, mark the tls_certificate_renewal_failed field as True
 					jingrow.db.set_value(
-						server_doctype,
+						server_pagetype,
 						server.name,
 						"tls_certificate_renewal_failed",
 						1,
@@ -281,7 +281,7 @@ class TLSCertificate(Document):
 				self.status = "Failure"
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("TLS Certificate")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("TLS Certificate")
 
 
 class PendingCertificate(jingrow._dict):
@@ -365,7 +365,7 @@ def notify_custom_tls_renewal():
 	seven_days = jingrow.utils.add_days(None, 7).date()
 	fifteen_days = jingrow.utils.add_days(None, 15).date()
 
-	tls_cert = jingrow.qb.DocType("TLS Certificate")
+	tls_cert = jingrow.qb.PageType("TLS Certificate")
 
 	# Notify team members 15 days and 7 days before expiry
 
@@ -391,7 +391,7 @@ def notify_custom_tls_renewal():
 def update_server_tls_certifcate(server, certificate):
 	try:
 		proxysql_admin_password = None
-		if server.doctype == "Proxy Server":
+		if server.pagetype == "Proxy Server":
 			proxysql_admin_password = server.get_password("proxysql_admin_password")
 		ansible = Ansible(
 			playbook="tls.yml",
@@ -408,7 +408,7 @@ def update_server_tls_certifcate(server, certificate):
 		)
 		play: "AnsiblePlay" = ansible.run()
 		jingrow.db.set_value(
-			server.doctype,
+			server.pagetype,
 			server.name,
 			"tls_certificate_renewal_failed",
 			play.status != "Success",
@@ -430,9 +430,9 @@ def retrigger_failed_wildcard_tls_callbacks():
 		"Analytics Server",
 		"Trace Server",
 	]
-	for server_doctype in server_doctypes:
+	for server_pagetype in server_doctypes:
 		servers = jingrow.get_all(
-			server_doctype, filters={"status": "Active"}, fields=["name", "tls_certificate_renewal_failed"]
+			server_pagetype, filters={"status": "Active"}, fields=["name", "tls_certificate_renewal_failed"]
 		)
 		for server in servers:
 			previous_attempt_failed = server.tls_certificate_renewal_failed
@@ -448,9 +448,9 @@ def retrigger_failed_wildcard_tls_callbacks():
 					previous_attempt_failed = True
 
 			if previous_attempt_failed:
-				server_pg = jingrow.get_pg(server_doctype, server)
+				server_pg = jingrow.get_pg(server_pagetype, server)
 				jingrow.enqueue(
-					"jcloude.jcloude.doctype.tls_certificate.tls_certificate.update_server_tls_certifcate",
+					"jcloude.jcloude.pagetype.tls_certificate.tls_certificate.update_server_tls_certifcate",
 					server=server_pg,
 					certificate=server_pg.get_certificate(),
 				)
diff --git a/press/press/doctype/trace_server/trace_server.json b/press/press/doctype/trace_server/trace_server.json
index a3019149..50f45d9d 100644
--- a/press/press/doctype/trace_server/trace_server.json
+++ b/press/press/doctype/trace_server/trace_server.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2022-06-28 13:24:27.669633",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -272,7 +272,7 @@
  "grid_page_length": 50,
  "links": [
   {
-   "link_doctype": "Ansible Play",
+   "link_pagetype": "Ansible Play",
    "link_fieldname": "server"
   }
  ],
diff --git a/press/press/doctype/trace_server/trace_server.py b/press/press/doctype/trace_server/trace_server.py
index 8305b493..41deeaa1 100644
--- a/press/press/doctype/trace_server/trace_server.py
+++ b/press/press/doctype/trace_server/trace_server.py
@@ -3,7 +3,7 @@
 
 import jingrow
 
-from jcloude.jcloude.doctype.server.server import BaseServer
+from jcloude.jcloude.pagetype.server.server import BaseServer
 from jcloude.runner import Ansible
 from jcloude.utils import log_error
 
@@ -114,7 +114,7 @@ class TraceServer(BaseServer):
 	def upgrade_server(self):
 		self.status = "Installing"
 		self.save()
-		jingrow.enqueue_pg(self.doctype, self.name, "_upgrade_server", queue="long", timeout=2400)
+		jingrow.enqueue_pg(self.pagetype, self.name, "_upgrade_server", queue="long", timeout=2400)
 
 	def _upgrade_server(self):
 		try:
diff --git a/press/press/doctype/usage_record/usage_record.json b/press/press/doctype/usage_record/usage_record.json
index d4e95abc..c3ae493c 100644
--- a/press/press/doctype/usage_record/usage_record.json
+++ b/press/press/doctype/usage_record/usage_record.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "UR-.YYYY.-.######",
  "creation": "2020-10-19 17:36:31.235411",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -33,7 +33,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Document Type",
-   "options": "DocType"
+   "options": "PageType"
   },
   {
    "fieldname": "document_name",
@@ -139,7 +139,7 @@
    "fieldname": "plan_type",
    "fieldtype": "Link",
    "label": "Plan Type",
-   "options": "DocType",
+   "options": "PageType",
    "search_index": 1
   }
  ],
diff --git a/press/press/doctype/usage_record/usage_record.py b/press/press/doctype/usage_record/usage_record.py
index 4207261b..455f3ea8 100644
--- a/press/press/doctype/usage_record/usage_record.py
+++ b/press/press/doctype/usage_record/usage_record.py
@@ -130,5 +130,5 @@ def link_unlinked_usage_records():
 			jingrow.log_error("Failed to Link UR to Invoice")
 
 
-def on_doctype_update():
+def on_pagetype_update():
 	jingrow.db.add_index("Usage Record", ["subscription", "date"])
diff --git a/press/press/doctype/user_2fa/patches/generate_recovery_codes.py b/press/press/doctype/user_2fa/patches/generate_recovery_codes.py
index a41cf425..4d8ed530 100644
--- a/press/press/doctype/user_2fa/patches/generate_recovery_codes.py
+++ b/press/press/doctype/user_2fa/patches/generate_recovery_codes.py
@@ -7,8 +7,8 @@ from jingrow.query_builder.functions import Count
 def execute():
 	"""Generate recovery codes for already existing `User 2FA` records."""
 
-	User2FA = jingrow.qb.DocType("User 2FA")
-	User2FARecoveryCode = jingrow.qb.DocType("User 2FA Recovery Code")
+	User2FA = jingrow.qb.PageType("User 2FA")
+	User2FARecoveryCode = jingrow.qb.PageType("User 2FA Recovery Code")
 
 	records = (
 		jingrow.qb.from_(User2FA)
diff --git a/press/press/doctype/user_2fa/test_user_2fa.py b/press/press/doctype/user_2fa/test_user_2fa.py
index 3f9dc68b..e862b837 100644
--- a/press/press/doctype/user_2fa/test_user_2fa.py
+++ b/press/press/doctype/user_2fa/test_user_2fa.py
@@ -4,7 +4,7 @@
 # import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.user_2fa.user_2fa import User2FA
+from jcloude.jcloude.pagetype.user_2fa.user_2fa import User2FA
 
 
 class TestUser2FA(FrappeTestCase):
diff --git a/press/press/doctype/user_2fa/user_2fa.json b/press/press/doctype/user_2fa/user_2fa.json
index 2dbeb521..a2d3999e 100644
--- a/press/press/doctype/user_2fa/user_2fa.json
+++ b/press/press/doctype/user_2fa/user_2fa.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "field:user",
  "creation": "2024-08-21 16:10:57.634579",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "user",
diff --git a/press/press/doctype/user_2fa/user_2fa.py b/press/press/doctype/user_2fa/user_2fa.py
index 9678fd04..4001c4c4 100644
--- a/press/press/doctype/user_2fa/user_2fa.py
+++ b/press/press/doctype/user_2fa/user_2fa.py
@@ -20,7 +20,7 @@ class User2FA(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.user_2fa_recovery_code.user_2fa_recovery_code import User2FARecoveryCode
+		from jcloude.jcloude.pagetype.user_2fa_recovery_code.user_2fa_recovery_code import User2FARecoveryCode
 
 		enabled: DF.Check
 		last_verified_at: DF.Datetime | None
diff --git a/press/press/doctype/user_2fa_recovery_code/user_2fa_recovery_code.json b/press/press/doctype/user_2fa_recovery_code/user_2fa_recovery_code.json
index eb1832ce..ff162ff0 100644
--- a/press/press/doctype/user_2fa_recovery_code/user_2fa_recovery_code.json
+++ b/press/press/doctype/user_2fa_recovery_code/user_2fa_recovery_code.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-06-21 13:22:03.233018",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "code",
diff --git a/press/press/doctype/user_ssh_certificate/user_ssh_certificate.json b/press/press/doctype/user_ssh_certificate/user_ssh_certificate.json
index 4968c852..bff2c5a1 100644
--- a/press/press/doctype/user_ssh_certificate/user_ssh_certificate.json
+++ b/press/press/doctype/user_ssh_certificate/user_ssh_certificate.json
@@ -1,7 +1,7 @@
 {
  "actions": [],
  "creation": "2019-07-10 16:04:46.784120",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/user_ssh_key/patches/set_existing_keys_as_default.py b/press/press/doctype/user_ssh_key/patches/set_existing_keys_as_default.py
index 6f8965c8..0ec8b269 100644
--- a/press/press/doctype/user_ssh_key/patches/set_existing_keys_as_default.py
+++ b/press/press/doctype/user_ssh_key/patches/set_existing_keys_as_default.py
@@ -5,5 +5,5 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_doctype("User SSH Key")
+	jingrow.reload_pagetype("User SSH Key")
 	jingrow.db.set_value("User SSH Key", {"is_default": False}, "is_default", True)
diff --git a/press/press/doctype/user_ssh_key/test_user_ssh_key.py b/press/press/doctype/user_ssh_key/test_user_ssh_key.py
index f86f34ff..d1954264 100644
--- a/press/press/doctype/user_ssh_key/test_user_ssh_key.py
+++ b/press/press/doctype/user_ssh_key/test_user_ssh_key.py
@@ -9,7 +9,7 @@ from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.team.test_team import create_test_jcloude_admin_team
+from jcloude.jcloude.pagetype.team.test_team import create_test_jcloude_admin_team
 
 
 def create_rsa_key() -> str:
@@ -44,7 +44,7 @@ def create_test_user_ssh_key(user: str, str_key: str | None = None):
 		str_key = create_rsa_key()
 	ssh_key = jingrow.get_pg(
 		{
-			"doctype": "User SSH Key",
+			"pagetype": "User SSH Key",
 			"user": user,
 			"ssh_public_key": str_key,
 		}
diff --git a/press/press/doctype/user_ssh_key/user_ssh_key.json b/press/press/doctype/user_ssh_key/user_ssh_key.json
index b755f729..c5e1c339 100644
--- a/press/press/doctype/user_ssh_key/user_ssh_key.json
+++ b/press/press/doctype/user_ssh_key/user_ssh_key.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-01-28 20:07:41.467888",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/version_upgrade/test_version_upgrade.py b/press/press/doctype/version_upgrade/test_version_upgrade.py
index 08904e25..d842e6b3 100644
--- a/press/press/doctype/version_upgrade/test_version_upgrade.py
+++ b/press/press/doctype/version_upgrade/test_version_upgrade.py
@@ -6,20 +6,20 @@ from unittest.mock import Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.server.test_server import create_test_server
-from jcloude.jcloude.doctype.site.test_site import create_test_bench, create_test_site
-from jcloude.jcloude.doctype.site_update.test_site_update import create_test_site_update
-from jcloude.jcloude.doctype.version_upgrade.version_upgrade import VersionUpgrade
+from jcloude.jcloude.pagetype.server.test_server import create_test_server
+from jcloude.jcloude.pagetype.site.test_site import create_test_bench, create_test_site
+from jcloude.jcloude.pagetype.site_update.test_site_update import create_test_site_update
+from jcloude.jcloude.pagetype.version_upgrade.version_upgrade import VersionUpgrade
 
 
 def create_test_version_upgrade(site: str, destination_group: str) -> VersionUpgrade:
 	return jingrow.get_pg(
-		dict(doctype="Version Upgrade", site=site, destination_group=destination_group)
+		dict(pagetype="Version Upgrade", site=site, destination_group=destination_group)
 	).insert(ignore_if_duplicate=True)
 
 
diff --git a/press/press/doctype/version_upgrade/version_upgrade.json b/press/press/doctype/version_upgrade/version_upgrade.json
index 23b45441..cb20bb32 100644
--- a/press/press/doctype/version_upgrade/version_upgrade.json
+++ b/press/press/doctype/version_upgrade/version_upgrade.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-07-28 09:13:49.010492",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/version_upgrade/version_upgrade.py b/press/press/doctype/version_upgrade/version_upgrade.py
index a33aaff4..a0308191 100644
--- a/press/press/doctype/version_upgrade/version_upgrade.py
+++ b/press/press/doctype/version_upgrade/version_upgrade.py
@@ -8,14 +8,14 @@ from typing import TYPE_CHECKING
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.communication_info.communication_info import get_communication_info
-from jcloude.jcloude.doctype.jcloude_notification.jcloude_notification import (
+from jcloude.jcloude.pagetype.communication_info.communication_info import get_communication_info
+from jcloude.jcloude.pagetype.jcloude_notification.jcloude_notification import (
 	create_new_notification,
 )
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.site.site import Site
+	from jcloude.jcloude.pagetype.site.site import Site
 
 
 class VersionUpgrade(Document):
@@ -39,7 +39,7 @@ class VersionUpgrade(Document):
 		status: DF.Literal["Scheduled", "Pending", "Running", "Success", "Failure"]
 	# end: auto-generated types
 
-	doctype = "Version Upgrade"
+	pagetype = "Version Upgrade"
 
 	def validate(self):
 		if self.status == "Failure":
@@ -138,7 +138,7 @@ class VersionUpgrade(Document):
 	@classmethod
 	def get_all_scheduled_before_now(cls) -> list["VersionUpgrade"]:
 		upgrades = jingrow.get_all(
-			cls.doctype,
+			cls.pagetype,
 			{"scheduled_time": ("<=", jingrow.utils.now()), "status": "Scheduled"},
 			pluck="name",
 		)
@@ -147,12 +147,12 @@ class VersionUpgrade(Document):
 
 	@classmethod
 	def get_all_ongoing_version_upgrades(cls) -> list[Document]:
-		upgrades = jingrow.get_all(cls.doctype, {"status": ("in", ["Pending", "Running"])})
+		upgrades = jingrow.get_all(cls.pagetype, {"status": ("in", ["Pending", "Running"])})
 		return cls.get_docs(upgrades)
 
 	@classmethod
 	def get_docs(cls, names: list[str]) -> list[Document]:
-		return [jingrow.get_pg(cls.doctype, name) for name in names]
+		return [jingrow.get_pg(cls.pagetype, name) for name in names]
 
 
 def update_from_site_update():
@@ -171,7 +171,7 @@ def update_from_site_update():
 				jingrow.sendmail(
 					recipients=get_communication_info("Email", "Site Activity", "Site", version_upgrade.site),
 					subject=f"Automated Version Upgrade Failed for {version_upgrade.site}",
-					reference_doctype="Version Upgrade",
+					reference_pagetype="Version Upgrade",
 					reference_name=version_upgrade.name,
 					template="version_upgrade_failed",
 					args={
diff --git a/press/press/doctype/virtual_disk_snapshot/patches/rename_aws_fields.py b/press/press/doctype/virtual_disk_snapshot/patches/rename_aws_fields.py
index 1a462c65..b5048c25 100644
--- a/press/press/doctype/virtual_disk_snapshot/patches/rename_aws_fields.py
+++ b/press/press/doctype/virtual_disk_snapshot/patches/rename_aws_fields.py
@@ -6,6 +6,6 @@ from jingrow.model.utils.rename_field import rename_field
 
 
 def execute():
-	jingrow.reload_doctype("Virtual Disk Snapshot")
+	jingrow.reload_pagetype("Virtual Disk Snapshot")
 	rename_field("Virtual Disk Snapshot", "aws_snapshot_id", "snapshot_id")
 	rename_field("Virtual Disk Snapshot", "aws_volume_id", "volume_id")
diff --git a/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.json b/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.json
index 838edb3d..8c0bd4ca 100644
--- a/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.json
+++ b/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-08-30 12:15:23.873531",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -179,7 +179,7 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Site Backup",
+   "link_pagetype": "Site Backup",
    "link_fieldname": "database_snapshot"
   }
  ],
diff --git a/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.py b/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.py
index 9b3fe93a..b9660b1c 100644
--- a/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.py
+++ b/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.py
@@ -87,7 +87,7 @@ class VirtualDiskSnapshot(Document):
 				# Find older rolling snapshots than current snapshot
 				# If exists, delete that
 				older_snapshots = jingrow.db.get_all(
-					self.doctype,
+					self.pagetype,
 					{
 						"virtual_machine": self.virtual_machine,
 						"volume_id": self.volume_id,
@@ -101,7 +101,7 @@ class VirtualDiskSnapshot(Document):
 				)
 				for older_snapshot_name in older_snapshots:
 					jingrow.enqueue_pg(
-						self.doctype,
+						self.pagetype,
 						name=older_snapshot_name,
 						method="delete_snapshot",
 						enqueue_after_commit=True,
@@ -472,7 +472,7 @@ def _insert_snapshot(snapshot, virtual_machine, random_snapshot):
 	start_time = jingrow.utils.format_datetime(snapshot["StartTime"], "yyyy-MM-dd HH:mm:ss")
 	new_snapshot = jingrow.get_pg(
 		{
-			"doctype": "Virtual Disk Snapshot",
+			"pagetype": "Virtual Disk Snapshot",
 			"snapshot_id": snapshot["SnapshotId"],
 			"virtual_machine": virtual_machine,
 			"volume_id": snapshot["VolumeId"],
diff --git a/press/press/doctype/virtual_machine/cloud-init.yml.jinja2 b/press/press/doctype/virtual_machine/cloud-init.yml.jinja2
index 8eed685b..809acefc 100644
--- a/press/press/doctype/virtual_machine/cloud-init.yml.jinja2
+++ b/press/press/doctype/virtual_machine/cloud-init.yml.jinja2
@@ -20,13 +20,13 @@ runcmd:
 - su - jingrow -c "cd /home/jingrow/agent && env/bin/agent setup authentication --password {{ agent_password }}"
 - su - jingrow -c "htpasswd -Bbc /home/jingrow/agent/nginx/monitoring.htpasswd jingrow {{ monitoring_password }}"
 - supervisorctl restart all
-{% if server.doctype == 'Database Server' and server.provider != 'Hetzner' %}
+{% if server.pagetype == 'Database Server' and server.provider != 'Hetzner' %}
 - resize2fs $(findmnt /opt/volumes/mariadb --noheadings --output SOURCE)
 - systemctl daemon-reload
 - systemctl restart mariadb
 - systemctl restart mysqld_exporter
 - systemctl restart deadlock_logger
-{% elif server.doctype == 'Server' and server.provider != 'Hetzner' %}
+{% elif server.pagetype == 'Server' and server.provider != 'Hetzner' %}
 - resize2fs $(findmnt /opt/volumes/benches --noheadings --output SOURCE)
 {% endif %}
 {% if server.provider == 'OCI' %}
@@ -56,7 +56,7 @@ write_files:
     TrustedUserCAKeys /etc/ssh/ca.pub
     AuthorizedPrincipalsFile /etc/ssh/auth_principals/%u
 
-{% if server.doctype == 'Database Server' %}
+{% if server.pagetype == 'Database Server' %}
 - path: /etc/mysql/conf.d/jingrow.cnf
   content: |
     {{ mariadb_config | indent(4) }}
@@ -82,7 +82,7 @@ swap:
   filename: /swap.default
   size: 1073741824
 
-{% if server.doctype == 'Server' %}
+{% if server.pagetype == 'Server' %}
 packages:
  - earlyoom
 {% endif %}
diff --git a/press/press/doctype/virtual_machine/patches/populate_volumes_table.py b/press/press/doctype/virtual_machine/patches/populate_volumes_table.py
index 7c784d6a..b114b5a0 100644
--- a/press/press/doctype/virtual_machine/patches/populate_volumes_table.py
+++ b/press/press/doctype/virtual_machine/patches/populate_volumes_table.py
@@ -2,8 +2,8 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "virtual_machine_volume")
-	jingrow.reload_pg("jcloude", "doctype", "virtual_machine")
+	jingrow.reload_pg("jcloude", "pagetype", "virtual_machine_volume")
+	jingrow.reload_pg("jcloude", "pagetype", "virtual_machine")
 
 	for machine in jingrow.get_all("Virtual Machine", pluck="name"):
 		machine = jingrow.get_pg("Virtual Machine", machine)
diff --git a/press/press/doctype/virtual_machine/patches/rename_aws_fields.py b/press/press/doctype/virtual_machine/patches/rename_aws_fields.py
index 0513e51d..e8226448 100644
--- a/press/press/doctype/virtual_machine/patches/rename_aws_fields.py
+++ b/press/press/doctype/virtual_machine/patches/rename_aws_fields.py
@@ -6,7 +6,7 @@ from jingrow.model.utils.rename_field import rename_field
 
 
 def execute():
-	jingrow.reload_doctype("Virtual Machine")
+	jingrow.reload_pagetype("Virtual Machine")
 	rename_field("Virtual Machine", "aws_subnet_id", "subnet_id")
 	rename_field("Virtual Machine", "aws_security_group_id", "security_group_id")
 	rename_field("Virtual Machine", "aws_instance_id", "instance_id")
diff --git a/press/press/doctype/virtual_machine/patches/set_naming_fields.py b/press/press/doctype/virtual_machine/patches/set_naming_fields.py
index abd0d707..89af34dd 100644
--- a/press/press/doctype/virtual_machine/patches/set_naming_fields.py
+++ b/press/press/doctype/virtual_machine/patches/set_naming_fields.py
@@ -5,7 +5,7 @@ import jingrow
 
 
 def execute():
-	jingrow.reload_pg("jcloude", "doctype", "virtual_machine")
+	jingrow.reload_pg("jcloude", "pagetype", "virtual_machine")
 
 	for machine in jingrow.get_all(
 		"Virtual Machine", ["name", "index", "series", "domain"]
diff --git a/press/press/doctype/virtual_machine/test_virtual_machine.py b/press/press/doctype/virtual_machine/test_virtual_machine.py
index 9fcc0c3c..5c9cf546 100644
--- a/press/press/doctype/virtual_machine/test_virtual_machine.py
+++ b/press/press/doctype/virtual_machine/test_virtual_machine.py
@@ -9,12 +9,12 @@ from unittest.mock import MagicMock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.cluster.test_cluster import create_test_cluster
-from jcloude.jcloude.doctype.root_domain.test_root_domain import create_test_root_domain
-from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+from jcloude.jcloude.pagetype.cluster.test_cluster import create_test_cluster
+from jcloude.jcloude.pagetype.root_domain.test_root_domain import create_test_root_domain
+from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.cluster.cluster import Cluster
+	from jcloude.jcloude.pagetype.cluster.cluster import Cluster
 
 
 @patch.object(VirtualMachine, "client", new=MagicMock())
@@ -34,7 +34,7 @@ def create_test_virtual_machine(
 		cluster = create_test_cluster()
 	vm = jingrow.get_pg(
 		{
-			"doctype": "Virtual Machine",
+			"pagetype": "Virtual Machine",
 			"domain": create_test_root_domain("fc.dev", cluster.name).name,
 			"series": series,
 			"status": "Running",
@@ -53,7 +53,7 @@ def create_test_virtual_machine(
 	volumes.append(
 		jingrow.get_pg(
 			{
-				"doctype": "Virtual Machine Volume",
+				"pagetype": "Virtual Machine Volume",
 				"parenttype": "Virtual Machine",
 				"parent": vm.name,
 				"parentfield": "volumes",
@@ -69,7 +69,7 @@ def create_test_virtual_machine(
 		volumes.append(
 			jingrow.get_pg(
 				{
-					"doctype": "Virtual Machine Volume",
+					"pagetype": "Virtual Machine Volume",
 					"parenttype": "Virtual Machine",
 					"parent": vm.name,
 					"parentfield": "volumes",
diff --git a/press/press/doctype/virtual_machine/virtual_machine.json b/press/press/doctype/virtual_machine/virtual_machine.json
index aca85419..f6ac0374 100644
--- a/press/press/doctype/virtual_machine/virtual_machine.json
+++ b/press/press/doctype/virtual_machine/virtual_machine.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2021-09-06 18:18:49.887153",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -392,37 +392,37 @@
  "links": [
   {
    "group": "Servers",
-   "link_doctype": "Server",
+   "link_pagetype": "Server",
    "link_fieldname": "virtual_machine"
   },
   {
    "group": "Servers",
-   "link_doctype": "Database Server",
+   "link_pagetype": "Database Server",
    "link_fieldname": "virtual_machine"
   },
   {
    "group": "Servers",
-   "link_doctype": "Proxy Server",
+   "link_pagetype": "Proxy Server",
    "link_fieldname": "virtual_machine"
   },
   {
    "group": "Servers",
-   "link_doctype": "NFS Server",
+   "link_pagetype": "NFS Server",
    "link_fieldname": "virtual_machine"
   },
   {
    "group": "Snapshots",
-   "link_doctype": "Virtual Disk Snapshot",
+   "link_pagetype": "Virtual Disk Snapshot",
    "link_fieldname": "virtual_machine"
   },
   {
    "group": "Snapshots",
-   "link_doctype": "Virtual Machine Image",
+   "link_pagetype": "Virtual Machine Image",
    "link_fieldname": "virtual_machine"
   },
   {
    "group": "Migration",
-   "link_doctype": "Virtual Machine Migration",
+   "link_pagetype": "Virtual Machine Migration",
    "link_fieldname": "virtual_machine"
   }
  ],
diff --git a/press/press/doctype/virtual_machine/virtual_machine.py b/press/press/doctype/virtual_machine/virtual_machine.py
index 07a26973..52b0fd1f 100644
--- a/press/press/doctype/virtual_machine/virtual_machine.py
+++ b/press/press/doctype/virtual_machine/virtual_machine.py
@@ -38,22 +38,22 @@ from oci.core.models import (
 )
 from oci.exceptions import TransientServiceError
 
-from jcloude.overrides import get_permission_query_conditions_for_doctype
-from jcloude.jcloude.doctype.server_activity.server_activity import log_server_activity
+from jcloude.overrides import get_permission_query_conditions_for_pagetype
+from jcloude.jcloude.pagetype.server_activity.server_activity import log_server_activity
 from jcloude.utils import log_error
 from jcloude.utils.jobs import has_job_timeout_exceeded
 
 if typing.TYPE_CHECKING:
-	from jcloude.infrastructure.doctype.virtual_machine_migration.virtual_machine_migration import (
+	from jcloude.infrastructure.pagetype.virtual_machine_migration.virtual_machine_migration import (
 		VirtualMachineMigration,
 	)
-	from jcloude.jcloude.doctype.cluster.cluster import Cluster
-	from jcloude.jcloude.doctype.database_server.database_server import DatabaseServer
-	from jcloude.jcloude.doctype.log_server.log_server import LogServer
-	from jcloude.jcloude.doctype.monitor_server.monitor_server import MonitorServer
-	from jcloude.jcloude.doctype.proxy_server.proxy_server import ProxyServer
-	from jcloude.jcloude.doctype.server.server import Server
-	from jcloude.jcloude.doctype.virtual_disk_snapshot.virtual_disk_snapshot import VirtualDiskSnapshot
+	from jcloude.jcloude.pagetype.cluster.cluster import Cluster
+	from jcloude.jcloude.pagetype.database_server.database_server import DatabaseServer
+	from jcloude.jcloude.pagetype.log_server.log_server import LogServer
+	from jcloude.jcloude.pagetype.monitor_server.monitor_server import MonitorServer
+	from jcloude.jcloude.pagetype.proxy_server.proxy_server import ProxyServer
+	from jcloude.jcloude.pagetype.server.server import Server
+	from jcloude.jcloude.pagetype.virtual_disk_snapshot.virtual_disk_snapshot import VirtualDiskSnapshot
 
 
 server_doctypes = [
@@ -78,10 +78,10 @@ class VirtualMachine(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.virtual_machine_temporary_volume.virtual_machine_temporary_volume import (
+		from jcloude.jcloude.pagetype.virtual_machine_temporary_volume.virtual_machine_temporary_volume import (
 			VirtualMachineTemporaryVolume,
 		)
-		from jcloude.jcloude.doctype.virtual_machine_volume.virtual_machine_volume import VirtualMachineVolume
+		from jcloude.jcloude.pagetype.virtual_machine_volume.virtual_machine_volume import VirtualMachineVolume
 
 		availability_zone: DF.Data
 		cloud_provider: DF.Literal["", "AWS EC2", "OCI", "Hetzner"]
@@ -354,11 +354,11 @@ class VirtualMachine(Document):
 		else:
 			# create a new subscription
 			jingrow.get_pg(
-				doctype="Subscription",
+				pagetype="Subscription",
 				team=server.team,
 				plan_type="Server Storage Plan",
 				plan="Add-on Storage plan",
-				document_type=server.doctype,
+				document_type=server.pagetype,
 				document_name=server.name,
 				additional_storage=increment,
 				enabled=1,
@@ -384,7 +384,7 @@ class VirtualMachine(Document):
 		"""Update subscription record"""
 		server = self.get_server()
 
-		if not server or server.doctype == "NFS Server":
+		if not server or server.pagetype == "NFS Server":
 			return
 
 		server_plan_size = jingrow.db.get_value("Server Plan", server.plan, "disk")
@@ -597,7 +597,7 @@ class VirtualMachine(Document):
 		if not server:
 			return ""
 		log_server, kibana_password = server.get_log_server()
-		cloud_init_template = "jcloude/jcloude/doctype/virtual_machine/cloud-init.yml.jinja2"
+		cloud_init_template = "jcloude/jcloude/pagetype/virtual_machine/cloud-init.yml.jinja2"
 		context = {
 			"server": server,
 			"machine": self.name,
@@ -612,7 +612,7 @@ class VirtualMachine(Document):
 			"filebeat_config": jingrow.render_template(
 				"jcloude/playbooks/roles/filebeat/templates/filebeat.yml",
 				{
-					"server_type": server.doctype,
+					"server_type": server.pagetype,
 					"server": self.name,
 					"log_server": log_server,
 					"kibana_password": kibana_password,
@@ -620,7 +620,7 @@ class VirtualMachine(Document):
 				is_path=True,
 			),
 		}
-		if server.doctype == "Database Server":
+		if server.pagetype == "Database Server":
 			memory = jingrow.db.get_value("Server Plan", server.plan, "memory") or 1024
 			if memory < 1024:
 				jingrow.throw("MariaDB cannot be installed on a server plan with less than 1GB RAM.")
@@ -666,10 +666,10 @@ class VirtualMachine(Document):
 		return jingrow.render_template(cloud_init_template, context, is_path=True)
 
 	def get_server(self):
-		for doctype in server_doctypes:
-			server = jingrow.db.get_value(doctype, {"virtual_machine": self.name}, "name")
+		for pagetype in server_doctypes:
+			server = jingrow.db.get_value(pagetype, {"virtual_machine": self.name}, "name")
 			if server:
-				return jingrow.get_pg(doctype, server)
+				return jingrow.get_pg(pagetype, server)
 		return None
 
 	def get_hetzner_status_map(self):
@@ -851,7 +851,7 @@ class VirtualMachine(Document):
 	@jingrow.whitelist()
 	def sync(self, *args, **kwargs):
 		try:
-			jingrow.db.get_value(self.doctype, self.name, "status", for_update=True)
+			jingrow.db.get_value(self.pagetype, self.name, "status", for_update=True)
 		except jingrow.QueryTimeoutError:  # lock wait timeout
 			return None
 		if self.cloud_provider == "AWS EC2":
@@ -1088,19 +1088,19 @@ class VirtualMachine(Document):
 			"Terminated": "Archived",
 			"Stopped": "Pending",
 		}
-		for doctype in server_doctypes:
-			server = jingrow.get_all(doctype, {"virtual_machine": self.name}, pluck="name")
+		for pagetype in server_doctypes:
+			server = jingrow.get_all(pagetype, {"virtual_machine": self.name}, pluck="name")
 			if server:
 				server = server[0]
-				jingrow.db.set_value(doctype, server, "ip", self.public_ip_address)
-				jingrow.db.set_value(doctype, server, "private_ip", self.private_ip_address)
-				if doctype in ["Server", "Proxy Server"]:
-					jingrow.db.set_value(doctype, server, "is_static_ip", self.is_static_ip)
-				if doctype in ["Server", "Database Server"]:
-					jingrow.db.set_value(doctype, server, "ram", self.ram)
+				jingrow.db.set_value(pagetype, server, "ip", self.public_ip_address)
+				jingrow.db.set_value(pagetype, server, "private_ip", self.private_ip_address)
+				if pagetype in ["Server", "Proxy Server"]:
+					jingrow.db.set_value(pagetype, server, "is_static_ip", self.is_static_ip)
+				if pagetype in ["Server", "Database Server"]:
+					jingrow.db.set_value(pagetype, server, "ram", self.ram)
 				if self.public_ip_address and self.has_value_changed("public_ip_address"):
-					jingrow.get_pg(doctype, server).create_dns_record()
-				jingrow.db.set_value(doctype, server, "status", status_map[self.status])
+					jingrow.get_pg(pagetype, server).create_dns_record()
+				jingrow.db.set_value(pagetype, server, "status", status_map[self.status])
 
 	def update_name_tag(self, name):
 		if self.cloud_provider == "AWS EC2":
@@ -1115,7 +1115,7 @@ class VirtualMachine(Document):
 	def create_image(self, public=True):
 		image = jingrow.get_pg(
 			{
-				"doctype": "Virtual Machine Image",
+				"pagetype": "Virtual Machine Image",
 				"virtual_machine": self.name,
 				"public": public,
 				"has_data_volume": self.has_data_volume,
@@ -1179,7 +1179,7 @@ class VirtualMachine(Document):
 			try:
 				pg = jingrow.get_pg(
 					{
-						"doctype": "Virtual Disk Snapshot",
+						"pagetype": "Virtual Disk Snapshot",
 						"virtual_machine": self.name,
 						"snapshot_id": snapshot["SnapshotId"],
 						"physical_backup": physical_backup,
@@ -1222,7 +1222,7 @@ class VirtualMachine(Document):
 					)
 				pg = jingrow.get_pg(
 					{
-						"doctype": "Virtual Disk Snapshot",
+						"pagetype": "Virtual Disk Snapshot",
 						"virtual_machine": self.name,
 						"snapshot_id": snapshot.id,
 					}
@@ -1406,7 +1406,7 @@ class VirtualMachine(Document):
 	@jingrow.whitelist()
 	def create_server(self, is_secondary: bool = False, primary: str | None = None) -> Server:
 		document = {
-			"doctype": "Server",
+			"pagetype": "Server",
 			"hostname": f"{self.series}{self.index}-{slug(self.cluster)}",
 			"domain": self.domain,
 			"cluster": self.cluster,
@@ -1426,13 +1426,13 @@ class VirtualMachine(Document):
 			document["is_upstream_setup"] = True
 
 		server = jingrow.get_pg(document).insert()
-		jingrow.msgprint(jingrow.get_desk_link(server.doctype, server.name))
+		jingrow.msgprint(jingrow.get_desk_link(server.pagetype, server.name))
 		return server
 
 	@jingrow.whitelist()
 	def create_database_server(self) -> DatabaseServer:
 		document = {
-			"doctype": "Database Server",
+			"pagetype": "Database Server",
 			"hostname": f"{self.series}{self.index}-{slug(self.cluster)}",
 			"domain": self.domain,
 			"cluster": self.cluster,
@@ -1462,7 +1462,7 @@ class VirtualMachine(Document):
 				)
 
 		server = jingrow.get_pg(document).insert()
-		jingrow.msgprint(jingrow.get_desk_link(server.doctype, server.name))
+		jingrow.msgprint(jingrow.get_desk_link(server.pagetype, server.name))
 		return server
 
 	def get_root_domains(self):
@@ -1471,7 +1471,7 @@ class VirtualMachine(Document):
 	@jingrow.whitelist()
 	def create_proxy_server(self) -> ProxyServer:
 		document = {
-			"doctype": "Proxy Server",
+			"pagetype": "Proxy Server",
 			"hostname": f"{self.series}{self.index}-{slug(self.cluster)}",
 			"domain": self.domain,
 			"cluster": self.cluster,
@@ -1485,13 +1485,13 @@ class VirtualMachine(Document):
 			document["is_primary"] = True
 
 		server = jingrow.get_pg(document).insert()
-		jingrow.msgprint(jingrow.get_desk_link(server.doctype, server.name))
+		jingrow.msgprint(jingrow.get_desk_link(server.pagetype, server.name))
 		return server
 
 	@jingrow.whitelist()
 	def create_monitor_server(self) -> MonitorServer:
 		document = {
-			"doctype": "Monitor Server",
+			"pagetype": "Monitor Server",
 			"hostname": f"{self.series}{self.index}-{slug(self.cluster)}",
 			"domain": self.domain,
 			"cluster": self.cluster,
@@ -1503,13 +1503,13 @@ class VirtualMachine(Document):
 			document["is_server_setup"] = True
 
 		server = jingrow.get_pg(document).insert()
-		jingrow.msgprint(jingrow.get_desk_link(server.doctype, server.name))
+		jingrow.msgprint(jingrow.get_desk_link(server.pagetype, server.name))
 		return server
 
 	@jingrow.whitelist()
 	def create_log_server(self) -> LogServer:
 		document = {
-			"doctype": "Log Server",
+			"pagetype": "Log Server",
 			"hostname": f"{self.series}{self.index}-{slug(self.cluster)}",
 			"domain": self.domain,
 			"cluster": self.cluster,
@@ -1521,13 +1521,13 @@ class VirtualMachine(Document):
 			document["is_server_setup"] = True
 
 		server = jingrow.get_pg(document).insert()
-		jingrow.msgprint(jingrow.get_desk_link(server.doctype, server.name))
+		jingrow.msgprint(jingrow.get_desk_link(server.pagetype, server.name))
 		return server
 
 	@jingrow.whitelist()
 	def create_registry_server(self):
 		document = {
-			"doctype": "Registry Server",
+			"pagetype": "Registry Server",
 			"hostname": f"{self.series}{self.index}-{slug(self.cluster)}",
 			"domain": self.domain,
 			"cluster": self.cluster,
@@ -1539,7 +1539,7 @@ class VirtualMachine(Document):
 			document["is_server_setup"] = True
 
 		server = jingrow.get_pg(document).insert()
-		jingrow.msgprint(jingrow.get_desk_link(server.doctype, server.name))
+		jingrow.msgprint(jingrow.get_desk_link(server.pagetype, server.name))
 		return server
 
 	def get_security_groups(self):
@@ -1915,7 +1915,7 @@ class VirtualMachine(Document):
 
 	def get_next_volume_device_name(self):
 		# Hold the lock, so that we dont allocate same device name to multiple volumes
-		jingrow.db.get_value(self.doctype, self.name, "status", for_update=True)
+		jingrow.db.get_value(self.pagetype, self.name, "status", for_update=True)
 		# First volume starts from /dev/sdf
 		used_devices = {v.device for v in self.volumes} | {v.device for v in self.temporary_volumes}
 		for i in range(5, 26):  # 'f' to 'z'
@@ -1997,7 +1997,7 @@ class VirtualMachine(Document):
 		self.sync()
 
 
-get_permission_query_conditions = get_permission_query_conditions_for_doctype("Virtual Machine")
+get_permission_query_conditions = get_permission_query_conditions_for_pagetype("Virtual Machine")
 
 
 def sync_virtual_machines_hetzner():
diff --git a/press/press/doctype/virtual_machine/virtual_machine_list.js b/press/press/doctype/virtual_machine/virtual_machine_list.js
index 0ebc47a3..bbbb0ea1 100644
--- a/press/press/doctype/virtual_machine/virtual_machine_list.js
+++ b/press/press/doctype/virtual_machine/virtual_machine_list.js
@@ -3,7 +3,7 @@ jingrow.listview_settings['Virtual Machine'] = {
 		list.page.add_menu_item(__('Sync'), function () {
 			jingrow.call({
 				method:
-					'jcloude.jcloude.doctype.virtual_machine.virtual_machine.sync_virtual_machines',
+					'jcloude.jcloude.pagetype.virtual_machine.virtual_machine.sync_virtual_machines',
 				callback: function () {
 					listview.refresh();
 				},
diff --git a/press/press/doctype/virtual_machine_image/patches/rename_aws_fields.py b/press/press/doctype/virtual_machine_image/patches/rename_aws_fields.py
index 9c95d142..6a9a220f 100644
--- a/press/press/doctype/virtual_machine_image/patches/rename_aws_fields.py
+++ b/press/press/doctype/virtual_machine_image/patches/rename_aws_fields.py
@@ -6,7 +6,7 @@ from jingrow.model.utils.rename_field import rename_field
 
 
 def execute():
-	jingrow.reload_doctype("Virtual Machine Image")
+	jingrow.reload_pagetype("Virtual Machine Image")
 	rename_field("Virtual Machine Image", "aws_instance_id", "instance_id")
 	rename_field("Virtual Machine Image", "aws_ami_id", "image_id")
 	rename_field("Virtual Machine Image", "aws_snapshot_id", "snapshot_id")
diff --git a/press/press/doctype/virtual_machine_image/test_virtual_machine_image.py b/press/press/doctype/virtual_machine_image/test_virtual_machine_image.py
index 7c2e368e..5b806df4 100644
--- a/press/press/doctype/virtual_machine_image/test_virtual_machine_image.py
+++ b/press/press/doctype/virtual_machine_image/test_virtual_machine_image.py
@@ -8,13 +8,13 @@ from unittest.mock import MagicMock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.cluster.test_cluster import create_test_cluster
-from jcloude.jcloude.doctype.virtual_machine_image.virtual_machine_image import (
+from jcloude.jcloude.pagetype.cluster.test_cluster import create_test_cluster
+from jcloude.jcloude.pagetype.virtual_machine_image.virtual_machine_image import (
 	VirtualMachineImage,
 )
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.cluster.cluster import Cluster
+	from jcloude.jcloude.pagetype.cluster.cluster import Cluster
 
 
 @patch.object(VirtualMachineImage, "client", new=MagicMock())
@@ -27,7 +27,7 @@ def create_test_virtual_machine_image(
 		ip = jingrow.mock("ipv4")
 	if not cluster:
 		cluster = create_test_cluster()
-	from jcloude.jcloude.doctype.virtual_machine.test_virtual_machine import (
+	from jcloude.jcloude.pagetype.virtual_machine.test_virtual_machine import (
 		create_test_virtual_machine,
 	)
 
@@ -35,7 +35,7 @@ def create_test_virtual_machine_image(
 
 	return jingrow.get_pg(
 		{
-			"doctype": "Virtual Machine Image",
+			"pagetype": "Virtual Machine Image",
 			"virtual_machine": vm.name,
 			"region": vm.region,
 			"status": "Available",
diff --git a/press/press/doctype/virtual_machine_image/virtual_machine_image.json b/press/press/doctype/virtual_machine_image/virtual_machine_image.json
index 39d1f6aa..dc270dc8 100644
--- a/press/press/doctype/virtual_machine_image/virtual_machine_image.json
+++ b/press/press/doctype/virtual_machine_image/virtual_machine_image.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-08-30 12:16:32.761458",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/virtual_machine_image/virtual_machine_image.py b/press/press/doctype/virtual_machine_image/virtual_machine_image.py
index ef9614dd..660b01b3 100644
--- a/press/press/doctype/virtual_machine_image/virtual_machine_image.py
+++ b/press/press/doctype/virtual_machine_image/virtual_machine_image.py
@@ -27,7 +27,7 @@ class VirtualMachineImage(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.virtual_machine_image_volume.virtual_machine_image_volume import (
+		from jcloude.jcloude.pagetype.virtual_machine_image_volume.virtual_machine_image_volume import (
 			VirtualMachineImageVolume,
 		)
 
@@ -271,7 +271,7 @@ class VirtualMachineImage(Document):
 	def get_available_for_series(
 		cls, series: str, region: str | None = None, platform: str | None = None
 	) -> str | None:
-		images = jingrow.qb.DocType(cls.DOCTYPE)
+		images = jingrow.qb.PageType(cls.DOCTYPE)
 		get_available_images = (
 			jingrow.qb.from_(images)
 			.select("name")
diff --git a/press/press/doctype/virtual_machine_image_volume/virtual_machine_image_volume.json b/press/press/doctype/virtual_machine_image_volume/virtual_machine_image_volume.json
index d14d1f9e..cd0512f0 100644
--- a/press/press/doctype/virtual_machine_image_volume/virtual_machine_image_volume.json
+++ b/press/press/doctype/virtual_machine_image_volume/virtual_machine_image_volume.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2024-09-25 14:07:29.049839",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.json b/press/press/doctype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.json
index ab7e0cbf..32e40366 100644
--- a/press/press/doctype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.json
+++ b/press/press/doctype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-01-15 11:46:59.223545",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/virtual_machine_volume/patches/rename_aws_fields.py b/press/press/doctype/virtual_machine_volume/patches/rename_aws_fields.py
index a06c1997..72d4d075 100644
--- a/press/press/doctype/virtual_machine_volume/patches/rename_aws_fields.py
+++ b/press/press/doctype/virtual_machine_volume/patches/rename_aws_fields.py
@@ -6,5 +6,5 @@ from jingrow.model.utils.rename_field import rename_field
 
 
 def execute():
-	jingrow.reload_doctype("Virtual Machine Volume")
+	jingrow.reload_pagetype("Virtual Machine Volume")
 	rename_field("Virtual Machine Volume", "aws_volume_id", "volume_id")
diff --git a/press/press/doctype/virtual_machine_volume/virtual_machine_volume.json b/press/press/doctype/virtual_machine_volume/virtual_machine_volume.json
index bdcefe00..2daac340 100644
--- a/press/press/doctype/virtual_machine_volume/virtual_machine_volume.json
+++ b/press/press/doctype/virtual_machine_volume/virtual_machine_volume.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-06-28 21:42:34.933564",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/wireguard_peer/wireguard_peer.json b/press/press/doctype/wireguard_peer/wireguard_peer.json
index 48727d7a..b7a1c5d0 100644
--- a/press/press/doctype/wireguard_peer/wireguard_peer.json
+++ b/press/press/doctype/wireguard_peer/wireguard_peer.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2023-08-07 17:54:33.377864",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/press/doctype/wireguard_peer/wireguard_peer.py b/press/press/doctype/wireguard_peer/wireguard_peer.py
index edb0f6a3..ef74a38d 100644
--- a/press/press/doctype/wireguard_peer/wireguard_peer.py
+++ b/press/press/doctype/wireguard_peer/wireguard_peer.py
@@ -179,7 +179,7 @@ class WireguardPeer(Document):
 			],
 		}
 		outputText = jingrow.render_template(
-			"jcloude/doctype/wireguard_peer/templates/wg0.conf", variables, is_path=True
+			"jcloude/pagetype/wireguard_peer/templates/wg0.conf", variables, is_path=True
 		)
 		self.peer_config = outputText
 		self.save()
diff --git a/press/press/report/agent_versions/agent_versions.json b/press/press/report/agent_versions/agent_versions.json
index 5e30d5c5..727472ee 100644
--- a/press/press/report/agent_versions/agent_versions.json
+++ b/press/press/report/agent_versions/agent_versions.json
@@ -4,7 +4,7 @@
  "creation": "2023-01-30 17:16:09.288587",
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [
   {
    "fieldname": "server_type",
@@ -55,7 +55,7 @@
  "name": "Agent Versions",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Server",
+ "ref_pagetype": "Server",
  "report_name": "Agent Versions",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/agent_versions/agent_versions.py b/press/press/report/agent_versions/agent_versions.py
index 8927ef91..2b498b63 100644
--- a/press/press/report/agent_versions/agent_versions.py
+++ b/press/press/report/agent_versions/agent_versions.py
@@ -23,7 +23,7 @@ def execute(filters=None):
 			"fieldname": "server_type",
 			"label": jingrow._("Server Type"),
 			"fieldtype": "Link",
-			"options": "DocType",
+			"options": "PageType",
 			"width": 140,
 		},
 		{
diff --git a/press/press/report/aws_instance_pricing/aws_instance_pricing.json b/press/press/report/aws_instance_pricing/aws_instance_pricing.json
index 51d779b9..cf109707 100644
--- a/press/press/report/aws_instance_pricing/aws_instance_pricing.json
+++ b/press/press/report/aws_instance_pricing/aws_instance_pricing.json
@@ -102,7 +102,7 @@
  "creation": "2022-09-19 17:12:10.701432",
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [
   {
    "fieldname": "cluster",
@@ -147,7 +147,7 @@
  "name": "AWS Instance Pricing",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Cluster",
+ "ref_pagetype": "Cluster",
  "report_name": "AWS Instance Pricing",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json b/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json
index acad9042..b9076929 100644
--- a/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json
+++ b/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json
@@ -99,7 +99,7 @@
    "fieldname": "server_type",
    "fieldtype": "Link",
    "label": "Server Type",
-   "options": "DocType",
+   "options": "PageType",
    "width": 0
   },
   {
@@ -133,7 +133,7 @@
  "creation": "2024-09-10 15:22:38.545636",
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [
   {
    "default": "Compute",
@@ -164,7 +164,7 @@
  "name": "AWS Rightsizing Recommendation",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Virtual Machine",
+ "ref_pagetype": "Virtual Machine",
  "report_name": "AWS Rightsizing Recommendation",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/bench_memory_limits/bench_memory_limits.json b/press/press/report/bench_memory_limits/bench_memory_limits.json
index 4d3c3bc1..1110587c 100644
--- a/press/press/report/bench_memory_limits/bench_memory_limits.json
+++ b/press/press/report/bench_memory_limits/bench_memory_limits.json
@@ -4,7 +4,7 @@
  "creation": "2023-10-17 19:23:39.391050",
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [
   {
    "fieldname": "server",
@@ -26,7 +26,7 @@
  "owner": "Administrator",
  "prepared_report": 0,
  "query": "\t\tbench_workloads = {}\n\t\tbenches = jingrow.get_all(\n\t\t\t\"Bench\",\n\t\t\tfilters={\"server\": self.name, \"status\": \"Active\", \"auto_scale_workers\": True},\n\t\t\tpluck=\"name\",\n\t\t)\n\t\tfor bench_name in benches:\n\t\t\tbench = jingrow.get_pg(\"Bench\", bench_name)\n\t\t\tbench_workloads[bench_name] = bench.work_load\n\n\t\ttotal_workload = sum(bench_workloads.values())\n",
- "ref_doctype": "Bench",
+ "ref_pagetype": "Bench",
  "report_name": "Bench Memory Limits",
  "report_script": "",
  "report_type": "Script Report",
diff --git a/press/press/report/binary_log_browser/binary_log_browser.json b/press/press/report/binary_log_browser/binary_log_browser.json
index 740108e5..79388afd 100644
--- a/press/press/report/binary_log_browser/binary_log_browser.json
+++ b/press/press/report/binary_log_browser/binary_log_browser.json
@@ -5,7 +5,7 @@
  "disable_prepared_report": 0,
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [],
  "idx": 0,
  "is_standard": "Yes",
@@ -15,7 +15,7 @@
  "name": "Binary Log Browser",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Site",
+ "ref_pagetype": "Site",
  "report_name": "Binary Log Browser",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/binary_log_browser/binary_log_browser.py b/press/press/report/binary_log_browser/binary_log_browser.py
index 6eec1af3..2b2f1fc0 100644
--- a/press/press/report/binary_log_browser/binary_log_browser.py
+++ b/press/press/report/binary_log_browser/binary_log_browser.py
@@ -5,7 +5,7 @@ from __future__ import annotations
 import jingrow
 import pytz
 import sqlparse
-from jingrow.core.doctype.access_log.access_log import make_access_log
+from jingrow.core.pagetype.access_log.access_log import make_access_log
 from jingrow.utils import (
 	get_datetime,
 	get_datetime_str,
@@ -25,7 +25,7 @@ def execute(filters=None):
 	filters.database = jingrow.get_pg("Site", filters.site).fetch_info()["config"]["db_name"]
 
 	make_access_log(
-		doctype="Site",
+		pagetype="Site",
 		document=filters.site,
 		file_type="Binary Log",
 		report_name="Binary Log Browser",
diff --git a/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json b/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json
index 66807bc2..a44e5cee 100644
--- a/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json
+++ b/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json
@@ -4,7 +4,7 @@
  "creation": "2023-05-18 21:37:22.195557",
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [],
  "idx": 0,
  "is_standard": "Yes",
@@ -14,7 +14,7 @@
  "name": "MariaDB Deadlock Browser",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Site",
+ "ref_pagetype": "Site",
  "report_name": "MariaDB Deadlock Browser",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.py b/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.py
index 70a78758..a0e2ae80 100644
--- a/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.py
+++ b/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.py
@@ -9,7 +9,7 @@ from typing import TYPE_CHECKING
 
 import jingrow
 from elasticsearch import Elasticsearch
-from jingrow.core.doctype.access_log.access_log import make_access_log
+from jingrow.core.pagetype.access_log.access_log import make_access_log
 from jingrow.utils import get_datetime
 from jingrow.utils.password import get_decrypted_password
 
@@ -252,11 +252,11 @@ def execute(filters=None):
 	filters.database = jingrow.db.get_value("Site", filters.site, "database_name")
 	if not filters.database:
 		jingrow.throw(
-			f"Database name not found for site {filters.site}\nRun `Sync Info` from Site doctype actions to set the database name.\nThen retry again."
+			f"Database name not found for site {filters.site}\nRun `Sync Info` from Site pagetype actions to set the database name.\nThen retry again."
 		)
 
 	make_access_log(
-		doctype="Site",
+		pagetype="Site",
 		document=filters.site,
 		file_type="MariaDB Deadlock Browser",
 		report_name="MariaDB Deadlock Browser",
diff --git a/press/press/report/mariadb_locks_list/mariadb_locks_list.json b/press/press/report/mariadb_locks_list/mariadb_locks_list.json
index 8fc6897e..1c0068eb 100644
--- a/press/press/report/mariadb_locks_list/mariadb_locks_list.json
+++ b/press/press/report/mariadb_locks_list/mariadb_locks_list.json
@@ -4,7 +4,7 @@
  "creation": "2024-03-24 11:50:26.510957",
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [
   {
    "fieldname": "database_server",
@@ -32,7 +32,7 @@
  "name": "MariaDB Locks List",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Site",
+ "ref_pagetype": "Site",
  "report_name": "MariaDB Locks List",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/mariadb_process_list/mariadb_process_list.json b/press/press/report/mariadb_process_list/mariadb_process_list.json
index 421ac145..8c541823 100644
--- a/press/press/report/mariadb_process_list/mariadb_process_list.json
+++ b/press/press/report/mariadb_process_list/mariadb_process_list.json
@@ -5,7 +5,7 @@
  "disable_prepared_report": 0,
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [
   {
    "fieldname": "database_server",
@@ -24,7 +24,7 @@
  "name": "MariaDB Process List",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Site",
+ "ref_pagetype": "Site",
  "report_name": "MariaDB Process List",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/mariadb_slow_queries/mariadb_slow_queries.json b/press/press/report/mariadb_slow_queries/mariadb_slow_queries.json
index c7fd901c..70006fd7 100644
--- a/press/press/report/mariadb_slow_queries/mariadb_slow_queries.json
+++ b/press/press/report/mariadb_slow_queries/mariadb_slow_queries.json
@@ -4,7 +4,7 @@
  "creation": "2024-12-23 11:36:40.301426",
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [],
  "idx": 0,
  "is_standard": "Yes",
@@ -15,7 +15,7 @@
  "name": "MariaDB Slow Queries",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Site",
+ "ref_pagetype": "Site",
  "report_name": "MariaDB Slow Queries",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/mariadb_slow_queries/mariadb_slow_queries.py b/press/press/report/mariadb_slow_queries/mariadb_slow_queries.py
index 6926c9a7..e9ef2f02 100644
--- a/press/press/report/mariadb_slow_queries/mariadb_slow_queries.py
+++ b/press/press/report/mariadb_slow_queries/mariadb_slow_queries.py
@@ -9,7 +9,7 @@ from collections import defaultdict
 import jingrow
 import requests
 import sqlparse
-from jingrow.core.doctype.access_log.access_log import make_access_log
+from jingrow.core.pagetype.access_log.access_log import make_access_log
 from jingrow.utils import convert_utc_to_timezone, get_system_timezone
 from jingrow.utils.password import get_decrypted_password
 
@@ -19,7 +19,7 @@ def execute(filters=None):
 	filters.database = jingrow.db.get_value("Site", filters.site, "database_name")
 
 	make_access_log(
-		doctype="Site",
+		pagetype="Site",
 		document=filters.site,
 		file_type="MariaDB Slow Query",
 		report_name="MariaDB Slow Queries",
@@ -188,5 +188,5 @@ def summarize_by_query(data):
 	return result
 
 
-def get_doctype_name(table_name: str) -> str:
+def get_pagetype_name(table_name: str) -> str:
 	return table_name.removeprefix("tab")
diff --git a/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json b/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json
index 30354917..99796d42 100644
--- a/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json
+++ b/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json
@@ -4,7 +4,7 @@
  "creation": "2025-01-21 17:35:11.471086",
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [],
  "idx": 0,
  "is_standard": "Yes",
@@ -16,7 +16,7 @@
  "owner": "Administrator",
  "prepared_report": 1,
  "query": "SELECT \n    ma.name AS app_name,\n    mav.version AS version,\n    mav.source AS source,\n    asrc.repository_url AS repository_url,\n    asrc.branch AS branch\nFROM \n    `tabMarketplace App` ma\nJOIN \n    `tabMarketplace App Version` mav ON ma.name = mav.parent\nJOIN \n    `tabApp Source` asrc ON mav.source = asrc.name\n",
- "ref_doctype": "Marketplace App",
+ "ref_pagetype": "Marketplace App",
  "report_name": "Marketplace App Repository Visibility",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/payment_partner/payment_partner.json b/press/press/report/payment_partner/payment_partner.json
index 5dce01e0..59d2a20a 100644
--- a/press/press/report/payment_partner/payment_partner.json
+++ b/press/press/report/payment_partner/payment_partner.json
@@ -4,7 +4,7 @@
  "creation": "2024-11-25 15:50:14.609170",
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [],
  "idx": 0,
  "is_standard": "Yes",
@@ -15,7 +15,7 @@
  "name": "Payment Partner",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Payment Partner Transaction",
+ "ref_pagetype": "Payment Partner Transaction",
  "report_name": "Payment Partner",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/payment_partner/payment_partner.py b/press/press/report/payment_partner/payment_partner.py
index b1e17f3e..bdfe20fe 100644
--- a/press/press/report/payment_partner/payment_partner.py
+++ b/press/press/report/payment_partner/payment_partner.py
@@ -80,7 +80,7 @@ def get_data(filters):
 	if filters.from_date > filters.to_date:
 		jingrow.throw(_("From Date cannot be after To Date"))
 
-	payment_record = jingrow.qb.DocType("Payment Partner Transaction")
+	payment_record = jingrow.qb.PageType("Payment Partner Transaction")
 
 	query = (
 		jingrow.qb.from_(payment_record)
diff --git a/press/press/report/press_endpoints_audit/press_endpoints_audit.json b/press/press/report/press_endpoints_audit/press_endpoints_audit.json
index 11ecf740..01b40f9c 100644
--- a/press/press/report/press_endpoints_audit/press_endpoints_audit.json
+++ b/press/press/report/press_endpoints_audit/press_endpoints_audit.json
@@ -5,7 +5,7 @@
  "creation": "2025-08-29 19:46:24.442646",
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [],
  "idx": 0,
  "is_standard": "Yes",
@@ -16,7 +16,7 @@
  "name": "Jcloude Endpoints Audit",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Site",
+ "ref_pagetype": "Site",
  "report_name": "Jcloude Endpoints Audit",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/server_stats/server_stats.json b/press/press/report/server_stats/server_stats.json
index edcb4dfc..2423088f 100644
--- a/press/press/report/server_stats/server_stats.json
+++ b/press/press/report/server_stats/server_stats.json
@@ -4,7 +4,7 @@
  "creation": "2022-12-15 09:04:10.284944",
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [
   {
    "fieldname": "team",
@@ -38,7 +38,7 @@
  "name": "Server Stats",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Server",
+ "ref_pagetype": "Server",
  "report_name": "Server Stats",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/report/server_stats/server_stats.py b/press/press/report/server_stats/server_stats.py
index dc0f261a..b9dd60e9 100644
--- a/press/press/report/server_stats/server_stats.py
+++ b/press/press/report/server_stats/server_stats.py
@@ -21,7 +21,7 @@ def execute(filters=None):
 			"fieldname": "server_type",
 			"label": jingrow._("Server Type"),
 			"fieldtype": "Link",
-			"options": "DocType",
+			"options": "PageType",
 			"width": 200,
 		},
 		{
diff --git a/press/press/report/shared_app_server_stats/shared_app_server_stats.json b/press/press/report/shared_app_server_stats/shared_app_server_stats.json
index cf9d0146..4898ffb9 100644
--- a/press/press/report/shared_app_server_stats/shared_app_server_stats.json
+++ b/press/press/report/shared_app_server_stats/shared_app_server_stats.json
@@ -5,7 +5,7 @@
  "disable_prepared_report": 1,
  "disabled": 0,
  "docstatus": 0,
- "doctype": "Report",
+ "pagetype": "Report",
  "filters": [],
  "idx": 0,
  "is_standard": "Yes",
@@ -15,7 +15,7 @@
  "name": "Shared App Server Stats",
  "owner": "Administrator",
  "prepared_report": 0,
- "ref_doctype": "Server",
+ "ref_pagetype": "Server",
  "report_name": "Shared App Server Stats",
  "report_type": "Script Report",
  "roles": [
diff --git a/press/press/workspace/press/press.json b/press/press/workspace/press/press.json
index d8084495..7c291a91 100644
--- a/press/press/workspace/press/press.json
+++ b/press/press/workspace/press/press.json
@@ -4,7 +4,7 @@
  "creation": "2024-07-30 18:43:18.421196",
  "custom_blocks": [],
  "docstatus": 0,
- "doctype": "Workspace",
+ "pagetype": "Workspace",
  "for_user": "",
  "hide_custom": 0,
  "icon": "tool",
@@ -31,7 +31,7 @@
    "label": "Root Domain",
    "link_to": "Root Domain",
    "stats_filter": "[]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Grey",
@@ -39,7 +39,7 @@
    "label": "Agent Job",
    "link_to": "Agent Job",
    "stats_filter": "[]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -47,7 +47,7 @@
    "label": "Server Plan",
    "link_to": "Server Plan",
    "stats_filter": "[[\"Server Plan\",\"enabled\",\"=\",1,false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Grey",
@@ -55,7 +55,7 @@
    "label": "Ansible Play",
    "link_to": "Ansible Play",
    "stats_filter": "[]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -63,7 +63,7 @@
    "label": "Team",
    "link_to": "Team",
    "stats_filter": "[[\"Team\",\"enabled\",\"=\",1,false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Grey",
@@ -71,7 +71,7 @@
    "label": "Jcloude Job",
    "link_to": "Jcloude Job",
    "stats_filter": "[]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -80,7 +80,7 @@
    "label": "Active Sites",
    "link_to": "Site",
    "stats_filter": "[[\"Site\",\"status\",\"=\",\"Active\",false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -88,7 +88,7 @@
    "label": "Site Plan",
    "link_to": "Site Plan",
    "stats_filter": "[[\"Site Plan\",\"enabled\",\"=\",1,false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -96,7 +96,7 @@
    "label": "Active Benches",
    "link_to": "Bench",
    "stats_filter": "[[\"Bench\",\"status\",\"=\",\"Active\",false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -104,7 +104,7 @@
    "label": "Subscription",
    "link_to": "Subscription",
    "stats_filter": "[]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -112,7 +112,7 @@
    "label": "Tls Certificate",
    "link_to": "TLS Certificate",
    "stats_filter": "[[\"TLS Certificate\",\"status\",\"=\",\"Active\",false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Grey",
@@ -120,7 +120,7 @@
    "label": "Invoice",
    "link_to": "Invoice",
    "stats_filter": "[]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Red",
@@ -129,7 +129,7 @@
    "label": "Broken Sites",
    "link_to": "Site",
    "stats_filter": "[[\"Site\",\"status\",\"=\",\"Broken\",false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Red",
@@ -137,7 +137,7 @@
    "label": "Broken Benches",
    "link_to": "Bench",
    "stats_filter": "[[\"Bench\",\"status\",\"=\",\"Broken\",false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Grey",
@@ -145,7 +145,7 @@
    "label": "App",
    "link_to": "App",
    "stats_filter": "[]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Yellow",
@@ -154,7 +154,7 @@
    "label": "Pending Sites",
    "link_to": "Site",
    "stats_filter": "[[\"Site\",\"status\",\"=\",\"Pending\",false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -162,7 +162,7 @@
    "label": "Application Server",
    "link_to": "Server",
    "stats_filter": "[[\"Server\",\"status\",\"=\",\"Active\",false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -170,7 +170,7 @@
    "label": "App Source",
    "link_to": "App Source",
    "stats_filter": "[]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Grey",
@@ -179,7 +179,7 @@
    "label": "Suspended Sites",
    "link_to": "Site",
    "stats_filter": "[[\"Site\",\"status\",\"=\",\"Suspended\",false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -187,7 +187,7 @@
    "label": "Database Server",
    "link_to": "Database Server",
    "stats_filter": "[[\"Database Server\",\"status\",\"=\",\"Active\",false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Grey",
@@ -195,7 +195,7 @@
    "label": "App Release",
    "link_to": "App Release",
    "stats_filter": "[]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -203,7 +203,7 @@
    "label": "Proxy Server",
    "link_to": "Proxy Server",
    "stats_filter": "[[\"Proxy Server\",\"status\",\"=\",\"Active\",false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Green",
@@ -211,14 +211,14 @@
    "label": "Hybrid Servers",
    "link_to": "Self Hosted Server",
    "stats_filter": "[[\"Self Hosted Server\",\"status\",\"=\",\"Active\",false]]",
-   "type": "DocType"
+   "type": "PageType"
   },
   {
    "color": "Grey",
    "pg_view": "List",
    "label": "Jcloude Settings",
    "link_to": "Jcloude Settings",
-   "type": "DocType"
+   "type": "PageType"
   }
  ],
  "title": "Jcloude"
diff --git a/press/runner.py b/press/runner.py
index 529a65a4..4d446d78 100644
--- a/press/runner.py
+++ b/press/runner.py
@@ -22,11 +22,11 @@ from jingrow.model.document import Document
 from jingrow.utils import cstr
 from jingrow.utils import now_datetime as now
 
-from jcloude.jcloude.doctype.ansible_play.ansible_play import AnsiblePlay
+from jcloude.jcloude.pagetype.ansible_play.ansible_play import AnsiblePlay
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-	from jcloude.jcloude.doctype.virtual_machine.virtual_machine import VirtualMachine
+	from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+	from jcloude.jcloude.pagetype.virtual_machine.virtual_machine import VirtualMachine
 
 
 def reconnect_on_failure():
@@ -133,7 +133,7 @@ class AnsibleCallback(CallbackBase):
 		jingrow.publish_realtime(
 			"ansible_play_progress",
 			{"progress": self.task_list.index(task), "total": len(self.task_list), "play": self.play},
-			doctype="Ansible Play",
+			pagetype="Ansible Play",
 			docname=self.play,
 			user=jingrow.session.user,
 		)
@@ -263,8 +263,8 @@ class Ansible:
 		play = playbook.get_plays()[0]
 		play_pg = jingrow.get_pg(
 			{
-				"doctype": "Ansible Play",
-				"server_type": self.server.doctype,
+				"pagetype": "Ansible Play",
+				"server_type": self.server.pagetype,
 				"server": self.server.name,
 				"variables": json.dumps(self.variables, indent=4),
 				"playbook": self.playbook,
@@ -279,7 +279,7 @@ class Ansible:
 				for task in block.block:
 					task_pg = jingrow.get_pg(
 						{
-							"doctype": "Ansible Task",
+							"pagetype": "Ansible Task",
 							"play": self.play,
 							"role": role.get_name(),
 							"task": task.name,
@@ -312,7 +312,7 @@ class GenericStep(Document):
 class StepHandler:
 	save: Callable
 	reload: Callable
-	doctype: str
+	pagetype: str
 	name: str
 
 	def handle_vm_status_job(
@@ -444,7 +444,7 @@ class StepHandler:
 
 		# After step completes, queue the next step
 		jingrow.enqueue_pg(
-			self.doctype,
+			self.pagetype,
 			self.name,
 			"_execute_steps",
 			steps=steps,
diff --git a/press/saas/README.md b/press/saas/README.md
index 759b9521..3815f4c3 100644
--- a/press/saas/README.md
+++ b/press/saas/README.md
@@ -7,11 +7,11 @@ It has 2 doctypes.
 
 #### How to know, which site is available for allocation to user ?
 
-In **Site** doctype, there will be a field `standby_for_product`, this field should have the link to the product trial (e.g. erpnext, crm)
+In **Site** pagetype, there will be a field `standby_for_product`, this field should have the link to the product trial (e.g. erpnext, crm)
 If `is_standby` field is checked, that site can be allocated to a user.
 
 #### Configure a new Product Trial
-- Create a new record in `Product Trial` doctype
+- Create a new record in `Product Trial` pagetype
 - **Details Tab**
   - **Name** - should be a unique one and will be used as a id in signup/login flows. e.g. For `Jingrow CRM` it could be `crm`
   - **Published**, **Title**, **Logo**,  **Domain**, **Release Group**, **Trial Duration (days)**, **Trial Plan** - as the name implies, all fields are mandatory.
@@ -21,7 +21,7 @@ If `is_standby` field is checked, that site can be allocated to a user.
   - **Standby Pool Size** - The total number of sites that will be maintained in the pool.
   - **Standby Queue Size** - Number of standby sites that will be queued at a time.
 - **Sign-up Details Tab**
-  - **Sign-up Fields** - If you need some information from user at the time of sign-up, you can configure this. Check the field description of this field in doctype.
+  - **Sign-up Fields** - If you need some information from user at the time of sign-up, you can configure this. Check the field description of this field in pagetype.
   - **E-mail Account** - If you want to use some specific e-mail account for the saas sign-up, you can configure it here
   - **E-mail Full Logo** - This logo will be sent in verification e-mails.
   - **E-mail Subject** - Subject of verification e-mail. You can put `{otp}` to insert the value in subject. Example - `{otp} - OTP for CRM Registration`
@@ -34,7 +34,7 @@ If `is_standby` field is checked, that site can be allocated to a user.
   - **Setup Wizard Completion Mode** - 
     - **auto** - setup wizard of site will be completed in background and after signup + setup, user will get direct access to desk or portal of app
     - **manual** - after signup, user will be logged in to the site and user need to complete the setup wizard of framework
-  - **Setup Wizard Payload Generator Script** [only for **auto** mode] - Check the field description in doctype.
+  - **Setup Wizard Payload Generator Script** [only for **auto** mode] - Check the field description in pagetype.
 
     Sample Payload Script - 
     ```python
diff --git a/press/saas/api/auth.py b/press/saas/api/auth.py
index 3493846c..9cc6b1c8 100644
--- a/press/saas/api/auth.py
+++ b/press/saas/api/auth.py
@@ -8,7 +8,7 @@ from jcloude.saas.api import whitelist_saas_api
 
 @whitelist_saas_api
 def generate_access_token():
-	from jcloude.saas.doctype.site_access_token.site_access_token import SiteAccessToken
+	from jcloude.saas.pagetype.site_access_token.site_access_token import SiteAccessToken
 
 	return SiteAccessToken.generate(jingrow.local.site_name)
 
diff --git a/press/saas/api/readme.md b/press/saas/api/readme.md
index d2f8c028..26477ae6 100644
--- a/press/saas/api/readme.md
+++ b/press/saas/api/readme.md
@@ -58,8 +58,8 @@ X-Site-Access-Token: fbk23eva6k:3e2882eff23d4145ddfefaebf5ac6135
   | ---- | ---- | ----------- |
   | Variable | jingrow.local.site_name | Site name |
   | Variable | jingrow.local.team_name | Current team name |
-  | Function | jingrow.local.get_site() -> Site | Fetch current site doctype record |
-  | Function | jingrow.local.get_team() -> Team | Fetch current team doctype record |
+  | Function | jingrow.local.get_site() -> Site | Fetch current site pagetype record |
+  | Function | jingrow.local.get_team() -> Team | Fetch current team pagetype record |
   | Variable (Additional) | jingrow.session.user | Logged in user name, This will be also available as we have set `team.user` to logged in user |
 - Sample Code
   ```python
diff --git a/press/saas/doctype/account_request_rules/account_request_rules.json b/press/saas/doctype/account_request_rules/account_request_rules.json
index 4dcafdd8..412d484a 100644
--- a/press/saas/doctype/account_request_rules/account_request_rules.json
+++ b/press/saas/doctype/account_request_rules/account_request_rules.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-07-28 13:08:17.195774",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/hybrid_pool_item/hybrid_pool_item.json b/press/saas/doctype/hybrid_pool_item/hybrid_pool_item.json
index 6ea6cd60..73a22171 100644
--- a/press/saas/doctype/hybrid_pool_item/hybrid_pool_item.json
+++ b/press/saas/doctype/hybrid_pool_item/hybrid_pool_item.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2025-05-22 11:45:09.986862",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/hybrid_saas_pool/hybrid_saas_pool.json b/press/saas/doctype/hybrid_saas_pool/hybrid_saas_pool.json
index 918b6af8..16576a6a 100644
--- a/press/saas/doctype/hybrid_saas_pool/hybrid_saas_pool.json
+++ b/press/saas/doctype/hybrid_saas_pool/hybrid_saas_pool.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format:HYBRID-SAAS-POOL-{app}-{#####}",
  "creation": "2022-07-28 13:08:23.409352",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/product_trial/patches/rename_saas_product_doctypes_to_product_trial.py b/press/saas/doctype/product_trial/patches/rename_saas_product_doctypes_to_product_trial.py
index 7a8eb17c..a3d10b19 100644
--- a/press/saas/doctype/product_trial/patches/rename_saas_product_doctypes_to_product_trial.py
+++ b/press/saas/doctype/product_trial/patches/rename_saas_product_doctypes_to_product_trial.py
@@ -18,14 +18,14 @@ def rename_doctypes():
 		"SaaS Product Signup Field": "Product Trial Signup Field",
 		"SaaS Product Site Request": "Product Trial Request",
 	}
-	for from_doctype, to_doctype in renames.items():
-		if jingrow.db.table_exists(from_doctype) and not jingrow.db.table_exists(to_doctype):
-			jingrow.rename_pg("DocType", from_doctype, to_doctype, force=True)
+	for from_pagetype, to_pagetype in renames.items():
+		if jingrow.db.table_exists(from_pagetype) and not jingrow.db.table_exists(to_pagetype):
+			jingrow.rename_pg("PageType", from_pagetype, to_pagetype, force=True)
 
 
 def rename_fields():
-	jingrow.reload_doctype("Account Request")
+	jingrow.reload_pagetype("Account Request")
 	rename_field("Account Request", "saas_product", "product_trial")
 
-	jingrow.reload_doctype("Product Trial Request")
+	jingrow.reload_pagetype("Product Trial Request")
 	rename_field("Product Trial Request", "saas_product", "product_trial")
diff --git a/press/saas/doctype/product_trial/product_trial.json b/press/saas/doctype/product_trial/product_trial.json
index 9d4d537c..10764e3b 100644
--- a/press/saas/doctype/product_trial/product_trial.json
+++ b/press/saas/doctype/product_trial/product_trial.json
@@ -3,7 +3,7 @@
  "autoname": "prompt",
  "creation": "2023-08-01 13:11:14.281968",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -234,11 +234,11 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Site",
+   "link_pagetype": "Site",
    "link_fieldname": "standby_for_product"
   },
   {
-   "link_doctype": "Product Trial Request",
+   "link_pagetype": "Product Trial Request",
    "link_fieldname": "product_trial"
   }
  ],
diff --git a/press/saas/doctype/product_trial/product_trial.py b/press/saas/doctype/product_trial/product_trial.py
index 8c5fad34..d559ea45 100644
--- a/press/saas/doctype/product_trial/product_trial.py
+++ b/press/saas/doctype/product_trial/product_trial.py
@@ -25,9 +25,9 @@ class ProductTrial(Document):
 	if TYPE_CHECKING:
 		from jingrow.types import DF
 
-		from jcloude.jcloude.doctype.site.site import Site
-		from jcloude.saas.doctype.hybrid_pool_item.hybrid_pool_item import HybridPoolItem
-		from jcloude.saas.doctype.product_trial_app.product_trial_app import ProductTrialApp
+		from jcloude.jcloude.pagetype.site.site import Site
+		from jcloude.saas.pagetype.hybrid_pool_item.hybrid_pool_item import HybridPoolItem
+		from jcloude.saas.pagetype.product_trial_app.product_trial_app import ProductTrialApp
 
 		apps: DF.Table[ProductTrialApp]
 		domain: DF.Link
@@ -96,7 +96,7 @@ class ProductTrial(Document):
 		cluster: str | None = None,
 		account_request: str | None = None,
 	):
-		from jcloude.jcloude.doctype.site.site import Site, get_plan_config
+		from jcloude.jcloude.pagetype.site.site import Site, get_plan_config
 
 		if Site.exists(subdomain, domain):
 			jingrow.throw("Site with this subdomain already exists")
@@ -131,7 +131,7 @@ class ProductTrial(Document):
 				apps.insert(0, {"app": "jingrow"})
 
 			site = jingrow.get_pg(
-				doctype="Site",
+				pagetype="Site",
 				subdomain=subdomain,
 				domain=domain,
 				group=self.release_group,
@@ -241,8 +241,8 @@ class ProductTrial(Document):
 		)
 		if not sites:
 			return None
-		Site = jingrow.qb.DocType("Site")
-		Incident = jingrow.qb.DocType("Incident")
+		Site = jingrow.qb.PageType("Site")
+		Incident = jingrow.qb.PageType("Incident")
 		sites_without_incident = (
 			jingrow.qb.from_(Site)
 			.select(Site.name)
@@ -302,7 +302,7 @@ class ProductTrial(Document):
 				log_error(
 					"Unable to Create Standby Sites",
 					data=e,
-					reference_doctype="Product Trial",
+					reference_pagetype="Product Trial",
 					reference_name=self.name,
 				)
 				jingrow.db.rollback()
@@ -353,7 +353,7 @@ class ProductTrial(Document):
 		)
 		domain = cluster_domain.name if cluster_domain else self.domain
 		site = jingrow.get_pg(
-			doctype="Site",
+			pagetype="Site",
 			subdomain=self.get_unique_site_name(),
 			domain=domain,
 			group=self.release_group,
@@ -369,7 +369,7 @@ class ProductTrial(Document):
 
 	def get_standby_sites_count(self, cluster: str, hybrid_for: str | None = None):
 		one_hour_ago = jingrow.utils.add_to_date(None, hours=-1)
-		Site = jingrow.qb.DocType("Site")
+		Site = jingrow.qb.PageType("Site")
 		query = (
 			jingrow.qb.from_(Site)
 			.select(Site.name)
@@ -404,9 +404,9 @@ class ProductTrial(Document):
 
 	def get_server_from_cluster(self, cluster):
 		"""Return the server with the least number of standby sites in the cluster"""
-		ReleaseGroupServer = jingrow.qb.DocType("Release Group Server")
-		Server = jingrow.qb.DocType("Server")
-		Bench = jingrow.qb.DocType("Bench")
+		ReleaseGroupServer = jingrow.qb.PageType("Release Group Server")
+		Server = jingrow.qb.PageType("Server")
+		Bench = jingrow.qb.PageType("Bench")
 		servers = (
 			jingrow.qb.from_(ReleaseGroupServer)
 			.select(ReleaseGroupServer.server)
@@ -446,7 +446,7 @@ def create_free_app_subscription(app: str, site: str | None = None):
 		return None
 	return jingrow.get_pg(
 		{
-			"doctype": "Subscription",
+			"pagetype": "Subscription",
 			"document_type": "Marketplace App",
 			"document_name": app,
 			"plan_type": "Marketplace App Plan",
@@ -489,7 +489,7 @@ def replenish_standby_sites():
 			log_error(
 				"Replenish Standby Sites Error",
 				data=e,
-				reference_doctype="Product Trial",
+				reference_pagetype="Product Trial",
 				reference_name=product.name,
 			)
 			jingrow.db.rollback()
diff --git a/press/saas/doctype/product_trial/test_product_trial.py b/press/saas/doctype/product_trial/test_product_trial.py
index eaed3692..9a12b432 100644
--- a/press/saas/doctype/product_trial/test_product_trial.py
+++ b/press/saas/doctype/product_trial/test_product_trial.py
@@ -7,14 +7,14 @@ import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
 if typing.TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app.app import App
+	from jcloude.jcloude.pagetype.app.app import App
 
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.root_domain.test_root_domain import create_test_root_domain
-from jcloude.jcloude.doctype.site_plan.test_site_plan import create_test_plan
+from jcloude.jcloude.pagetype.root_domain.test_root_domain import create_test_root_domain
+from jcloude.jcloude.pagetype.site_plan.test_site_plan import create_test_plan
 
 
 def create_test_product_trial(
@@ -26,7 +26,7 @@ def create_test_product_trial(
 	release_group = create_test_release_group([jingrow_app, app])
 	product_trial = jingrow.get_pg(
 		{
-			"doctype": "Product Trial",
+			"pagetype": "Product Trial",
 			"name": app.name,
 			"title": app.title,
 			"apps": [
diff --git a/press/saas/doctype/product_trial_app/product_trial_app.json b/press/saas/doctype/product_trial_app/product_trial_app.json
index ea86c603..1a5110cb 100644
--- a/press/saas/doctype/product_trial_app/product_trial_app.json
+++ b/press/saas/doctype/product_trial_app/product_trial_app.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-06-13 16:41:42.707140",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/product_trial_request/product_trial_request.json b/press/saas/doctype/product_trial_request/product_trial_request.json
index 2e1228af..f08c430c 100644
--- a/press/saas/doctype/product_trial_request/product_trial_request.json
+++ b/press/saas/doctype/product_trial_request/product_trial_request.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "creation": "2023-08-01 21:53:18.416281",
  "default_view": "List",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/product_trial_request/product_trial_request.py b/press/saas/doctype/product_trial_request/product_trial_request.py
index ed9e8f41..36090431 100644
--- a/press/saas/doctype/product_trial_request/product_trial_request.py
+++ b/press/saas/doctype/product_trial_request/product_trial_request.py
@@ -15,13 +15,13 @@ from jingrow.utils.data import add_to_date, now_datetime
 from jingrow.utils.telemetry import init_telemetry
 
 from jcloude.api.client import dashboard_whitelist
-from jcloude.jcloude.doctype.root_domain.root_domain import get_domains
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.root_domain.root_domain import get_domains
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 from jcloude.utils import log_error, validate_subdomain
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.site.site import Site
-	from jcloude.saas.doctype.product_trial.product_trial import ProductTrial
+	from jcloude.jcloude.pagetype.site.site import Site
+	from jcloude.saas.pagetype.product_trial.product_trial import ProductTrial
 
 
 class ProductTrialRequest(Document):
@@ -210,7 +210,7 @@ class ProductTrialRequest(Document):
 			log_error(
 				title="Product Trial Request Setup Wizard Payload Generation Error",
 				data=e,
-				reference_doctype=self.doctype,
+				reference_pagetype=self.pagetype,
 				reference_name=self.name,
 			)
 			jingrow.throw(f"Failed to generate payload for Setup Wizard: {e}")
@@ -260,7 +260,7 @@ class ProductTrialRequest(Document):
 			user_mail = jingrow.db.get_value("Team", self.team, "user")
 			jingrow.get_pg(
 				{
-					"doctype": "Site User",
+					"pagetype": "Site User",
 					"site": site.name,
 					"user": user_mail,
 					"enabled": 1,
@@ -272,7 +272,7 @@ class ProductTrialRequest(Document):
 			log_error(
 				title="Product Trial Request Site Creation Error",
 				data=e,
-				reference_doctype=self.doctype,
+				reference_pagetype=self.pagetype,
 				reference_name=self.name,
 			)
 			self.status = "Error"
@@ -340,7 +340,7 @@ class ProductTrialRequest(Document):
 			log_error(
 				title="Product Trial Request Prefill Setup Wizard Error",
 				data=e,
-				reference_doctype=self.doctype,
+				reference_pagetype=self.pagetype,
 				reference_name=self.name,
 			)
 
diff --git a/press/saas/doctype/product_trial_signup_field/product_trial_signup_field.json b/press/saas/doctype/product_trial_signup_field/product_trial_signup_field.json
index f9f34d19..18ceac1d 100644
--- a/press/saas/doctype/product_trial_signup_field/product_trial_signup_field.json
+++ b/press/saas/doctype/product_trial_signup_field/product_trial_signup_field.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-06-13 16:44:03.404154",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/saas_app/saas_app.json b/press/saas/doctype/saas_app/saas_app.json
index 1a50cbf0..1054f6e6 100644
--- a/press/saas/doctype/saas_app/saas_app.json
+++ b/press/saas/doctype/saas_app/saas_app.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-03-15 09:57:50.938387",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
@@ -123,11 +123,11 @@
  "index_web_pages_for_search": 1,
  "links": [
   {
-   "link_doctype": "Saas App Plan",
+   "link_pagetype": "Saas App Plan",
    "link_fieldname": "app"
   },
   {
-   "link_doctype": "Saas App Subscription",
+   "link_pagetype": "Saas App Subscription",
    "link_fieldname": "app"
   }
  ],
diff --git a/press/saas/doctype/saas_app/saas_app.py b/press/saas/doctype/saas_app/saas_app.py
index e4ee590a..815bd939 100644
--- a/press/saas/doctype/saas_app/saas_app.py
+++ b/press/saas/doctype/saas_app/saas_app.py
@@ -4,7 +4,7 @@
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.saas.doctype.saas_app_plan.saas_app_plan import get_app_plan_features
+from jcloude.saas.pagetype.saas_app_plan.saas_app_plan import get_app_plan_features
 from jcloude.utils import get_current_team
 
 
diff --git a/press/saas/doctype/saas_app/test_saas_app.py b/press/saas/doctype/saas_app/test_saas_app.py
index df8e14f5..59170905 100644
--- a/press/saas/doctype/saas_app/test_saas_app.py
+++ b/press/saas/doctype/saas_app/test_saas_app.py
@@ -6,7 +6,7 @@ from jingrow.tests.utils import FrappeTestCase
 
 
 def create_test_saas_app(app: str):
-	return jingrow.get_pg({"doctype": "Saas App", "app": app}).insert(ignore_if_duplicate=True)
+	return jingrow.get_pg({"pagetype": "Saas App", "app": app}).insert(ignore_if_duplicate=True)
 
 
 class TestSaasApp(FrappeTestCase):
diff --git a/press/saas/doctype/saas_app_plan/saas_app_plan.json b/press/saas/doctype/saas_app_plan/saas_app_plan.json
index 45ce67e2..54d1d587 100644
--- a/press/saas/doctype/saas_app_plan/saas_app_plan.json
+++ b/press/saas/doctype/saas_app_plan/saas_app_plan.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format:SAAS-PLAN-{app}-{###}",
  "creation": "2022-03-15 11:39:32.450795",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/saas_app_plan/saas_app_plan.py b/press/saas/doctype/saas_app_plan/saas_app_plan.py
index 85ad74cf..c2fdd44b 100644
--- a/press/saas/doctype/saas_app_plan/saas_app_plan.py
+++ b/press/saas/doctype/saas_app_plan/saas_app_plan.py
@@ -6,7 +6,7 @@ from typing import List
 import jingrow
 from jingrow.model.document import Document
 
-from jcloude.jcloude.doctype.invoice.invoice import calculate_gst
+from jcloude.jcloude.pagetype.invoice.invoice import calculate_gst
 from jcloude.utils import get_current_team
 
 
diff --git a/press/saas/doctype/saas_app_subscription/saas_app_subscription.json b/press/saas/doctype/saas_app_subscription/saas_app_subscription.json
index 8144b6d0..1cb0cdb8 100644
--- a/press/saas/doctype/saas_app_subscription/saas_app_subscription.json
+++ b/press/saas/doctype/saas_app_subscription/saas_app_subscription.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "format:saas-app-subscription-{app}-{#####}",
  "creation": "2022-03-21 00:27:40.169388",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/saas_app_subscription/saas_app_subscription.py b/press/saas/doctype/saas_app_subscription/saas_app_subscription.py
index b6ff037c..9606702e 100644
--- a/press/saas/doctype/saas_app_subscription/saas_app_subscription.py
+++ b/press/saas/doctype/saas_app_subscription/saas_app_subscription.py
@@ -24,7 +24,7 @@ class SaasAppSubscription(Document):
 
 	def create_site_config_key(self):
 		if not jingrow.db.exists("Site Config Key", {"key": f"sk_{self.app}"}):
-			jingrow.get_pg(doctype="Site Config Key", internal=True, key=f"sk_{self.app}").insert(
+			jingrow.get_pg(pagetype="Site Config Key", internal=True, key=f"sk_{self.app}").insert(
 				ignore_permissions=True
 			)
 
@@ -145,7 +145,7 @@ class SaasAppSubscription(Document):
 		payout = self.calculate_payout(amount)
 
 		usage_record = jingrow.get_pg(
-			doctype="Usage Record",
+			pagetype="Usage Record",
 			team=team.name,
 			document_type="Saas App",
 			document_name=self.app,
@@ -279,7 +279,7 @@ def create_saas_invoice(
 	status="Paid",
 ):
 	invoice = jingrow.get_pg(
-		doctype="Invoice",
+		pagetype="Invoice",
 		team=team.name,
 		type="Service",
 		status=status,
diff --git a/press/saas/doctype/saas_app_version/saas_app_version.json b/press/saas/doctype/saas_app_version/saas_app_version.json
index 74504290..556b5fed 100644
--- a/press/saas/doctype/saas_app_version/saas_app_version.json
+++ b/press/saas/doctype/saas_app_version/saas_app_version.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-03-15 10:40:24.625848",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/saas_feedback/saas_feedback.json b/press/saas/doctype/saas_feedback/saas_feedback.json
index 22a8973d..af7f9c6f 100644
--- a/press/saas/doctype/saas_feedback/saas_feedback.json
+++ b/press/saas/doctype/saas_feedback/saas_feedback.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-06-08 11:52:04.429717",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/saas_pool_rules/saas_pool_rules.json b/press/saas/doctype/saas_pool_rules/saas_pool_rules.json
index 24ae3eda..26fdbb29 100644
--- a/press/saas/doctype/saas_pool_rules/saas_pool_rules.json
+++ b/press/saas/doctype/saas_pool_rules/saas_pool_rules.json
@@ -2,7 +2,7 @@
  "actions": [],
  "autoname": "autoincrement",
  "creation": "2022-07-28 12:45:10.799583",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/saas_remote_login/saas_remote_login.json b/press/saas/doctype/saas_remote_login/saas_remote_login.json
index 59b57288..46096488 100644
--- a/press/saas/doctype/saas_remote_login/saas_remote_login.json
+++ b/press/saas/doctype/saas_remote_login/saas_remote_login.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2022-06-14 12:19:09.414787",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/saas_settings/saas_settings.json b/press/saas/doctype/saas_settings/saas_settings.json
index c7e7c9a3..43c763aa 100644
--- a/press/saas/doctype/saas_settings/saas_settings.json
+++ b/press/saas/doctype/saas_settings/saas_settings.json
@@ -3,7 +3,7 @@
  "allow_rename": 1,
  "autoname": "field:app",
  "creation": "2022-04-14 16:30:53.293931",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/saas_settings/saas_settings.py b/press/saas/doctype/saas_settings/saas_settings.py
index e8ea71ee..d4641fa4 100644
--- a/press/saas/doctype/saas_settings/saas_settings.py
+++ b/press/saas/doctype/saas_settings/saas_settings.py
@@ -13,7 +13,7 @@ class SaasSettings(Document):
 
 	if TYPE_CHECKING:
 		from jingrow.types import DF
-		from jcloude.jcloude.doctype.erpnext_app.erpnext_app import ERPNextApp
+		from jcloude.jcloude.pagetype.erpnext_app.erpnext_app import ERPNextApp
 
 		app: DF.Link | None
 		apps: DF.Table[ERPNextApp]
diff --git a/press/saas/doctype/saas_settings/test_saas_settings.py b/press/saas/doctype/saas_settings/test_saas_settings.py
index c934424e..1a30cb37 100644
--- a/press/saas/doctype/saas_settings/test_saas_settings.py
+++ b/press/saas/doctype/saas_settings/test_saas_settings.py
@@ -7,15 +7,15 @@ from typing import TYPE_CHECKING
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.app.test_app import create_test_app
-from jcloude.jcloude.doctype.release_group.test_release_group import (
+from jcloude.jcloude.pagetype.app.test_app import create_test_app
+from jcloude.jcloude.pagetype.release_group.test_release_group import (
 	create_test_release_group,
 )
-from jcloude.jcloude.doctype.site_plan.test_site_plan import create_test_plan
+from jcloude.jcloude.pagetype.site_plan.test_site_plan import create_test_plan
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.app.app import App
-	from jcloude.jcloude.doctype.release_group.release_group import ReleaseGroup
+	from jcloude.jcloude.pagetype.app.app import App
+	from jcloude.jcloude.pagetype.release_group.release_group import ReleaseGroup
 
 
 def create_test_saas_settings(group: ReleaseGroup | None = None, apps: list[App] | None = None):
@@ -28,7 +28,7 @@ def create_test_saas_settings(group: ReleaseGroup | None = None, apps: list[App]
 	plan = create_test_plan("Site")
 	return jingrow.get_pg(
 		{
-			"doctype": "Saas Settings",
+			"pagetype": "Saas Settings",
 			"app": app.name,
 			"apps": [{"app": app.name}],
 			"domain": "fc.dev",
diff --git a/press/saas/doctype/saas_setup_account_generator/saas_setup_account_generator.json b/press/saas/doctype/saas_setup_account_generator/saas_setup_account_generator.json
index 18c159fc..0e5592f2 100644
--- a/press/saas/doctype/saas_setup_account_generator/saas_setup_account_generator.json
+++ b/press/saas/doctype/saas_setup_account_generator/saas_setup_account_generator.json
@@ -4,7 +4,7 @@
  "allow_rename": 1,
  "autoname": "field:app",
  "creation": "2022-06-09 10:00:09.583228",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/saas_signup_generator/saas_signup_generator.json b/press/saas/doctype/saas_signup_generator/saas_signup_generator.json
index 758e6a1e..211233f7 100644
--- a/press/saas/doctype/saas_signup_generator/saas_signup_generator.json
+++ b/press/saas/doctype/saas_signup_generator/saas_signup_generator.json
@@ -4,7 +4,7 @@
  "allow_guest_to_view": 1,
  "autoname": "field:app",
  "creation": "2022-06-08 18:24:06.174595",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
diff --git a/press/saas/doctype/site_access_token/site_access_token.json b/press/saas/doctype/site_access_token/site_access_token.json
index 4843250b..58c2784f 100644
--- a/press/saas/doctype/site_access_token/site_access_token.json
+++ b/press/saas/doctype/site_access_token/site_access_token.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-08-22 15:31:12.166979",
- "doctype": "DocType",
+ "pagetype": "PageType",
  "engine": "InnoDB",
  "field_order": [
   "site",
diff --git a/press/saas/doctype/site_access_token/site_access_token.py b/press/saas/doctype/site_access_token/site_access_token.py
index ee25ef7c..5a77b50e 100644
--- a/press/saas/doctype/site_access_token/site_access_token.py
+++ b/press/saas/doctype/site_access_token/site_access_token.py
@@ -22,7 +22,7 @@ class SiteAccessToken(Document):
 	def generate(site: str) -> str:
 		record = jingrow.get_pg(
 			{
-				"doctype": "Site Access Token",
+				"pagetype": "Site Access Token",
 				"site": site,
 				"token": jingrow.generate_hash(length=32),
 			}
diff --git a/press/scripts/infrastructure/server_conversion.py b/press/scripts/infrastructure/server_conversion.py
index ec0546b3..374b6214 100644
--- a/press/scripts/infrastructure/server_conversion.py
+++ b/press/scripts/infrastructure/server_conversion.py
@@ -7,12 +7,12 @@ import click
 import jingrow
 
 if typing.TYPE_CHECKING:
-	from jcloude.infrastructure.doctype.arm_build_record.arm_build_record import ARMBuildRecord
-	from jcloude.infrastructure.doctype.arm_docker_image.arm_docker_image import ARMDockerImage
-	from jcloude.infrastructure.doctype.virtual_machine_migration.virtual_machine_migration import (
+	from jcloude.infrastructure.pagetype.arm_build_record.arm_build_record import ARMBuildRecord
+	from jcloude.infrastructure.pagetype.arm_docker_image.arm_docker_image import ARMDockerImage
+	from jcloude.infrastructure.pagetype.virtual_machine_migration.virtual_machine_migration import (
 		VirtualMachineMigration,
 	)
-	from jcloude.jcloude.doctype.server.server import Server
+	from jcloude.jcloude.pagetype.server.server import Server
 
 
 arm_machine_mappings = {
@@ -41,7 +41,7 @@ def check_image_build_failure(arm_build_record: ARMBuildRecord) -> bool:
 def create_vmm(server: str, virtual_machine_image: str, target_machine_type: str) -> VirtualMachineMigration:
 	virtual_machine_migration: VirtualMachineMigration = jingrow.get_pg(
 		{
-			"doctype": "Virtual Machine Migration",
+			"pagetype": "Virtual Machine Migration",
 			"virtual_machine_image": virtual_machine_image,
 			"machine_type": target_machine_type,
 			"virtual_machine": server,
diff --git a/press/scripts/weekend_support.py b/press/scripts/weekend_support.py
index a37a263e..281b8cc7 100644
--- a/press/scripts/weekend_support.py
+++ b/press/scripts/weekend_support.py
@@ -59,7 +59,7 @@ def main():
 			continue
 		jingrow.get_pg(
 			{
-				"doctype": "Event",
+				"pagetype": "Event",
 				"subject": f"{contact.first_name} on Weekend Support",
 				"starts_on": weekend[0],
 				"ends_on": weekend[1],
@@ -82,7 +82,7 @@ def main():
 			continue
 		jingrow.get_pg(
 			{
-				"doctype": "Event",
+				"pagetype": "Event",
 				"subject": f"{contact.first_name} on Backup Support",
 				"starts_on": weekday,
 				"ends_on": datetime.datetime.combine(weekday, datetime.time(23, 59)),
diff --git a/press/telegram_utils.py b/press/telegram_utils.py
index bea2829c..565a16fc 100644
--- a/press/telegram_utils.py
+++ b/press/telegram_utils.py
@@ -99,41 +99,41 @@ class Telegram:
 			}
 			return commands.get(arguments[0], what)(*arguments[1:])
 		if len(arguments) == 4:
-			doctype, name, action, key = arguments
+			pagetype, name, action, key = arguments
 			commands = {"get": get_value, "execute": execute}
-			return commands.get(action, what)(jingrow.unscrub(doctype), name, key)
+			return commands.get(action, what)(jingrow.unscrub(pagetype), name, key)
 		if len(arguments) >= 5:
-			doctype, name, action, key, *values = arguments
+			pagetype, name, action, key, *values = arguments
 			commands = {
 				"set": set_value,
 				"execute": execute,
 			}
 			if action == "set" and len(values) == 1:
-				return commands.get(action, what)(jingrow.unscrub(doctype), name, key, values[0])
-			return commands.get(action, what)(jingrow.unscrub(doctype), name, key, *values)
+				return commands.get(action, what)(jingrow.unscrub(pagetype), name, key, values[0])
+			return commands.get(action, what)(jingrow.unscrub(pagetype), name, key, *values)
 		return what()
 
 
-def set_value(doctype, name, field, value, *args):
+def set_value(pagetype, name, field, value, *args):
 	try:
-		document = jingrow.get_pg(doctype, name)
+		document = jingrow.get_pg(pagetype, name)
 		document.set(field, value)
 		document.save()
 	except Exception:
 		return f"```{jingrow.get_traceback()}```"
 
 
-def get_value(doctype, name, field, *args):
+def get_value(pagetype, name, field, *args):
 	try:
-		return jingrow.db.get_value(doctype, name, field)
+		return jingrow.db.get_value(pagetype, name, field)
 	except Exception:
 		return f"```{jingrow.get_traceback()}```"
 
 
-def execute(doctype, name, method, *args):
-	# return "EXECUTE", doctype, name, method
+def execute(pagetype, name, method, *args):
+	# return "EXECUTE", pagetype, name, method
 	try:
-		document = jingrow.get_pg(doctype, name)
+		document = jingrow.get_pg(pagetype, name)
 		return document.run_method(method, *args)
 	except Exception:
 		return f"```{jingrow.get_traceback()}```"
@@ -149,12 +149,12 @@ def what(*args):
 
 HELP_MESSAGE = """Try one of these
 
-doctype name execute method
-doctype name get field
-doctype name set field value
-doctype name execute method argument1 argument2 ...
+pagetype name execute method
+pagetype name get field
+pagetype name set field value
+pagetype name execute method argument1 argument2 ...
 
-doctype = site|bench|server|proxy-server|database-server
+pagetype = site|bench|server|proxy-server|database-server
 
 ```
 server f17.jingrow.cloud execute reboot```
diff --git a/press/tests/before_test.py b/press/tests/before_test.py
index a9ba3c50..ee3ff944 100644
--- a/press/tests/before_test.py
+++ b/press/tests/before_test.py
@@ -18,7 +18,7 @@ def pg_equal(self: Document, other: Document) -> bool:
 	"""Partial equality checking of Document object"""
 	if not isinstance(other, Document):
 		return False
-	if self.doctype == other.doctype and self.name == other.name:
+	if self.pagetype == other.pagetype and self.name == other.name:
 		return True
 	return False
 
diff --git a/press/tests/test_2fa.py b/press/tests/test_2fa.py
index 6e112cc4..c86ae419 100644
--- a/press/tests/test_2fa.py
+++ b/press/tests/test_2fa.py
@@ -18,7 +18,7 @@ from jcloude.api.account import (
 	reset_2fa_recovery_codes,
 	send_otp,
 )
-from jcloude.jcloude.doctype.team.test_team import create_test_jcloude_admin_team
+from jcloude.jcloude.pagetype.team.test_team import create_test_jcloude_admin_team
 
 
 class Test2FA(FrappeTestCase):
diff --git a/press/tests/test_agent.py b/press/tests/test_agent.py
index 85b6528b..3107e10f 100644
--- a/press/tests/test_agent.py
+++ b/press/tests/test_agent.py
@@ -7,15 +7,15 @@ import responses
 from jingrow.tests.utils import FrappeTestCase
 
 from jcloude.agent import Agent, AgentRequestSkippedException
-from jcloude.jcloude.doctype.agent_request_failure.agent_request_failure import (
+from jcloude.jcloude.pagetype.agent_request_failure.agent_request_failure import (
 	remove_old_failures,
 )
-from jcloude.jcloude.doctype.server.test_server import create_test_server
+from jcloude.jcloude.pagetype.server.test_server import create_test_server
 
 
 def create_test_agent_request_failure(server, traceback="Traceback", error="Error", failure_count=1):
 	fields = {
-		"server_type": server.doctype,
+		"server_type": server.pagetype,
 		"server": server.name,
 		"traceback": traceback,
 		"error": error,
@@ -40,7 +40,7 @@ class TestAgent(FrappeTestCase):
 			json={"message": "pong"},
 		)
 
-		agent = Agent(server.name, server.doctype)
+		agent = Agent(server.name, server.pagetype)
 		agent.request("GET", "ping")
 
 	@responses.activate
@@ -55,7 +55,7 @@ class TestAgent(FrappeTestCase):
 
 		failures_before = jingrow.db.count("Agent Request Failure")
 
-		agent = Agent(server.name, server.doctype)
+		agent = Agent(server.name, server.pagetype)
 		self.assertRaises(requests.ConnectTimeout, agent.request, "GET", "ping")
 
 		failures_after = jingrow.db.count("Agent Request Failure")
@@ -63,7 +63,7 @@ class TestAgent(FrappeTestCase):
 
 		failure = jingrow.get_last_pg("Agent Request Failure")
 		self.assertEqual(failure.server, server.name)
-		self.assertEqual(failure.server_type, server.doctype)
+		self.assertEqual(failure.server_type, server.pagetype)
 		self.assertEqual(failure.failure_count, 1)
 
 	@responses.activate
@@ -76,14 +76,14 @@ class TestAgent(FrappeTestCase):
 			body=requests.ConnectTimeout(),
 		)
 
-		agent = Agent(server.name, server.doctype)
+		agent = Agent(server.name, server.pagetype)
 		self.assertRaises(requests.ConnectTimeout, agent.request, "GET", "ping")
 		self.assertRaises(AgentRequestSkippedException, agent.request, "GET", "ping")
 
 	def test_failure_record_asks_to_skip_requests(self):
 		server = create_test_server()
 
-		agent = Agent(server.name, server.doctype)
+		agent = Agent(server.name, server.pagetype)
 		self.assertEqual(agent.should_skip_requests(), False)
 
 		create_test_agent_request_failure(server)
@@ -94,7 +94,7 @@ class TestAgent(FrappeTestCase):
 		server = create_test_server()
 
 		create_test_agent_request_failure(server)
-		agent = Agent(server.name, server.doctype)
+		agent = Agent(server.name, server.pagetype)
 		self.assertRaises(AgentRequestSkippedException, agent.request, "GET", "ping")
 
 		responses.add(
diff --git a/press/tests/test_audit.py b/press/tests/test_audit.py
index 93342759..58565e96 100644
--- a/press/tests/test_audit.py
+++ b/press/tests/test_audit.py
@@ -5,14 +5,14 @@ import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
 from jcloude.jcloude.audit import BackupRecordCheck, OffsiteBackupCheck
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.jcloude_settings.test_jcloude_settings import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.jcloude_settings.test_jcloude_settings import (
 	create_test_jcloude_settings,
 )
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.site_activity.site_activity import log_site_activity
-from jcloude.jcloude.doctype.site_backup.test_site_backup import create_test_site_backup
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.site_activity.site_activity import log_site_activity
+from jcloude.jcloude.pagetype.site_backup.test_site_backup import create_test_site_backup
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 
 
 @patch.object(TelegramMessage, "enqueue", new=Mock())
diff --git a/press/tests/test_cleanup.py b/press/tests/test_cleanup.py
index 8f26eafe..34afd7e5 100644
--- a/press/tests/test_cleanup.py
+++ b/press/tests/test_cleanup.py
@@ -5,13 +5,13 @@ from unittest.mock import Mock, patch
 import jingrow
 from jingrow.tests.utils import FrappeTestCase
 
-from jcloude.jcloude.doctype.agent_job.agent_job import AgentJob
-from jcloude.jcloude.doctype.jcloude_settings.test_jcloude_settings import (
+from jcloude.jcloude.pagetype.agent_job.agent_job import AgentJob
+from jcloude.jcloude.pagetype.jcloude_settings.test_jcloude_settings import (
 	create_test_jcloude_settings,
 )
-from jcloude.jcloude.doctype.site.backups import FIFO, GFS, cleanup_offsite
-from jcloude.jcloude.doctype.site.test_site import create_test_site
-from jcloude.jcloude.doctype.site_backup.test_site_backup import create_test_site_backup
+from jcloude.jcloude.pagetype.site.backups import FIFO, GFS, cleanup_offsite
+from jcloude.jcloude.pagetype.site.test_site import create_test_site
+from jcloude.jcloude.pagetype.site_backup.test_site_backup import create_test_site_backup
 from jcloude.utils.test import foreground_enqueue
 
 
@@ -180,8 +180,8 @@ class TestGFS(FrappeTestCase):
 		self.assertEqual(older_backup.files_availability, "Unavailable")
 		self.assertEqual(newer_backup.files_availability, "Available")
 
-	@patch("jcloude.jcloude.doctype.site.backups.delete_remote_backup_objects")
-	@patch("jcloude.jcloude.doctype.site.backups.jingrow.db.commit")
+	@patch("jcloude.jcloude.pagetype.site.backups.delete_remote_backup_objects")
+	@patch("jcloude.jcloude.pagetype.site.backups.jingrow.db.commit")
 	def test_delete_remote_backup_objects_called(self, mock_jingrow_commit, mock_del_remote_backup_objects):
 		"""
 		Ensure delete_remote_backup_objects is called when backup is to be deleted.
@@ -236,8 +236,8 @@ class TestFIFO(FrappeTestCase):
 		self.assertEqual(old.files_availability, "Available")
 		self.assertEqual(new.files_availability, "Available")
 
-	@patch("jcloude.jcloude.doctype.site.backups.delete_remote_backup_objects")
-	@patch("jcloude.jcloude.doctype.site.backups.jingrow.db.commit")
+	@patch("jcloude.jcloude.pagetype.site.backups.delete_remote_backup_objects")
+	@patch("jcloude.jcloude.pagetype.site.backups.jingrow.db.commit")
 	def test_delete_remote_backup_objects_called(self, mock_jingrow_commit, mock_del_remote_backup_objects):
 		"""
 		Ensure delete_remote_backup_objects is called when backup is to be deleted.
@@ -273,9 +273,9 @@ class TestBackupRotationScheme(FrappeTestCase):
 	def tearDown(self):
 		jingrow.db.rollback()
 
-	@patch("jcloude.jcloude.doctype.site.backups.GFS")
-	@patch("jcloude.jcloude.doctype.site.backups.FIFO")
-	@patch("jcloude.jcloude.doctype.site.backups.jingrow.enqueue", foreground_enqueue)
+	@patch("jcloude.jcloude.pagetype.site.backups.GFS")
+	@patch("jcloude.jcloude.pagetype.site.backups.FIFO")
+	@patch("jcloude.jcloude.pagetype.site.backups.jingrow.enqueue", foreground_enqueue)
 	def test_jcloude_setting_of_rotation_scheme_works(self, mock_FIFO, mock_GFS):
 		"""Ensure setting rotation scheme in jcloude settings affect rotation scheme used."""
 		jcloude_settings = create_test_jcloude_settings()
@@ -294,8 +294,8 @@ class TestBackupRotationScheme(FrappeTestCase):
 		mock_GFS.assert_called_once()
 		mock_FIFO.assert_not_called()
 
-	@patch("jcloude.jcloude.doctype.site.backups.delete_remote_backup_objects")
-	@patch("jcloude.jcloude.doctype.site.backups.jingrow.db.commit")
+	@patch("jcloude.jcloude.pagetype.site.backups.delete_remote_backup_objects")
+	@patch("jcloude.jcloude.pagetype.site.backups.jingrow.db.commit")
 	def test_local_backups_are_expired(self, mock_jingrow_commit, mock_del_remote_backup_objects):
 		"""
 		Ensure onsite backups are marked unavailable.
@@ -322,8 +322,8 @@ class TestBackupRotationScheme(FrappeTestCase):
 		self.assertEqual(backup_2_1.files_availability, "Unavailable")
 		self.assertEqual(backup_2_2.files_availability, "Available")
 
-	@patch("jcloude.jcloude.doctype.site.backups.delete_remote_backup_objects")
-	@patch("jcloude.jcloude.doctype.site.backups.jingrow.db.commit")
+	@patch("jcloude.jcloude.pagetype.site.backups.delete_remote_backup_objects")
+	@patch("jcloude.jcloude.pagetype.site.backups.jingrow.db.commit")
 	def test_local_backups_with_different_bench_configs_expire_sites(
 		self, mock_jingrow_commit, mock_del_remote_backup_objects
 	):
diff --git a/press/tests/test_sanity.py b/press/tests/test_sanity.py
index 1293a9a5..5dda6c47 100644
--- a/press/tests/test_sanity.py
+++ b/press/tests/test_sanity.py
@@ -1,5 +1,5 @@
 import jingrow
-from jingrow.core.doctype.scheduled_job_type.scheduled_job_type import insert_events
+from jingrow.core.pagetype.scheduled_job_type.scheduled_job_type import insert_events
 from jingrow.tests.utils import FrappeTestCase
 
 from jcloude.hooks import scheduler_events
diff --git a/press/tests/test_scheduled_auto_updates.py b/press/tests/test_scheduled_auto_updates.py
index ae21c5a1..4efd98ad 100644
--- a/press/tests/test_scheduled_auto_updates.py
+++ b/press/tests/test_scheduled_auto_updates.py
@@ -2,7 +2,7 @@ from unittest import TestCase
 
 import jingrow
 
-from jcloude.jcloude.doctype.site_update.scheduled_auto_updates import (
+from jcloude.jcloude.pagetype.site_update.scheduled_auto_updates import (
 	should_update_trigger_for_daily,
 	should_update_trigger_for_monthly,
 	should_update_trigger_for_weekly,
diff --git a/press/utils/__init__.py b/press/utils/__init__.py
index ee78036c..f52b2b7d 100644
--- a/press/utils/__init__.py
+++ b/press/utils/__init__.py
@@ -52,16 +52,16 @@ def log_error(title, **kwargs):
 			else:
 				raise
 
-	reference_doctype = kwargs.get("reference_doctype")
+	reference_pagetype = kwargs.get("reference_pagetype")
 	reference_name = kwargs.get("reference_name")
 
 	# Prevent double logging as `message`
-	if reference_doctype and reference_name:
-		del kwargs["reference_doctype"]
+	if reference_pagetype and reference_name:
+		del kwargs["reference_pagetype"]
 		del kwargs["reference_name"]
 
 	if pg := kwargs.get("pg"):
-		reference_doctype = pg.doctype
+		reference_pagetype = pg.pagetype
 		reference_name = pg.name
 		del kwargs["pg"]
 
@@ -86,7 +86,7 @@ def log_error(title, **kwargs):
 		jingrow.log_error(
 			title=title,
 			message=message,
-			reference_doctype=reference_doctype,
+			reference_pagetype=reference_pagetype,
 			reference_name=reference_name,
 		)
 
@@ -595,11 +595,11 @@ class ttl_cache:
 		return wrapper_func
 
 
-def poly_get_doctype(doctypes, name):
-	"""Get the doctype value from the given name of a pg from a list of doctypes"""
-	for doctype in doctypes:
-		if jingrow.db.exists(doctype, name):
-			return doctype
+def poly_get_pagetype(doctypes, name):
+	"""Get the pagetype value from the given name of a pg from a list of doctypes"""
+	for pagetype in doctypes:
+		if jingrow.db.exists(pagetype, name):
+			return pagetype
 	return doctypes[-1]
 
 
@@ -850,15 +850,15 @@ def get_mariadb_root_password(site):
 	)
 
 	if managed_database_service:
-		doctype = "Managed Database Service"
+		pagetype = "Managed Database Service"
 		name = managed_database_service
 		field = "root_user_password"
 	else:
-		doctype = "Database Server"
+		pagetype = "Database Server"
 		name = database_server
 		field = "mariadb_root_password"
 
-	return get_decrypted_password(doctype, name, field)
+	return get_decrypted_password(pagetype, name, field)
 
 
 def is_valid_email_address(email) -> bool:
diff --git a/press/utils/billing.py b/press/utils/billing.py
index f937485c..8c865423 100644
--- a/press/utils/billing.py
+++ b/press/utils/billing.py
@@ -229,7 +229,7 @@ def process_micro_debit_test_charge(stripe_event):
 		)
 
 		jingrow.get_pg(
-			doctype="Stripe Micro Charge Record",
+			pagetype="Stripe Micro Charge Record",
 			stripe_payment_method=payment_method_name,
 			stripe_payment_intent_id=payment_intent.get("id"),
 		).insert(ignore_permissions=True)
diff --git a/press/utils/dns.py b/press/utils/dns.py
index 1c10f770..e45f38c3 100644
--- a/press/utils/dns.py
+++ b/press/utils/dns.py
@@ -23,7 +23,7 @@ from jcloude.exceptions import (
 from jcloude.utils import log_error
 
 if TYPE_CHECKING:
-	from jcloude.jcloude.doctype.root_domain.root_domain import RootDomain
+	from jcloude.jcloude.pagetype.root_domain.root_domain import RootDomain
 
 NAMESERVERS = ["1.1.1.1", "1.0.0.1", "8.8.8.8", "8.8.4.4"]
 
diff --git a/press/utils/jobs.py b/press/utils/jobs.py
index 0c1d180f..3e2c7fea 100644
--- a/press/utils/jobs.py
+++ b/press/utils/jobs.py
@@ -5,14 +5,14 @@ from datetime import datetime, timedelta
 from typing import Any
 
 import jingrow
-from jingrow.core.doctype.rq_job.rq_job import fetch_job_ids
+from jingrow.core.pagetype.rq_job.rq_job import fetch_job_ids
 from jingrow.utils.background_jobs import get_queues, get_redis_conn
 from redis import Redis
 from rq.command import send_stop_job_command
 from rq.job import Job, JobStatus, NoSuchJobError, get_current_job
 from rq.queue import Queue
 
-from jcloude.jcloude.doctype.telegram_message.telegram_message import TelegramMessage
+from jcloude.jcloude.pagetype.telegram_message.telegram_message import TelegramMessage
 
 
 def stop_background_job(job: Job):
@@ -26,7 +26,7 @@ def stop_background_job(job: Job):
 
 
 def get_background_jobs(
-	doctype: str,
+	pagetype: str,
 	name: str,
 	status: list[str] | None = None,
 	connection: Redis | None = None,
@@ -43,7 +43,7 @@ def get_background_jobs(
 		except NoSuchJobError:
 			continue
 
-		if not does_job_belong_to_pg(job, doctype, name):
+		if not does_job_belong_to_pg(job, pagetype, name):
 			continue
 
 		yield job
@@ -69,7 +69,7 @@ def get_job_ids(
 			yield from job_ids
 
 
-def does_job_belong_to_pg(job: Job, doctype: str, name: str) -> bool:
+def does_job_belong_to_pg(job: Job, pagetype: str, name: str) -> bool:
 	site = job.kwargs.get("site")
 	if site and site != jingrow.local.site:
 		return False
@@ -79,7 +79,7 @@ def does_job_belong_to_pg(job: Job, doctype: str, name: str) -> bool:
 		return False
 
 	kwargs = job.kwargs.get("kwargs", {})
-	if kwargs.get("doctype") != doctype:
+	if kwargs.get("pagetype") != pagetype:
 		return False
 
 	if kwargs.get("name") != name:
diff --git a/press/utils/mpesa_utils.py b/press/utils/mpesa_utils.py
index 7785e712..96bbb2cf 100644
--- a/press/utils/mpesa_utils.py
+++ b/press/utils/mpesa_utils.py
@@ -33,7 +33,7 @@ def create_mpesa_request_log(
 
 	request_log = jingrow.get_pg(
 		{
-			"doctype": "Mpesa Request Log",
+			"pagetype": "Mpesa Request Log",
 			"integration_request_service": service_name,
 			"request_headers": get_json(request_headers),
 			"data": get_json(data),
diff --git a/press/utils/test.py b/press/utils/test.py
index aea0c290..d3ac8b31 100644
--- a/press/utils/test.py
+++ b/press/utils/test.py
@@ -8,7 +8,7 @@ import requests
 
 
 def foreground_enqueue_pg(
-	doctype: str,
+	pagetype: str,
 	docname: str,
 	method: str,
 	queue="default",
@@ -25,7 +25,7 @@ def foreground_enqueue_pg(
 
 	Use for monkey patching enqueue_pg in tests
 	"""
-	getattr(jingrow.get_pg(doctype, docname), method)(**kwargs)
+	getattr(jingrow.get_pg(pagetype, docname), method)(**kwargs)
 
 
 def foreground_enqueue(
diff --git a/press/utils/user.py b/press/utils/user.py
index 4781fdf6..d0f548ed 100644
--- a/press/utils/user.py
+++ b/press/utils/user.py
@@ -1,5 +1,5 @@
 import jingrow
-from jingrow.core.doctype.user.user import User
+from jingrow.core.pagetype.user.user import User
 
 
 def is_system_manager(user: str | None = None) -> bool:
diff --git a/press/utils/webhook.py b/press/utils/webhook.py
index 812c5227..b7d0aaf4 100644
--- a/press/utils/webhook.py
+++ b/press/utils/webhook.py
@@ -13,8 +13,8 @@ from jingrow.model.document import Document
 def create_webhook_event(event: str, payload: dict | Document, team: str) -> bool:
 	try:
 		# Check if team has configured webhook against this event
-		PressWebhookSelectedEvent = jingrow.qb.DocType("Jcloude Webhook Selected Event")
-		PressWebhook = jingrow.qb.DocType("Jcloude Webhook")
+		PressWebhookSelectedEvent = jingrow.qb.PageType("Jcloude Webhook Selected Event")
+		PressWebhook = jingrow.qb.PageType("Jcloude Webhook")
 
 		query = (
 			jingrow.qb.from_(PressWebhookSelectedEvent)
@@ -50,7 +50,7 @@ def create_webhook_event(event: str, payload: dict | Document, team: str) -> boo
 			# create webhook log
 			jingrow.get_pg(
 				{
-					"doctype": "Jcloude Webhook Log",
+					"pagetype": "Jcloude Webhook Log",
 					"status": "Pending",
 					"event": event,
 					"team": team,