diff --git a/editor/src/communication/dispatcher.rs b/editor/src/communication/dispatcher.rs
index 34f881e5..1367d136 100644
--- a/editor/src/communication/dispatcher.rs
+++ b/editor/src/communication/dispatcher.rs
@@ -24,8 +24,8 @@ pub struct Dispatcher {
 const SIDE_EFFECT_FREE_MESSAGES: &[MessageDiscriminant] = &[
 	MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::Document(DocumentMessageDiscriminant::RenderDocument)),
 	MessageDiscriminant::Portfolio(PortfolioMessageDiscriminant::Document(DocumentMessageDiscriminant::FolderChanged)),
-	MessageDiscriminant::Frontend(FrontendMessageDiscriminant::UpdateLayer),
-	MessageDiscriminant::Frontend(FrontendMessageDiscriminant::DisplayFolderTreeStructure),
+	MessageDiscriminant::Frontend(FrontendMessageDiscriminant::UpdateDocumentLayer),
+	MessageDiscriminant::Frontend(FrontendMessageDiscriminant::DisplayDocumentLayerTreeStructure),
 	MessageDiscriminant::Frontend(FrontendMessageDiscriminant::UpdateOpenDocumentsList),
 	MessageDiscriminant::Tool(ToolMessageDiscriminant::DocumentIsDirty),
 ];
@@ -78,7 +78,7 @@ impl Dispatcher {
 		if log::max_level() == log::LevelFilter::Trace
 			&& !(matches!(
 				message,
-				InputPreprocessor(_) | Frontend(FrontendMessage::SetCanvasZoom { .. }) | Frontend(FrontendMessage::SetCanvasRotation { .. })
+				InputPreprocessor(_) | Frontend(FrontendMessage::UpdateCanvasZoom { .. }) | Frontend(FrontendMessage::UpdateCanvasRotation { .. })
 			) || MessageDiscriminant::from(message).local_name().ends_with("MouseMove"))
 		{
 			log::trace!("Message: {:?}", message);
diff --git a/editor/src/document/artboard_message_handler.rs b/editor/src/document/artboard_message_handler.rs
index a113b7e0..017bc79d 100644
--- a/editor/src/document/artboard_message_handler.rs
+++ b/editor/src/document/artboard_message_handler.rs
@@ -68,14 +68,14 @@ impl MessageHandler<ArtboardMessage, (&mut LayerMetadata, &GrapheneDocument, &In
 				// Render an infinite canvas if there are no artboards
 				if self.artboard_ids.is_empty() {
 					responses.push_back(
-						FrontendMessage::UpdateArtboards {
+						FrontendMessage::UpdateDocumentArtboards {
 							svg: r##"<rect width="100%" height="100%" fill="#ffffff" />"##.to_string(),
 						}
 						.into(),
 					)
 				} else {
 					responses.push_back(
-						FrontendMessage::UpdateArtboards {
+						FrontendMessage::UpdateDocumentArtboards {
 							svg: self.artboards_graphene_document.render_root(ViewMode::Normal),
 						}
 						.into(),
diff --git a/editor/src/document/document_message_handler.rs b/editor/src/document/document_message_handler.rs
index c9e99052..e4587d21 100644
--- a/editor/src/document/document_message_handler.rs
+++ b/editor/src/document/document_message_handler.rs
@@ -243,7 +243,7 @@ impl DocumentMessageHandler {
 		if let Some(layer) = self.layer_metadata.get_mut(path) {
 			layer.selected = true;
 			let data = self.layer_panel_entry(path.to_vec()).ok()?;
-			(!path.is_empty()).then(|| FrontendMessage::UpdateLayer { data }.into())
+			(!path.is_empty()).then(|| FrontendMessage::UpdateDocumentLayer { data }.into())
 		} else {
 			log::warn!("Tried to select non existing layer {:?}", path);
 			None
@@ -594,7 +594,7 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 					false => self.name.clone() + FILE_EXPORT_SUFFIX,
 				};
 				responses.push_back(
-					FrontendMessage::ExportDocument {
+					FrontendMessage::TriggerFileDownload {
 						document: format!(
 							r#"<svg xmlns="http://www.w3.org/2000/svg" viewBox="{} {} {} {}">{}{}</svg>"#,
 							bbox[0].x,
@@ -620,7 +620,7 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 					false => self.name.clone() + FILE_SAVE_SUFFIX,
 				};
 				responses.push_back(
-					FrontendMessage::SaveDocument {
+					FrontendMessage::TriggerFileDownload {
 						document: self.serialize_document(),
 						name,
 					}
@@ -830,11 +830,11 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 			}
 			DocumentStructureChanged => {
 				let data_buffer: RawBuffer = self.serialize_root().into();
-				responses.push_back(FrontendMessage::DisplayFolderTreeStructure { data_buffer }.into())
+				responses.push_back(FrontendMessage::DisplayDocumentLayerTreeStructure { data_buffer }.into())
 			}
 			LayerChanged(path) => {
 				if let Ok(layer_entry) = self.layer_panel_entry(path) {
-					responses.push_back(FrontendMessage::UpdateLayer { data: layer_entry }.into());
+					responses.push_back(FrontendMessage::UpdateDocumentLayer { data: layer_entry }.into());
 				}
 			}
 			DispatchOperation(op) => match self.graphene_document.handle_operation(&op) {
@@ -866,7 +866,7 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 			},
 			RenderDocument => {
 				responses.push_back(
-					FrontendMessage::UpdateArtwork {
+					FrontendMessage::UpdateDocumentArtwork {
 						svg: self.graphene_document.render_root(self.view_mode),
 					}
 					.into(),
@@ -892,7 +892,7 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 				let ruler_origin = self.graphene_document.root.transform.transform_point2(DVec2::ZERO);
 
 				responses.push_back(
-					FrontendMessage::UpdateScrollbars {
+					FrontendMessage::UpdateDocumentScrollbars {
 						position: scrollbar_position.into(),
 						size: scrollbar_size.into(),
 						multiplier: scrollbar_multiplier.into(),
@@ -901,7 +901,7 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 				);
 
 				responses.push_back(
-					FrontendMessage::UpdateRulers {
+					FrontendMessage::UpdateDocumentRulers {
 						origin: ruler_origin.into(),
 						spacing: ruler_spacing,
 						interval: ruler_interval,
diff --git a/editor/src/document/movement_handler.rs b/editor/src/document/movement_handler.rs
index aebf5301..f5c9e6ac 100644
--- a/editor/src/document/movement_handler.rs
+++ b/editor/src/document/movement_handler.rs
@@ -235,7 +235,7 @@ impl MessageHandler<MovementMessage, (&Document, &InputPreprocessor)> for Moveme
 			}
 			SetCanvasZoom(new) => {
 				self.zoom = new.clamp(VIEWPORT_ZOOM_SCALE_MIN, VIEWPORT_ZOOM_SCALE_MAX);
-				responses.push_back(FrontendMessage::SetCanvasZoom { new_zoom: self.snapped_scale() }.into());
+				responses.push_back(FrontendMessage::UpdateCanvasZoom { factor: self.snapped_scale() }.into());
 				responses.push_back(ToolMessage::DocumentIsDirty.into());
 				responses.push_back(DocumentMessage::DirtyRenderDocumentInOutlineView.into());
 				self.create_document_transform(&ipp.viewport_bounds, responses);
@@ -275,7 +275,7 @@ impl MessageHandler<MovementMessage, (&Document, &InputPreprocessor)> for Moveme
 				self.tilt = new_radians;
 				self.create_document_transform(&ipp.viewport_bounds, responses);
 				responses.push_back(ToolMessage::DocumentIsDirty.into());
-				responses.push_back(FrontendMessage::SetCanvasRotation { new_radians: self.snapped_angle() }.into());
+				responses.push_back(FrontendMessage::UpdateCanvasRotation { angle_radians: self.snapped_angle() }.into());
 			}
 			FitViewportToBounds {
 				bounds: [bounds_corner_a, bounds_corner_b],
@@ -301,7 +301,7 @@ impl MessageHandler<MovementMessage, (&Document, &InputPreprocessor)> for Moveme
 					self.zoom = 1.
 				}
 
-				responses.push_back(FrontendMessage::SetCanvasZoom { new_zoom: self.zoom }.into());
+				responses.push_back(FrontendMessage::UpdateCanvasZoom { factor: self.zoom }.into());
 				responses.push_back(ToolMessage::DocumentIsDirty.into());
 				responses.push_back(DocumentMessage::DirtyRenderDocumentInOutlineView.into());
 				self.create_document_transform(&ipp.viewport_bounds, responses);
diff --git a/editor/src/document/overlay_message_handler.rs b/editor/src/document/overlay_message_handler.rs
index 27d62641..b42064e2 100644
--- a/editor/src/document/overlay_message_handler.rs
+++ b/editor/src/document/overlay_message_handler.rs
@@ -41,7 +41,7 @@ impl MessageHandler<OverlayMessage, (&mut LayerMetadata, &Document, &InputPrepro
 
 		// Render overlays
 		responses.push_back(
-			FrontendMessage::UpdateOverlays {
+			FrontendMessage::UpdateDocumentOverlays {
 				svg: self.overlays_graphene_document.render_root(ViewMode::Normal),
 			}
 			.into(),
diff --git a/editor/src/document/portfolio_message_handler.rs b/editor/src/document/portfolio_message_handler.rs
index 598df670..be734dce 100644
--- a/editor/src/document/portfolio_message_handler.rs
+++ b/editor/src/document/portfolio_message_handler.rs
@@ -124,7 +124,7 @@ impl PortfolioMessageHandler {
 				.layer_metadata
 				.keys()
 				.filter_map(|path| new_document.layer_panel_entry_from_path(path))
-				.map(|entry| FrontendMessage::UpdateLayer { data: entry }.into())
+				.map(|entry| FrontendMessage::UpdateDocumentLayer { data: entry }.into())
 				.collect::<Vec<_>>(),
 		);
 
@@ -181,7 +181,7 @@ impl MessageHandler<PortfolioMessage, &InputPreprocessor> for PortfolioMessageHa
 		use PortfolioMessage::*;
 		match message {
 			RequestAboutGraphiteDialog => {
-				responses.push_back(FrontendMessage::DisplayAboutGraphiteDialog.into());
+				responses.push_back(FrontendMessage::DisplayDialogAboutGraphite.into());
 			}
 			Document(message) => self.active_document_mut().process_action(message, ipp, responses),
 			SelectDocument(id) => {
@@ -190,7 +190,7 @@ impl MessageHandler<PortfolioMessage, &InputPreprocessor> for PortfolioMessageHa
 					responses.push_back(PortfolioMessage::AutoSaveDocument(self.active_document_id).into());
 				}
 				self.active_document_id = id;
-				responses.push_back(FrontendMessage::SetActiveDocument { document_id: id }.into());
+				responses.push_back(FrontendMessage::UpdateActiveDocument { document_id: id }.into());
 				responses.push_back(RenderDocument.into());
 				responses.push_back(DocumentMessage::DocumentStructureChanged.into());
 				for layer in self.active_document().layer_metadata.keys() {
@@ -259,8 +259,8 @@ impl MessageHandler<PortfolioMessage, &InputPreprocessor> for PortfolioMessageHa
 					.collect::<Vec<_>>();
 
 				responses.push_back(FrontendMessage::UpdateOpenDocumentsList { open_documents }.into());
-				responses.push_back(FrontendMessage::SetActiveDocument { document_id: self.active_document_id }.into());
-				responses.push_back(FrontendMessage::RemoveAutoSaveDocument { document_id: id }.into());
+				responses.push_back(FrontendMessage::UpdateActiveDocument { document_id: self.active_document_id }.into());
+				responses.push_back(FrontendMessage::TriggerIndexedDbRemoveDocument { document_id: id }.into());
 				responses.push_back(RenderDocument.into());
 				responses.push_back(DocumentMessage::DocumentStructureChanged.into());
 				for layer in self.active_document().layer_metadata.keys() {
@@ -275,7 +275,7 @@ impl MessageHandler<PortfolioMessage, &InputPreprocessor> for PortfolioMessageHa
 				self.load_document(new_document, document_id, false, responses);
 			}
 			OpenDocument => {
-				responses.push_back(FrontendMessage::OpenDocumentBrowse.into());
+				responses.push_back(FrontendMessage::TriggerFileUpload.into());
 			}
 			OpenDocumentFile(document_name, document) => {
 				responses.push_back(
@@ -301,7 +301,7 @@ impl MessageHandler<PortfolioMessage, &InputPreprocessor> for PortfolioMessageHa
 						self.load_document(document, document_id, true, responses);
 					}
 					Err(e) => responses.push_back(
-						FrontendMessage::DisplayError {
+						FrontendMessage::DisplayDialogError {
 							title: "Failed to open document".to_string(),
 							description: e.to_string(),
 						}
@@ -327,7 +327,7 @@ impl MessageHandler<PortfolioMessage, &InputPreprocessor> for PortfolioMessageHa
 			AutoSaveDocument(id) => {
 				let document = self.documents.get(&id).unwrap();
 				responses.push_back(
-					FrontendMessage::AutoSaveDocument {
+					FrontendMessage::TriggerIndexedDbWriteDocument {
 						document: document.serialize_document(),
 						details: FrontendDocumentDetails {
 							is_saved: document.is_saved(),
diff --git a/editor/src/frontend/frontend_message_handler.rs b/editor/src/frontend/frontend_message_handler.rs
index 412715c1..e1b17e25 100644
--- a/editor/src/frontend/frontend_message_handler.rs
+++ b/editor/src/frontend/frontend_message_handler.rs
@@ -15,28 +15,30 @@ pub struct FrontendDocumentDetails {
 #[impl_message(Message, Frontend)]
 #[derive(PartialEq, Clone, Deserialize, Serialize, Debug)]
 pub enum FrontendMessage {
-	DisplayFolderTreeStructure { data_buffer: RawBuffer },
-	SetActiveTool { tool_name: String, tool_options: Option<ToolOptions> },
-	SetActiveDocument { document_id: u64 },
+	// Display prefix: make the frontend show something, like a dialog
+	// Update prefix: give the frontend a new value or state for it to use
+	// Trigger prefix: cause a browser API to do something
+	DisplayDocumentLayerTreeStructure { data_buffer: RawBuffer },
+	UpdateActiveTool { tool_name: String, tool_options: Option<ToolOptions> },
+	UpdateActiveDocument { document_id: u64 },
 	UpdateOpenDocumentsList { open_documents: Vec<FrontendDocumentDetails> },
 	UpdateInputHints { hint_data: HintData },
-	DisplayError { title: String, description: String },
-	DisplayPanic { panic_info: String, title: String, description: String },
+	DisplayDialogError { title: String, description: String },
+	DisplayDialogPanic { panic_info: String, title: String, description: String },
 	DisplayConfirmationToCloseDocument { document_id: u64 },
 	DisplayConfirmationToCloseAllDocuments,
-	DisplayAboutGraphiteDialog,
-	UpdateLayer { data: LayerPanelEntry },
-	UpdateArtwork { svg: String },
-	UpdateOverlays { svg: String },
-	UpdateArtboards { svg: String },
-	UpdateScrollbars { position: (f64, f64), size: (f64, f64), multiplier: (f64, f64) },
-	UpdateRulers { origin: (f64, f64), spacing: f64, interval: f64 },
-	ExportDocument { document: String, name: String },
-	SaveDocument { document: String, name: String },
-	AutoSaveDocument { document: String, details: FrontendDocumentDetails, version: String },
-	RemoveAutoSaveDocument { document_id: u64 },
-	OpenDocumentBrowse,
+	DisplayDialogAboutGraphite,
+	UpdateDocumentLayer { data: LayerPanelEntry },
+	UpdateDocumentArtwork { svg: String },
+	UpdateDocumentOverlays { svg: String },
+	UpdateDocumentArtboards { svg: String },
+	UpdateDocumentScrollbars { position: (f64, f64), size: (f64, f64), multiplier: (f64, f64) },
+	UpdateDocumentRulers { origin: (f64, f64), spacing: f64, interval: f64 },
+	TriggerFileUpload,
+	TriggerFileDownload { document: String, name: String },
+	TriggerIndexedDbWriteDocument { document: String, details: FrontendDocumentDetails, version: String },
+	TriggerIndexedDbRemoveDocument { document_id: u64 },
 	UpdateWorkingColors { primary: Color, secondary: Color },
-	SetCanvasZoom { new_zoom: f64 },
-	SetCanvasRotation { new_radians: f64 },
+	UpdateCanvasZoom { factor: f64 },
+	UpdateCanvasRotation { angle_radians: f64 },
 }
diff --git a/editor/src/input/input_mapper.rs b/editor/src/input/input_mapper.rs
index 1fc87a8c..d1286839 100644
--- a/editor/src/input/input_mapper.rs
+++ b/editor/src/input/input_mapper.rs
@@ -219,7 +219,7 @@ impl Default for Mapping {
 			entry! {action=ToolMessage::ResetColors, key_down=KeyX, modifiers=[KeyShift, KeyControl]},
 			entry! {action=ToolMessage::SwapColors, key_down=KeyX, modifiers=[KeyShift]},
 			// Editor Actions
-			entry! {action=FrontendMessage::OpenDocumentBrowse, key_down=KeyO, modifiers=[KeyControl]},
+			entry! {action=FrontendMessage::TriggerFileUpload, key_down=KeyO, modifiers=[KeyControl]},
 			// Document Actions
 			entry! {action=PortfolioMessage::Paste(User), key_down=KeyV, modifiers=[KeyControl]},
 			entry! {action=DocumentMessage::Redo, key_down=KeyZ, modifiers=[KeyControl, KeyShift]},
diff --git a/editor/src/tool/tool_message_handler.rs b/editor/src/tool/tool_message_handler.rs
index b67294b4..563a95a0 100644
--- a/editor/src/tool/tool_message_handler.rs
+++ b/editor/src/tool/tool_message_handler.rs
@@ -105,7 +105,7 @@ impl MessageHandler<ToolMessage, (&DocumentMessageHandler, &InputPreprocessor)>
 				// Notify the frontend about the new active tool to be displayed
 				let tool_name = new_tool.to_string();
 				let tool_options = self.tool_state.document_tool_data.tool_options.get(&new_tool).copied();
-				responses.push_back(FrontendMessage::SetActiveTool { tool_name, tool_options }.into());
+				responses.push_back(FrontendMessage::UpdateActiveTool { tool_name, tool_options }.into());
 			}
 			DocumentIsDirty => {
 				// Send the DocumentIsDirty message to the active tool's sub-tool message handler
diff --git a/frontend/src/components/panels/Document.vue b/frontend/src/components/panels/Document.vue
index 0e8c19a4..9153c6cb 100644
--- a/frontend/src/components/panels/Document.vue
+++ b/frontend/src/components/panels/Document.vue
@@ -251,7 +251,17 @@
 <script lang="ts">
 import { defineComponent } from "vue";
 
-import { UpdateArtwork, UpdateOverlays, UpdateScrollbars, UpdateRulers, SetActiveTool, SetCanvasZoom, SetCanvasRotation, ToolName, UpdateArtboards } from "@/dispatcher/js-messages";
+import {
+	UpdateDocumentArtwork,
+	UpdateDocumentOverlays,
+	UpdateDocumentScrollbars,
+	UpdateDocumentRulers,
+	UpdateActiveTool,
+	UpdateCanvasZoom,
+	UpdateCanvasRotation,
+	ToolName,
+	UpdateDocumentArtboards,
+} from "@/dispatcher/js-messages";
 
 import LayoutCol from "@/components/layout/LayoutCol.vue";
 import LayoutRow from "@/components/layout/LayoutRow.vue";
@@ -330,41 +340,41 @@ export default defineComponent({
 		},
 	},
 	mounted() {
-		this.editor.dispatcher.subscribeJsMessage(UpdateArtwork, (UpdateArtwork) => {
-			this.artworkSvg = UpdateArtwork.svg;
+		this.editor.dispatcher.subscribeJsMessage(UpdateDocumentArtwork, (UpdateDocumentArtwork) => {
+			this.artworkSvg = UpdateDocumentArtwork.svg;
 		});
 
-		this.editor.dispatcher.subscribeJsMessage(UpdateOverlays, (updateOverlays) => {
-			this.overlaysSvg = updateOverlays.svg;
+		this.editor.dispatcher.subscribeJsMessage(UpdateDocumentOverlays, (updateDocumentOverlays) => {
+			this.overlaysSvg = updateDocumentOverlays.svg;
 		});
 
-		this.editor.dispatcher.subscribeJsMessage(UpdateArtboards, (updateArtboards) => {
-			this.artboardSvg = updateArtboards.svg;
+		this.editor.dispatcher.subscribeJsMessage(UpdateDocumentArtboards, (updateDocumentArtboards) => {
+			this.artboardSvg = updateDocumentArtboards.svg;
 		});
 
-		this.editor.dispatcher.subscribeJsMessage(UpdateScrollbars, (updateScrollbars) => {
-			this.scrollbarPos = updateScrollbars.position;
-			this.scrollbarSize = updateScrollbars.size;
-			this.scrollbarMultiplier = updateScrollbars.multiplier;
+		this.editor.dispatcher.subscribeJsMessage(UpdateDocumentScrollbars, (updateDocumentScrollbars) => {
+			this.scrollbarPos = updateDocumentScrollbars.position;
+			this.scrollbarSize = updateDocumentScrollbars.size;
+			this.scrollbarMultiplier = updateDocumentScrollbars.multiplier;
 		});
 
-		this.editor.dispatcher.subscribeJsMessage(UpdateRulers, (updateRulers) => {
-			this.rulerOrigin = updateRulers.origin;
-			this.rulerSpacing = updateRulers.spacing;
-			this.rulerInterval = updateRulers.interval;
+		this.editor.dispatcher.subscribeJsMessage(UpdateDocumentRulers, (updateDocumentRulers) => {
+			this.rulerOrigin = updateDocumentRulers.origin;
+			this.rulerSpacing = updateDocumentRulers.spacing;
+			this.rulerInterval = updateDocumentRulers.interval;
 		});
 
-		this.editor.dispatcher.subscribeJsMessage(SetActiveTool, (setActiveTool) => {
-			this.activeTool = setActiveTool.tool_name;
-			this.activeToolOptions = setActiveTool.tool_options;
+		this.editor.dispatcher.subscribeJsMessage(UpdateActiveTool, (updateActiveTool) => {
+			this.activeTool = updateActiveTool.tool_name;
+			this.activeToolOptions = updateActiveTool.tool_options;
 		});
 
-		this.editor.dispatcher.subscribeJsMessage(SetCanvasZoom, (setCanvasZoom) => {
-			this.documentZoom = setCanvasZoom.new_zoom * 100;
+		this.editor.dispatcher.subscribeJsMessage(UpdateCanvasZoom, (updateCanvasZoom) => {
+			this.documentZoom = updateCanvasZoom.factor * 100;
 		});
 
-		this.editor.dispatcher.subscribeJsMessage(SetCanvasRotation, (setCanvasRotation) => {
-			const newRotation = setCanvasRotation.new_radians * (180 / Math.PI);
+		this.editor.dispatcher.subscribeJsMessage(UpdateCanvasRotation, (updateCanvasRotation) => {
+			const newRotation = updateCanvasRotation.angle_radians * (180 / Math.PI);
 			this.documentRotation = (360 + (newRotation % 360)) % 360;
 		});
 
diff --git a/frontend/src/components/panels/LayerTree.vue b/frontend/src/components/panels/LayerTree.vue
index 98167042..03944601 100644
--- a/frontend/src/components/panels/LayerTree.vue
+++ b/frontend/src/components/panels/LayerTree.vue
@@ -242,7 +242,7 @@
 <script lang="ts">
 import { defineComponent } from "vue";
 
-import { BlendMode, DisplayFolderTreeStructure, UpdateLayer, LayerPanelEntry } from "@/dispatcher/js-messages";
+import { BlendMode, DisplayDocumentLayerTreeStructure, UpdateDocumentLayer, LayerPanelEntry } from "@/dispatcher/js-messages";
 
 import LayoutCol from "@/components/layout/LayoutCol.vue";
 import LayoutRow from "@/components/layout/LayoutRow.vue";
@@ -498,11 +498,11 @@ export default defineComponent({
 		},
 	},
 	mounted() {
-		this.editor.dispatcher.subscribeJsMessage(DisplayFolderTreeStructure, (displayFolderTreeStructure) => {
+		this.editor.dispatcher.subscribeJsMessage(DisplayDocumentLayerTreeStructure, (displayDocumentLayerTreeStructure) => {
 			const path = [] as bigint[];
 			this.layers = [] as { folderIndex: number; entry: LayerPanelEntry }[];
 
-			const recurse = (folder: DisplayFolderTreeStructure, layers: { folderIndex: number; entry: LayerPanelEntry }[], cache: Map<string, LayerPanelEntry>): void => {
+			const recurse = (folder: DisplayDocumentLayerTreeStructure, layers: { folderIndex: number; entry: LayerPanelEntry }[], cache: Map<string, LayerPanelEntry>): void => {
 				folder.children.forEach((item, index) => {
 					// TODO: fix toString
 					path.push(BigInt(item.layerId.toString()));
@@ -513,12 +513,12 @@ export default defineComponent({
 				});
 			};
 
-			recurse(displayFolderTreeStructure, this.layers, this.layerCache);
+			recurse(displayDocumentLayerTreeStructure, this.layers, this.layerCache);
 		});
 
-		this.editor.dispatcher.subscribeJsMessage(UpdateLayer, (updateLayer) => {
-			const targetPath = updateLayer.data.path;
-			const targetLayer = updateLayer.data;
+		this.editor.dispatcher.subscribeJsMessage(UpdateDocumentLayer, (updateDocumentLayer) => {
+			const targetPath = updateDocumentLayer.data.path;
+			const targetLayer = updateDocumentLayer.data;
 
 			const layer = this.layerCache.get(targetPath.toString());
 			if (layer) {
diff --git a/frontend/src/dispatcher/js-messages.ts b/frontend/src/dispatcher/js-messages.ts
index 275a0b34..671ea701 100644
--- a/frontend/src/dispatcher/js-messages.ts
+++ b/frontend/src/dispatcher/js-messages.ts
@@ -135,23 +135,23 @@ export type ToolName =
 	| "Ellipse"
 	| "Shape";
 
-export class SetActiveTool extends JsMessage {
+export class UpdateActiveTool extends JsMessage {
 	readonly tool_name!: ToolName;
 
 	readonly tool_options!: object;
 }
 
-export class SetActiveDocument extends JsMessage {
+export class UpdateActiveDocument extends JsMessage {
 	readonly document_id!: BigInt;
 }
 
-export class DisplayError extends JsMessage {
+export class DisplayDialogError extends JsMessage {
 	readonly title!: string;
 
 	readonly description!: string;
 }
 
-export class DisplayPanic extends JsMessage {
+export class DisplayDialogPanic extends JsMessage {
 	readonly panic_info!: string;
 
 	readonly title!: string;
@@ -165,23 +165,23 @@ export class DisplayConfirmationToCloseDocument extends JsMessage {
 
 export class DisplayConfirmationToCloseAllDocuments extends JsMessage {}
 
-export class DisplayAboutGraphiteDialog extends JsMessage {}
+export class DisplayDialogAboutGraphite extends JsMessage {}
 
-export class UpdateArtwork extends JsMessage {
+export class UpdateDocumentArtwork extends JsMessage {
 	readonly svg!: string;
 }
 
-export class UpdateOverlays extends JsMessage {
+export class UpdateDocumentOverlays extends JsMessage {
 	readonly svg!: string;
 }
 
-export class UpdateArtboards extends JsMessage {
+export class UpdateDocumentArtboards extends JsMessage {
 	readonly svg!: string;
 }
 
 const TupleToVec2 = Transform(({ value }) => ({ x: value[0], y: value[1] }));
 
-export class UpdateScrollbars extends JsMessage {
+export class UpdateDocumentScrollbars extends JsMessage {
 	@TupleToVec2
 	readonly position!: { x: number; y: number };
 
@@ -192,7 +192,7 @@ export class UpdateScrollbars extends JsMessage {
 	readonly multiplier!: { x: number; y: number };
 }
 
-export class UpdateRulers extends JsMessage {
+export class UpdateDocumentRulers extends JsMessage {
 	@TupleToVec2
 	readonly origin!: { x: number; y: number };
 
@@ -201,24 +201,18 @@ export class UpdateRulers extends JsMessage {
 	readonly interval!: number;
 }
 
-export class ExportDocument extends JsMessage {
+export class TriggerFileDownload extends JsMessage {
 	readonly document!: string;
 
 	readonly name!: string;
 }
 
-export class SaveDocument extends JsMessage {
-	readonly document!: string;
-
-	readonly name!: string;
-}
-
-export class OpenDocumentBrowse extends JsMessage {}
+export class TriggerFileUpload extends JsMessage {}
 
 export class DocumentChanged extends JsMessage {}
 
-export class DisplayFolderTreeStructure extends JsMessage {
-	constructor(readonly layerId: BigInt, readonly children: DisplayFolderTreeStructure[]) {
+export class DisplayDocumentLayerTreeStructure extends JsMessage {
+	constructor(readonly layerId: BigInt, readonly children: DisplayDocumentLayerTreeStructure[]) {
 		super();
 	}
 }
@@ -228,7 +222,7 @@ interface DataBuffer {
 	length: BigInt;
 }
 
-export function newDisplayFolderTreeStructure(input: { data_buffer: DataBuffer }, wasm: WasmInstance): DisplayFolderTreeStructure {
+export function newDisplayDocumentLayerTreeStructure(input: { data_buffer: DataBuffer }, wasm: WasmInstance): DisplayDocumentLayerTreeStructure {
 	const { pointer, length } = input.data_buffer;
 	const pointerNum = Number(pointer);
 	const lengthNum = Number(length);
@@ -245,7 +239,7 @@ export function newDisplayFolderTreeStructure(input: { data_buffer: DataBuffer }
 	const layerIdsSection = new DataView(wasmMemoryBuffer, pointerNum + 8 + structureSectionLength * 8);
 
 	let layersEncountered = 0;
-	let currentFolder = new DisplayFolderTreeStructure(BigInt(-1), []);
+	let currentFolder = new DisplayDocumentLayerTreeStructure(BigInt(-1), []);
 	const currentFolderStack = [currentFolder];
 
 	for (let i = 0; i < structureSectionLength; i += 1) {
@@ -260,7 +254,7 @@ export function newDisplayFolderTreeStructure(input: { data_buffer: DataBuffer }
 			const layerId = layerIdsSection.getBigUint64(layersEncountered * 8, true);
 			layersEncountered += 1;
 
-			const childLayer = new DisplayFolderTreeStructure(layerId, []);
+			const childLayer = new DisplayDocumentLayerTreeStructure(layerId, []);
 			currentFolder.children.push(childLayer);
 		}
 
@@ -282,17 +276,17 @@ export function newDisplayFolderTreeStructure(input: { data_buffer: DataBuffer }
 	return currentFolder;
 }
 
-export class UpdateLayer extends JsMessage {
+export class UpdateDocumentLayer extends JsMessage {
 	@Type(() => LayerPanelEntry)
 	readonly data!: LayerPanelEntry;
 }
 
-export class SetCanvasZoom extends JsMessage {
-	readonly new_zoom!: number;
+export class UpdateCanvasZoom extends JsMessage {
+	readonly factor!: number;
 }
 
-export class SetCanvasRotation extends JsMessage {
-	readonly new_radians!: number;
+export class UpdateCanvasRotation extends JsMessage {
+	readonly angle_radians!: number;
 }
 
 export type BlendMode =
@@ -348,7 +342,7 @@ export class IndexedDbDocumentDetails extends DocumentDetails {
 	id!: string;
 }
 
-export class AutoSaveDocument extends JsMessage {
+export class TriggerIndexedDbWriteDocument extends JsMessage {
 	document!: string;
 
 	@Type(() => IndexedDbDocumentDetails)
@@ -357,7 +351,7 @@ export class AutoSaveDocument extends JsMessage {
 	version!: string;
 }
 
-export class RemoveAutoSaveDocument extends JsMessage {
+export class TriggerIndexedDbRemoveDocument extends JsMessage {
 	// Use a string since IndexedDB can not use BigInts for keys
 	@Transform(({ value }: { value: BigInt }) => value.toString())
 	document_id!: string;
@@ -369,29 +363,28 @@ type JSMessageFactory = (data: any, wasm: WasmInstance, instance: RustEditorInst
 type MessageMaker = typeof JsMessage | JSMessageFactory;
 
 export const messageConstructors: Record<string, MessageMaker> = {
-	UpdateArtwork,
-	UpdateOverlays,
-	UpdateScrollbars,
-	UpdateRulers,
-	ExportDocument,
-	SaveDocument,
-	OpenDocumentBrowse,
-	DisplayFolderTreeStructure: newDisplayFolderTreeStructure,
-	UpdateLayer,
-	SetActiveTool,
-	SetActiveDocument,
+	UpdateDocumentArtwork,
+	UpdateDocumentOverlays,
+	UpdateDocumentScrollbars,
+	UpdateDocumentRulers,
+	TriggerFileDownload,
+	TriggerFileUpload,
+	DisplayDocumentLayerTreeStructure: newDisplayDocumentLayerTreeStructure,
+	UpdateDocumentLayer,
+	UpdateActiveTool,
+	UpdateActiveDocument,
 	UpdateOpenDocumentsList,
 	UpdateInputHints,
 	UpdateWorkingColors,
-	SetCanvasZoom,
-	SetCanvasRotation,
-	DisplayError,
-	DisplayPanic,
+	UpdateCanvasZoom,
+	UpdateCanvasRotation,
+	DisplayDialogError,
+	DisplayDialogPanic,
 	DisplayConfirmationToCloseDocument,
 	DisplayConfirmationToCloseAllDocuments,
-	DisplayAboutGraphiteDialog,
-	AutoSaveDocument,
-	RemoveAutoSaveDocument,
-	UpdateArtboards,
+	DisplayDialogAboutGraphite,
+	TriggerIndexedDbWriteDocument,
+	TriggerIndexedDbRemoveDocument,
+	UpdateDocumentArtboards,
 } as const;
 export type JsMessageType = keyof typeof messageConstructors;
diff --git a/frontend/src/lifetime/auto-save.ts b/frontend/src/lifetime/auto-save.ts
index 088d93be..58e76299 100644
--- a/frontend/src/lifetime/auto-save.ts
+++ b/frontend/src/lifetime/auto-save.ts
@@ -1,4 +1,4 @@
-import { AutoSaveDocument, RemoveAutoSaveDocument } from "@/dispatcher/js-messages";
+import { TriggerIndexedDbWriteDocument, TriggerIndexedDbRemoveDocument } from "@/dispatcher/js-messages";
 import { DocumentsState } from "@/state/documents";
 import { EditorState, getWasmInstance } from "@/state/wasm-loader";
 
@@ -39,13 +39,15 @@ export function createAutoSaveManager(editor: EditorState, documents: DocumentsS
 
 		return new Promise((resolve) => {
 			request.onsuccess = (): void => {
-				const previouslySavedDocuments: AutoSaveDocument[] = request.result;
+				const previouslySavedDocuments: TriggerIndexedDbWriteDocument[] = request.result;
 
 				const documentOrder: string[] = JSON.parse(window.localStorage.getItem(GRAPHITE_AUTO_SAVE_ORDER_KEY) || "[]");
-				const orderedSavedDocuments = documentOrder.map((id) => previouslySavedDocuments.find((autoSave) => autoSave.details.id === id)).filter((x) => x !== undefined) as AutoSaveDocument[];
+				const orderedSavedDocuments = documentOrder
+					.map((id) => previouslySavedDocuments.find((autoSave) => autoSave.details.id === id))
+					.filter((x) => x !== undefined) as TriggerIndexedDbWriteDocument[];
 
 				const currentDocumentVersion = getWasmInstance().graphite_version();
-				orderedSavedDocuments.forEach((doc: AutoSaveDocument) => {
+				orderedSavedDocuments.forEach((doc: TriggerIndexedDbWriteDocument) => {
 					if (doc.version === currentDocumentVersion) {
 						editor.instance.open_auto_saved_document(BigInt(doc.details.id), doc.details.name, doc.details.is_saved, doc.document);
 					} else {
@@ -70,14 +72,14 @@ export function createAutoSaveManager(editor: EditorState, documents: DocumentsS
 		storeDocumentOrder();
 	};
 
-	editor.dispatcher.subscribeJsMessage(AutoSaveDocument, async (autoSaveDocument) => {
+	editor.dispatcher.subscribeJsMessage(TriggerIndexedDbWriteDocument, async (autoSaveDocument) => {
 		const db = await databaseConnection;
 		const transaction = db.transaction(GRAPHITE_AUTO_SAVE_STORE, "readwrite");
 		transaction.objectStore(GRAPHITE_AUTO_SAVE_STORE).put(autoSaveDocument);
 		storeDocumentOrder();
 	});
 
-	editor.dispatcher.subscribeJsMessage(RemoveAutoSaveDocument, async (removeAutoSaveDocument) => {
+	editor.dispatcher.subscribeJsMessage(TriggerIndexedDbRemoveDocument, async (removeAutoSaveDocument) => {
 		removeDocument(removeAutoSaveDocument.document_id);
 	});
 
diff --git a/frontend/src/lifetime/errors.ts b/frontend/src/lifetime/errors.ts
index 4d646963..26fb368c 100644
--- a/frontend/src/lifetime/errors.ts
+++ b/frontend/src/lifetime/errors.ts
@@ -1,4 +1,4 @@
-import { DisplayError, DisplayPanic } from "@/dispatcher/js-messages";
+import { DisplayDialogError, DisplayDialogPanic } from "@/dispatcher/js-messages";
 import { DialogState } from "@/state/dialog";
 import { EditorState } from "@/state/wasm-loader";
 import { stripIndents } from "@/utilities/strip-indents";
@@ -6,7 +6,7 @@ import { TextButtonWidget } from "@/utilities/widgets";
 
 export function initErrorHandling(editor: EditorState, dialogState: DialogState): void {
 	// Graphite error dialog
-	editor.dispatcher.subscribeJsMessage(DisplayError, (displayError) => {
+	editor.dispatcher.subscribeJsMessage(DisplayDialogError, (displayDialogError) => {
 		const okButton: TextButtonWidget = {
 			kind: "TextButton",
 			callback: async () => dialogState.dismissDialog(),
@@ -14,16 +14,16 @@ export function initErrorHandling(editor: EditorState, dialogState: DialogState)
 		};
 		const buttons = [okButton];
 
-		dialogState.createDialog("Warning", displayError.title, displayError.description, buttons);
+		dialogState.createDialog("Warning", displayDialogError.title, displayDialogError.description, buttons);
 	});
 
 	// Code panic dialog and console error
-	editor.dispatcher.subscribeJsMessage(DisplayPanic, (displayPanic) => {
+	editor.dispatcher.subscribeJsMessage(DisplayDialogPanic, (displayDialogPanic) => {
 		// `Error.stackTraceLimit` is only available in V8/Chromium
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		(Error as any).stackTraceLimit = Infinity;
 		const stackTrace = new Error().stack || "";
-		const panicDetails = `${displayPanic.panic_info}\n\n${stackTrace}`;
+		const panicDetails = `${displayDialogPanic.panic_info}\n\n${stackTrace}`;
 
 		// eslint-disable-next-line no-console
 		console.error(panicDetails);
@@ -45,7 +45,7 @@ export function initErrorHandling(editor: EditorState, dialogState: DialogState)
 		};
 		const buttons = [reloadButton, copyErrorLogButton, reportOnGithubButton];
 
-		dialogState.createDialog("Warning", displayPanic.title, displayPanic.description, buttons);
+		dialogState.createDialog("Warning", displayDialogPanic.title, displayDialogPanic.description, buttons);
 	});
 }
 
diff --git a/frontend/src/state/dialog.ts b/frontend/src/state/dialog.ts
index 896f928d..88031489 100644
--- a/frontend/src/state/dialog.ts
+++ b/frontend/src/state/dialog.ts
@@ -1,6 +1,6 @@
 import { reactive, readonly } from "vue";
 
-import { DisplayAboutGraphiteDialog } from "@/dispatcher/js-messages";
+import { DisplayDialogAboutGraphite } from "@/dispatcher/js-messages";
 import { EditorState } from "@/state/wasm-loader";
 import { IconName } from "@/utilities/icons";
 import { stripIndents } from "@/utilities/strip-indents";
@@ -106,7 +106,7 @@ export function createDialogState(editor: EditorState) {
 	};
 
 	// Run on creation
-	editor.dispatcher.subscribeJsMessage(DisplayAboutGraphiteDialog, () => onAboutHandler());
+	editor.dispatcher.subscribeJsMessage(DisplayDialogAboutGraphite, () => onAboutHandler());
 
 	return {
 		state: readonly(state),
diff --git a/frontend/src/state/documents.ts b/frontend/src/state/documents.ts
index a929db8f..0ecc8c08 100644
--- a/frontend/src/state/documents.ts
+++ b/frontend/src/state/documents.ts
@@ -4,11 +4,10 @@ import { reactive, readonly } from "vue";
 import {
 	DisplayConfirmationToCloseAllDocuments,
 	DisplayConfirmationToCloseDocument,
-	ExportDocument,
+	TriggerFileDownload,
 	FrontendDocumentDetails,
-	OpenDocumentBrowse,
-	SaveDocument,
-	SetActiveDocument,
+	TriggerFileUpload,
+	UpdateActiveDocument,
 	UpdateOpenDocumentsList,
 } from "@/dispatcher/js-messages";
 import { DialogState } from "@/state/dialog";
@@ -81,9 +80,9 @@ export function createDocumentsState(editor: EditorState, dialogState: DialogSta
 		state.documents = updateOpenDocumentList.open_documents;
 	});
 
-	editor.dispatcher.subscribeJsMessage(SetActiveDocument, (setActiveDocument) => {
+	editor.dispatcher.subscribeJsMessage(UpdateActiveDocument, (updateActiveDocument) => {
 		// Assume we receive a correct document id
-		const activeId = state.documents.findIndex((doc) => doc.id === setActiveDocument.document_id);
+		const activeId = state.documents.findIndex((doc) => doc.id === updateActiveDocument.document_id);
 		state.activeDocumentIndex = activeId;
 	});
 
@@ -95,18 +94,14 @@ export function createDocumentsState(editor: EditorState, dialogState: DialogSta
 		closeAllDocumentsWithConfirmation();
 	});
 
-	editor.dispatcher.subscribeJsMessage(OpenDocumentBrowse, async () => {
+	editor.dispatcher.subscribeJsMessage(TriggerFileUpload, async () => {
 		const extension = editor.rawWasm.file_save_suffix();
 		const data = await upload(extension);
 		editor.instance.open_document_file(data.filename, data.content);
 	});
 
-	editor.dispatcher.subscribeJsMessage(ExportDocument, (exportDocument) => {
-		download(exportDocument.name, exportDocument.document);
-	});
-
-	editor.dispatcher.subscribeJsMessage(SaveDocument, (saveDocument) => {
-		download(saveDocument.name, saveDocument.document);
+	editor.dispatcher.subscribeJsMessage(TriggerFileDownload, (triggerFileDownload) => {
+		download(triggerFileDownload.name, triggerFileDownload.document);
 	});
 
 	// Get the initial documents
diff --git a/frontend/wasm/src/lib.rs b/frontend/wasm/src/lib.rs
index 15e89894..9bb85edd 100644
--- a/frontend/wasm/src/lib.rs
+++ b/frontend/wasm/src/lib.rs
@@ -36,7 +36,7 @@ fn panic_hook(info: &panic::PanicInfo) {
 	log::error!("{}", info);
 	EDITOR_INSTANCES.with(|instances| {
 		instances.borrow_mut().values_mut().for_each(|instance| {
-			instance.1.handle_response_rust_proxy(FrontendMessage::DisplayPanic {
+			instance.1.handle_response_rust_proxy(FrontendMessage::DisplayDialogPanic {
 				panic_info: panic_info.clone(),
 				title: title.clone(),
 				description: description.clone(),