diff --git a/packages/studio-base/src/i18n/en/panels.ts b/packages/studio-base/src/i18n/en/panels.ts
index c9765b8d05..4c5ea31cbd 100644
--- a/packages/studio-base/src/i18n/en/panels.ts
+++ b/packages/studio-base/src/i18n/en/panels.ts
@@ -50,8 +50,8 @@ export const panels = {
   teleopDescription: "Teleoperate a robot over a live connection.",
   topicGraph: "Topic Graph",
   topicGraphDescription: "Display a graph of active nodes, topics, and services.",
-  triggerButton: "Custom: Trigger Button",
-  triggerButtonDescription: "Button to call std_srvs/Trigger.",
+  serviceButton: "Custom: Service Button",
+  serviceButtonDescription: "Button to call std_srvs/Trigger.",
   userScripts: "User Scripts",
   userScriptsDescription:
     "Write custom data transformations in TypeScript. Previously known as Node Playground.",
diff --git a/packages/studio-base/src/panels/EStop/EStop.tsx b/packages/studio-base/src/panels/EStop/EStop.tsx
index 46db6c8a8e..f214238e5c 100644
--- a/packages/studio-base/src/panels/EStop/EStop.tsx
+++ b/packages/studio-base/src/panels/EStop/EStop.tsx
@@ -365,7 +365,7 @@ function EStopContent(
                   borderRadius: "0.3rem",
                 }}
               >
-                {eStopAction?.toUpperCase() ?? "Wait for feedback"}
+                {eStopAction?.toUpperCase() ?? "Waiting..."}
               </Button>
             </span>
           </Stack>
diff --git a/packages/studio-base/src/panels/TriggerButton/TriggerButton.tsx b/packages/studio-base/src/panels/ServiceButton/ServiceButton.tsx
similarity index 94%
rename from packages/studio-base/src/panels/TriggerButton/TriggerButton.tsx
rename to packages/studio-base/src/panels/ServiceButton/ServiceButton.tsx
index 9343580bda..23146c12e9 100644
--- a/packages/studio-base/src/panels/TriggerButton/TriggerButton.tsx
+++ b/packages/studio-base/src/panels/ServiceButton/ServiceButton.tsx
@@ -9,7 +9,7 @@ import { makeStyles } from "tss-react/mui";
 import Log from "@foxglove/log";
 import { PanelExtensionContext, SettingsTreeAction } from "@foxglove/studio";
 import Stack from "@foxglove/studio-base/components/Stack";
-import { Config } from "@foxglove/studio-base/panels/TriggerButton/types";
+import { Config } from "@foxglove/studio-base/panels/ServiceButton/types";
 import ThemeProvider from "@foxglove/studio-base/theme/ThemeProvider";
 
 import { defaultConfig, settingsActionReducer, useSettingsTree } from "./settings";
@@ -88,17 +88,17 @@ function parseInput(value: string): { error?: string; parsedObject?: unknown } {
 }
 
 // Wrapper component with ThemeProvider so useStyles in the panel receives the right theme.
-export function TriggerButton({ context }: Props): JSX.Element {
+export function ServiceButton({ context }: Props): JSX.Element {
   const [colorScheme, setColorScheme] = useState<Palette["mode"]>("light");
 
   return (
     <ThemeProvider isDark={colorScheme === "dark"}>
-      <TriggerButtonContent context={context} setColorScheme={setColorScheme} />
+      <ServiceButtonContent context={context} setColorScheme={setColorScheme} />
     </ThemeProvider>
   );
 }
 
-function TriggerButtonContent(
+function ServiceButtonContent(
   props: Props & { setColorScheme: Dispatch<SetStateAction<Palette["mode"]>> },
 ): JSX.Element {
   const { context, setColorScheme } = props;
@@ -163,7 +163,7 @@ function TriggerButtonContent(
     return undefined;
   }, [context, config.serviceName]);
 
-  const canTriggerButton = Boolean(
+  const canServiceButton = Boolean(
     context.callService != undefined &&
     config.requestPayload &&
     config.serviceName &&
@@ -171,7 +171,7 @@ function TriggerButtonContent(
     state?.status !== "requesting",
   );
 
-  const triggerButtonClicked = useCallback(async () => {
+  const serviceButtonClicked = useCallback(async () => {
     if (!context.callService) {
       setState({ status: "error", value: "The data source does not allow calling services" });
       return;
@@ -263,13 +263,13 @@ function TriggerButtonContent(
                   {statusMessage}
                 </Typography>
               )}
-              <Tooltip title={config.buttonTooltip}>
+              <Tooltip title={config.buttonTooltip ? config.buttonTooltip : state?.value}>
                 <span>
                   <Button
                     className={classes.button}
                     variant="contained"
-                    disabled={!canTriggerButton}
-                    onClick={triggerButtonClicked}
+                    disabled={!canServiceButton}
+                    onClick={serviceButtonClicked}
                     data-testid="call-service-button"
                     style={{
                       minWidth: "200px",
diff --git a/packages/studio-base/src/panels/TriggerButton/index.stories.tsx b/packages/studio-base/src/panels/ServiceButton/index.stories.tsx
similarity index 76%
rename from packages/studio-base/src/panels/TriggerButton/index.stories.tsx
rename to packages/studio-base/src/panels/ServiceButton/index.stories.tsx
index 176e4a5822..e98671a357 100644
--- a/packages/studio-base/src/panels/TriggerButton/index.stories.tsx
+++ b/packages/studio-base/src/panels/ServiceButton/index.stories.tsx
@@ -10,7 +10,7 @@ import { PlayerCapabilities } from "@foxglove/studio-base/players/types";
 import PanelSetup, { Fixture } from "@foxglove/studio-base/stories/PanelSetup";
 import delay from "@foxglove/studio-base/util/delay";
 
-import TriggerButtonPanel from "./index";
+import ServiceButtonPanel from "./index";
 import { Config } from "./types";
 
 const successResponseJson = JSON.stringify({ success: true }, undefined, 2);
@@ -19,8 +19,8 @@ const baseConfig: Config = {
   requestPayload: `{\n  "data": true\n}`,
 };
 
-const getFixture = ({ allowTriggerButton }: { allowTriggerButton: boolean }): Fixture => {
-  const triggerButton = async (service: string, _request: unknown) => {
+const getFixture = ({ allowServiceButton }: { allowServiceButton: boolean }): Fixture => {
+  const serviceButton = async (service: string, _request: unknown) => {
     if (service !== baseConfig.serviceName) {
       throw new Error(`Service "${service}" does not exist`);
     }
@@ -35,14 +35,14 @@ const getFixture = ({ allowTriggerButton }: { allowTriggerButton: boolean }): Fi
       }),
     ),
     frame: {},
-    capabilities: allowTriggerButton ? [PlayerCapabilities.triggerButtons] : [],
-    triggerButton,
+    capabilities: allowServiceButton ? [PlayerCapabilities.serviceButtons] : [],
+    serviceButton,
   };
 };
 
 export default {
-  title: "panels/TriggerButton",
-  component: TriggerButtonPanel,
+  title: "panels/ServiceButton",
+  component: ServiceButtonPanel,
   parameters: {
     colorScheme: "both-column",
   },
@@ -59,27 +59,27 @@ export default {
 
 export const Default: StoryObj = {
   render: () => {
-    return <TriggerButtonPanel />;
+    return <ServiceButtonPanel />;
   },
 };
 
 export const DefaultHorizontalLayout: StoryObj = {
   render: () => {
-    return <TriggerButtonPanel overrideConfig={{ layout: "horizontal" }} />;
+    return <ServiceButtonPanel overrideConfig={{ layout: "horizontal" }} />;
   },
 };
 
-export const TriggerButtonEnabled: StoryObj = {
+export const ServiceButtonEnabled: StoryObj = {
   render: () => {
-    return <TriggerButtonPanel />;
+    return <ServiceButtonPanel />;
   },
 
-  parameters: { panelSetup: { fixture: getFixture({ allowTriggerButton: true }) } },
+  parameters: { panelSetup: { fixture: getFixture({ allowServiceButton: true }) } },
 };
 
-export const TriggerButtonEnabledServiceName: StoryObj = {
+export const ServiceButtonEnabledServiceName: StoryObj = {
   render: () => {
-    return <TriggerButtonPanel overrideConfig={{ ...baseConfig }} />;
+    return <ServiceButtonPanel overrideConfig={{ ...baseConfig }} />;
   },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
@@ -94,13 +94,13 @@ export const TriggerButtonEnabledServiceName: StoryObj = {
     }
   },
 
-  parameters: { panelSetup: { fixture: getFixture({ allowTriggerButton: true }) } },
+  parameters: { panelSetup: { fixture: getFixture({ allowServiceButton: true }) } },
 };
 
-export const TriggerButtonEnabledWithCustomButtonSettings: StoryObj = {
+export const ServiceButtonEnabledWithCustomButtonSettings: StoryObj = {
   render: () => {
     return (
-      <TriggerButtonPanel
+      <ServiceButtonPanel
         overrideConfig={{
           ...baseConfig,
           buttonColor: "#ffbf49",
@@ -118,14 +118,14 @@ export const TriggerButtonEnabledWithCustomButtonSettings: StoryObj = {
     });
   },
 
-  parameters: { panelSetup: { fixture: getFixture({ allowTriggerButton: true }) } },
+  parameters: { panelSetup: { fixture: getFixture({ allowServiceButton: true }) } },
 };
 
 const validJSON = `{\n  "a": 1,\n  "b": 2,\n  "c": 3\n}`;
 
 export const WithValidJSON: StoryObj = {
   render: () => {
-    return <TriggerButtonPanel overrideConfig={{ ...baseConfig, requestPayload: validJSON }} />;
+    return <ServiceButtonPanel overrideConfig={{ ...baseConfig, requestPayload: validJSON }} />;
   },
 };
 
@@ -133,14 +133,14 @@ const invalidJSON = `{\n  "a": 1,\n  'b: 2,\n  "c": 3\n}`;
 
 export const WithInvalidJSON: StoryObj = {
   render: () => {
-    return <TriggerButtonPanel overrideConfig={{ ...baseConfig, requestPayload: invalidJSON }} />;
+    return <ServiceButtonPanel overrideConfig={{ ...baseConfig, requestPayload: invalidJSON }} />;
   },
 };
 
 export const CallingServiceThatDoesNotExist: StoryObj = {
   render: () => {
     return (
-      <TriggerButtonPanel
+      <ServiceButtonPanel
         overrideConfig={{
           ...baseConfig,
           serviceName: "/non_existing_service",
@@ -161,5 +161,5 @@ export const CallingServiceThatDoesNotExist: StoryObj = {
     }
   },
 
-  parameters: { panelSetup: { fixture: getFixture({ allowTriggerButton: true }) } },
+  parameters: { panelSetup: { fixture: getFixture({ allowServiceButton: true }) } },
 };
diff --git a/packages/studio-base/src/panels/TriggerButton/index.tsx b/packages/studio-base/src/panels/ServiceButton/index.tsx
similarity index 83%
rename from packages/studio-base/src/panels/TriggerButton/index.tsx
rename to packages/studio-base/src/panels/ServiceButton/index.tsx
index 19fe937c24..696a1a60d1 100644
--- a/packages/studio-base/src/panels/TriggerButton/index.tsx
+++ b/packages/studio-base/src/panels/ServiceButton/index.tsx
@@ -12,7 +12,7 @@ import Panel from "@foxglove/studio-base/components/Panel";
 import { PanelExtensionAdapter } from "@foxglove/studio-base/components/PanelExtensionAdapter";
 import { SaveConfig } from "@foxglove/studio-base/types/panels";
 
-import { TriggerButton } from "./TriggerButton";
+import { ServiceButton } from "./ServiceButton";
 import { Config } from "./types";
 
 function initPanel(crash: ReturnType<typeof useCrash>, context: PanelExtensionContext) {
@@ -20,7 +20,7 @@ function initPanel(crash: ReturnType<typeof useCrash>, context: PanelExtensionCo
   ReactDOM.render(
     <StrictMode>
       <CaptureErrorBoundary onError={crash}>
-        <TriggerButton context={context} />
+        <ServiceButton context={context} />
       </CaptureErrorBoundary>
     </StrictMode>,
     context.panelElement,
@@ -36,7 +36,7 @@ type Props = {
   saveConfig: SaveConfig<Config>;
 };
 
-function TriggerButtonPanelAdapter(props: Props) {
+function ServiceButtonPanelAdapter(props: Props) {
   const crash = useCrash();
   const boundInitPanel = useMemo(() => initPanel.bind(undefined, crash), [crash]);
 
@@ -50,7 +50,7 @@ function TriggerButtonPanelAdapter(props: Props) {
   );
 }
 
-TriggerButtonPanelAdapter.panelType = "TriggerButton";
-TriggerButtonPanelAdapter.defaultConfig = {};
+ServiceButtonPanelAdapter.panelType = "ServiceButton";
+ServiceButtonPanelAdapter.defaultConfig = {};
 
-export default Panel(TriggerButtonPanelAdapter);
+export default Panel(ServiceButtonPanelAdapter);
diff --git a/packages/studio-base/src/panels/TriggerButton/settings.ts b/packages/studio-base/src/panels/ServiceButton/settings.ts
similarity index 100%
rename from packages/studio-base/src/panels/TriggerButton/settings.ts
rename to packages/studio-base/src/panels/ServiceButton/settings.ts
diff --git a/packages/studio-base/src/panels/TriggerButton/styles.css b/packages/studio-base/src/panels/ServiceButton/styles.css
similarity index 100%
rename from packages/studio-base/src/panels/TriggerButton/styles.css
rename to packages/studio-base/src/panels/ServiceButton/styles.css
diff --git a/packages/studio-base/src/panels/TriggerButton/thumbnail.png b/packages/studio-base/src/panels/ServiceButton/thumbnail.png
similarity index 100%
rename from packages/studio-base/src/panels/TriggerButton/thumbnail.png
rename to packages/studio-base/src/panels/ServiceButton/thumbnail.png
diff --git a/packages/studio-base/src/panels/TriggerButton/types.ts b/packages/studio-base/src/panels/ServiceButton/types.ts
similarity index 100%
rename from packages/studio-base/src/panels/TriggerButton/types.ts
rename to packages/studio-base/src/panels/ServiceButton/types.ts
diff --git a/packages/studio-base/src/panels/index.ts b/packages/studio-base/src/panels/index.ts
index 2a83644f7b..dbf7653b07 100644
--- a/packages/studio-base/src/panels/index.ts
+++ b/packages/studio-base/src/panels/index.ts
@@ -20,13 +20,13 @@ import parametersThumbnail from "./Parameters/thumbnail.png";
 import plotThumbnail from "./Plot/thumbnail.png";
 import publishThumbnail from "./Publish/thumbnail.png";
 import rawMessagesThumbnail from "./RawMessages/thumbnail.png";
+import serviceButtonThumbnail from "./ServiceButton/thumbnail.png";
 import stateTransitionsThumbnail from "./StateTransitions/thumbnail.png";
 import tabThumbnail from "./Tab/thumbnail.png";
 import tableThumbnail from "./Table/thumbnail.png";
 import teleopThumbnail from "./Teleop/thumbnail.png";
 import threeDeeRenderThumbnail from "./ThreeDeeRender/thumbnail.png";
 import topicGraphThumbnail from "./TopicGraph/thumbnail.png";
-import triggerButtonThumbnail from "./TriggerButton/thumbnail.png";
 import variableSliderThumbnail from "./VariableSlider/thumbnail.png";
 import diagnosticStatusThumbnail from "./diagnostics/thumbnails/diagnostic-status.png";
 import diagnosticSummaryThumbnail from "./diagnostics/thumbnails/diagnostic-summary.png";
@@ -199,11 +199,11 @@ export const getBuiltin: (t: TFunction<"panels">) => PanelInfo[] = (t) => [
     hasCustomToolbar: true,
   },
   {
-    title: t("triggerButton"),
-    type: "TriggerButton",
-    description: t("triggerButtonDescription"),
-    thumbnail: triggerButtonThumbnail,
-    module: async () => await import("./TriggerButton"),
+    title: t("serviceButton"),
+    type: "ServiceButton",
+    description: t("serviceButtonDescription"),
+    thumbnail: serviceButtonThumbnail,
+    module: async () => await import("./ServiceButton"),
   },
   {
     title: t("eStop"),