diff --git a/src/components/action-menu/action-menu.tsx b/src/components/action-menu/action-menu.tsx
index 6ea00650e7a..6d1fd2ea944 100755
--- a/src/components/action-menu/action-menu.tsx
+++ b/src/components/action-menu/action-menu.tsx
@@ -299,14 +299,14 @@ export class ActionMenu implements LoadableComponent {
 
     return (
       <calcite-popover
-        disableFocusTrap={true}
-        disablePointer={true}
         flipPlacements={flipPlacements}
+        focusTrapDisabled={true}
         label={label}
         offsetDistance={0}
         open={open}
         overlayPositioning={overlayPositioning}
         placement={placement}
+        pointerDisabled={true}
         referenceElement={menuButtonEl}
       >
         <div
diff --git a/src/components/dropdown/dropdown.e2e.ts b/src/components/dropdown/dropdown.e2e.ts
index 6955c85b2ba..45db0d3b5ee 100644
--- a/src/components/dropdown/dropdown.e2e.ts
+++ b/src/components/dropdown/dropdown.e2e.ts
@@ -692,9 +692,9 @@ describe("calcite-dropdown", () => {
     expect(await dropdownWrapper.isVisible()).toBe(false);
   });
 
-  it("remains open when disable-close-on-select is requested and selected item is not in a selection-mode:none group", async () => {
+  it("remains open when close-on-select-disabled is requested and selected item is not in a selection-mode:none group", async () => {
     const page = await newE2EPage();
-    await page.setContent(html`<calcite-dropdown disable-close-on-select>
+    await page.setContent(html`<calcite-dropdown close-on-select-disabled>
       <calcite-button id="trigger" slot="trigger">Open dropdown</calcite-button>
       <calcite-dropdown-group id="group-1" selection-mode="single">
         <calcite-dropdown-item id="item-1"> Dropdown Item Content </calcite-dropdown-item>
@@ -722,9 +722,9 @@ describe("calcite-dropdown", () => {
     expect(await dropdownWrapper.isVisible()).toBe(true);
   });
 
-  it("closes when disable-close-on-select is requested and selected item is in a selection-mode:none group", async () => {
+  it("closes when close-on-select-disabled is requested and selected item is in a selection-mode:none group", async () => {
     const page = await newE2EPage();
-    await page.setContent(html`<calcite-dropdown disable-close-on-select>
+    await page.setContent(html`<calcite-dropdown close-on-select-disabled>
       <calcite-button id="trigger" slot="trigger">Open dropdown</calcite-button>
       <calcite-dropdown-group id="group-1" selection-mode="none">
         <calcite-dropdown-item>
@@ -983,7 +983,7 @@ describe("calcite-dropdown", () => {
 
   it("item selection should work when placed inside shadow DOM (#992)", async () => {
     const wrappedDropdownTemplateHTML = html`
-      <calcite-dropdown disable-close-on-select>
+      <calcite-dropdown close-on-select-disabled>
         <calcite-button slot="trigger">Open</calcite-button>
         <calcite-dropdown-group selection-mode="single">
           <calcite-dropdown-item id="item-1" selected>1</calcite-dropdown-item>
diff --git a/src/components/dropdown/dropdown.stories.ts b/src/components/dropdown/dropdown.stories.ts
index 5ff10821f87..8143c3ebb51 100644
--- a/src/components/dropdown/dropdown.stories.ts
+++ b/src/components/dropdown/dropdown.stories.ts
@@ -25,7 +25,7 @@ export const simple = (): string => html`
     scale="${select("scale", ["s", "m", "l"], "m")}"
     width="${select("width", ["s", "m", "l"], "m")}"
     type="${select("type", ["click", "hover"], "click")}"
-    ${boolean("disable-close-on-select", false)}
+    ${boolean("close-on-select-disabled", false)}
     ${boolean("disabled", false)}
   >
     <calcite-button slot="trigger">Open Dropdown</calcite-button>
@@ -46,7 +46,7 @@ export const simpleAutoWidth = (): string => html`
     placement="${select("placement", menuPlacements, defaultMenuPlacement)}"
     scale="${select("scale", ["s", "m", "l"], "m")}"
     type="${select("type", ["click", "hover"], "click")}"
-    ${boolean("disable-close-on-select", false)}
+    ${boolean("close-on-select-disabled", false)}
     ${boolean("disabled", false)}
   >
     <calcite-button slot="trigger">Open Dropdown</calcite-button>
@@ -70,7 +70,7 @@ export const simpleFullWidth = (): string => html`
       scale="${select("scale", ["s", "m", "l"], "m")}"
       width="${select("width", ["s", "m", "l"], "m")}"
       type="${select("type", ["click", "hover"], "click")}"
-      ${boolean("disable-close-on-select", false)}
+      ${boolean("close-on-select-disabled", false)}
       ${boolean("disabled", false)}
     >
       <calcite-button width="full" slot="trigger">Open Dropdown</calcite-button>
@@ -93,7 +93,7 @@ export const withIcons = (): string => html`
     scale="${select("scale", ["s", "m", "l"], "m")}"
     width="${select("width", ["s", "m", "l"], "m")}"
     type="${select("type", ["click", "hover"], "click")}"
-    ${boolean("disable-close-on-select", false)}
+    ${boolean("close-on-select-disabled", false)}
     ${boolean("disabled", false)}
   >
     <calcite-button slot="trigger">Open Dropdown</calcite-button>
@@ -131,7 +131,7 @@ export const groupsAndSelectionModes = (): string => html`
     scale="${select("scale", ["s", "m", "l"], "m")}"
     width="${select("width", ["s", "m", "l"], "m")}"
     type="${select("type", ["click", "hover"], "click")}"
-    ${boolean("disable-close-on-select", false)}
+    ${boolean("close-on-select-disabled", false)}
     ${boolean("disabled", false)}
   >
     <calcite-button slot="trigger">Open Dropdown</calcite-button>
@@ -159,7 +159,7 @@ export const itemsAsLinks = (): string => html`
     scale="${select("scale", ["s", "m", "l"], "m")}"
     width="${select("width", ["s", "m", "l"], "m")}"
     type="${select("type", ["click", "hover"], "click")}"
-    ${boolean("disable-close-on-select", false)}
+    ${boolean("close-on-select-disabled", false)}
     ${boolean("disabled", false)}
   >
     <calcite-button slot="trigger">Open Dropdown</calcite-button>
@@ -197,7 +197,7 @@ export const darkThemeRTL_TestOnly = (): string => html`
     scale="${select("scale", ["s", "m", "l"], "m")}"
     width="${select("width", ["s", "m", "l"], "m")}"
     type="${select("type", ["click", "hover"], "click")}"
-    ${boolean("disable-close-on-select", false)}
+    ${boolean("close-on-select-disabled", false)}
     ${boolean("disabled", false)}
   >
     <calcite-button slot="trigger">Open Dropdown</calcite-button>
@@ -232,7 +232,7 @@ export const itemsAsLinksDarkTheme = (): string => html`
     scale="${select("scale", ["s", "m", "l"], "m")}"
     width="${select("width", ["s", "m", "l"], "m")}"
     type="${select("type", ["click", "hover"], "click")}"
-    ${boolean("disable-close-on-select", false)}
+    ${boolean("close-on-select-disabled", false)}
     ${boolean("disabled", false)}
   >
     <calcite-button slot="trigger">Open Dropdown</calcite-button>
@@ -271,7 +271,7 @@ export const scrollingAfterCertainItems_TestOnly = (): string => html`
     scale="${select("scale", ["s", "m", "l"], "m")}"
     width="${select("width", ["s", "m", "l"], "m")}"
     type="${select("type", ["click", "hover"], "click")}"
-    ${boolean("disable-close-on-select", false)}
+    ${boolean("close-on-select-disabled", false)}
     ${boolean("disabled", false)}
   >
     <calcite-button slot="trigger">Open Dropdown</calcite-button>
@@ -398,7 +398,7 @@ export const alignedCenter_TestOnly = (): string => html`
       scale="${select("scale", ["s", "m", "l"], "m")}"
       width="${select("width", ["s", "m", "l"], "m")}"
       type="${select("type", ["click", "hover"], "click")}"
-      ${boolean("disable-close-on-select", false)}
+      ${boolean("close-on-select-disabled", false)}
       ${boolean("disabled", false)}
     >
       <calcite-button slot="trigger">Open Dropdown</calcite-button>
@@ -427,7 +427,7 @@ export const alignedCenterRTL_TestOnly = (): string => html`
       scale="${select("scale", ["s", "m", "l"], "m")}"
       width="${select("width", ["s", "m", "l"], "m")}"
       type="${select("type", ["click", "hover"], "click")}"
-      ${boolean("disable-close-on-select", false)}
+      ${boolean("close-on-select-disabled", false)}
       ${boolean("disabled", false)}
     >
       <calcite-button slot="trigger">Open Dropdown</calcite-button>
diff --git a/src/components/dropdown/dropdown.tsx b/src/components/dropdown/dropdown.tsx
index bae63559d17..6bd1253e2ca 100644
--- a/src/components/dropdown/dropdown.tsx
+++ b/src/components/dropdown/dropdown.tsx
@@ -93,7 +93,7 @@ export class Dropdown implements InteractiveComponent, OpenCloseComponent, Float
    * If the `selectionMode` of the selected `calcite-dropdown-item`'s containing `calcite-dropdown-group` is `"none"`, the component will always close.
    *
    */
-  @Prop({ reflect: true }) disableCloseOnSelect = false;
+  @Prop({ reflect: true }) closeOnSelectDisabled = false;
 
   /**
    * When `true`, interaction is prevented and the component is displayed with lower opacity.
@@ -384,7 +384,7 @@ export class Dropdown implements InteractiveComponent, OpenCloseComponent, Float
       item: event.detail.requestedDropdownItem
     });
     if (
-      !this.disableCloseOnSelect ||
+      !this.closeOnSelectDisabled ||
       event.detail.requestedDropdownGroup.selectionMode === "none"
     ) {
       this.closeCalciteDropdown();
diff --git a/src/components/dropdown/readme.md b/src/components/dropdown/readme.md
index 6bf290f4af1..52c699cc0cb 100644
--- a/src/components/dropdown/readme.md
+++ b/src/components/dropdown/readme.md
@@ -21,10 +21,10 @@ A `calcite-dropdown` can be used to provide an absolutely positioned set of sele
 
 ### Disabling-close-on-select
 
-You can choose to leave the dropdown open when an item is selected with the `disable-close-on-select` attribute. Note that this will only apply when the `calcite-dropdown-group` selection mode is set to `single` or `multi` - dropdowns will always close when an item in `none` selection mode is selected.
+You can choose to leave the dropdown open when an item is selected with the `close-on-select-disabled` attribute. Note that this will only apply when the `calcite-dropdown-group` selection mode is set to `single` or `multi` - dropdowns will always close when an item in `none` selection mode is selected.
 
 ```html
-<calcite-dropdown disable-close-on-select>
+<calcite-dropdown close-on-select-disabled>
   <calcite-button id="trigger" slot="trigger">Open dropdown</calcite-button>
   <calcite-dropdown-group id="group-1" selection-mode="single">
     <calcite-dropdown-item id="item-1"> Dropdown Item Content </calcite-dropdown-item>
@@ -60,19 +60,19 @@ You can combine groups in a single dropdown, with varying selection modes:
 
 ## Properties
 
-| Property               | Attribute                 | Description                                                                                                                                                                                                                                                                                                                                                                 | Type                                                                              | Default                |
-| ---------------------- | ------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | ---------------------- |
-| `disableCloseOnSelect` | `disable-close-on-select` | When `true`, the component will remain open after a selection is made. If the `selectionMode` of the selected `calcite-dropdown-item`'s containing `calcite-dropdown-group` is `"none"`, the component will always close.                                                                                                                                                   | `boolean`                                                                         | `false`                |
-| `disabled`             | `disabled`                | When `true`, interaction is prevented and the component is displayed with lower opacity.                                                                                                                                                                                                                                                                                    | `boolean`                                                                         | `false`                |
-| `flipPlacements`       | --                        | Defines the available placements that can be used when a flip occurs.                                                                                                                                                                                                                                                                                                       | `Placement[]`                                                                     | `undefined`            |
-| `maxItems`             | `max-items`               | Specifies the maximum number of `calcite-dropdown-item`s to display before showing a scroller. Value must be greater than `0`, and does not include `groupTitle`'s from `calcite-dropdown-group`.                                                                                                                                                                           | `number`                                                                          | `0`                    |
-| `open`                 | `open`                    | When `true`, displays and positions the component.                                                                                                                                                                                                                                                                                                                          | `boolean`                                                                         | `false`                |
-| `overlayPositioning`   | `overlay-positioning`     | Determines the type of positioning to use for the overlaid content. Using `"absolute"` will work for most cases. The component will be positioned inside of overflowing parent containers and will affect the container's layout. `"fixed"` should be used to escape an overflowing parent container, or when the reference element's `position` CSS property is `"fixed"`. | `"absolute" \| "fixed"`                                                           | `"absolute"`           |
-| `placement`            | `placement`               | Determines where the component will be positioned relative to the container element.                                                                                                                                                                                                                                                                                        | `"bottom" \| "bottom-end" \| "bottom-start" \| "top" \| "top-end" \| "top-start"` | `defaultMenuPlacement` |
-| `scale`                | `scale`                   | Specifies the size of the component.                                                                                                                                                                                                                                                                                                                                        | `"l" \| "m" \| "s"`                                                               | `"m"`                  |
-| `selectedItems`        | --                        | Specifies the component's selected items.                                                                                                                                                                                                                                                                                                                                   | `HTMLCalciteDropdownItemElement[]`                                                | `[]`                   |
-| `type`                 | `type`                    | Specifies the action to open the component from the container element.                                                                                                                                                                                                                                                                                                      | `"click" \| "hover"`                                                              | `"click"`              |
-| `width`                | `width`                   | Specifies the width of the component.                                                                                                                                                                                                                                                                                                                                       | `"l" \| "m" \| "s"`                                                               | `undefined`            |
+| Property                | Attribute                  | Description                                                                                                                                                                                                                                                                                                                                                                 | Type                                                                              | Default                |
+| ----------------------- | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------- | ---------------------- |
+| `closeOnSelectDisabled` | `close-on-select-disabled` | When `true`, the component will remain open after a selection is made. If the `selectionMode` of the selected `calcite-dropdown-item`'s containing `calcite-dropdown-group` is `"none"`, the component will always close.                                                                                                                                                   | `boolean`                                                                         | `false`                |
+| `disabled`              | `disabled`                 | When `true`, interaction is prevented and the component is displayed with lower opacity.                                                                                                                                                                                                                                                                                    | `boolean`                                                                         | `false`                |
+| `flipPlacements`        | --                         | Defines the available placements that can be used when a flip occurs.                                                                                                                                                                                                                                                                                                       | `Placement[]`                                                                     | `undefined`            |
+| `maxItems`              | `max-items`                | Specifies the maximum number of `calcite-dropdown-item`s to display before showing a scroller. Value must be greater than `0`, and does not include `groupTitle`'s from `calcite-dropdown-group`.                                                                                                                                                                           | `number`                                                                          | `0`                    |
+| `open`                  | `open`                     | When `true`, displays and positions the component.                                                                                                                                                                                                                                                                                                                          | `boolean`                                                                         | `false`                |
+| `overlayPositioning`    | `overlay-positioning`      | Determines the type of positioning to use for the overlaid content. Using `"absolute"` will work for most cases. The component will be positioned inside of overflowing parent containers and will affect the container's layout. `"fixed"` should be used to escape an overflowing parent container, or when the reference element's `position` CSS property is `"fixed"`. | `"absolute" \| "fixed"`                                                           | `"absolute"`           |
+| `placement`             | `placement`                | Determines where the component will be positioned relative to the container element.                                                                                                                                                                                                                                                                                        | `"bottom" \| "bottom-end" \| "bottom-start" \| "top" \| "top-end" \| "top-start"` | `defaultMenuPlacement` |
+| `scale`                 | `scale`                    | Specifies the size of the component.                                                                                                                                                                                                                                                                                                                                        | `"l" \| "m" \| "s"`                                                               | `"m"`                  |
+| `selectedItems`         | --                         | Specifies the component's selected items.                                                                                                                                                                                                                                                                                                                                   | `HTMLCalciteDropdownItemElement[]`                                                | `[]`                   |
+| `type`                  | `type`                     | Specifies the action to open the component from the container element.                                                                                                                                                                                                                                                                                                      | `"click" \| "hover"`                                                              | `"click"`              |
+| `width`                 | `width`                    | Specifies the width of the component.                                                                                                                                                                                                                                                                                                                                       | `"l" \| "m" \| "s"`                                                               | `undefined`            |
 
 ## Events
 
diff --git a/src/components/dropdown/usage/Disabling-close-on-select.md b/src/components/dropdown/usage/Disabling-close-on-select.md
index b0e2469873e..cb3d543b2e2 100644
--- a/src/components/dropdown/usage/Disabling-close-on-select.md
+++ b/src/components/dropdown/usage/Disabling-close-on-select.md
@@ -1,7 +1,7 @@
-You can choose to leave the dropdown open when an item is selected with the `disable-close-on-select` attribute. Note that this will only apply when the `calcite-dropdown-group` selection mode is set to `single` or `multi` - dropdowns will always close when an item in `none` selection mode is selected.
+You can choose to leave the dropdown open when an item is selected with the `close-on-select-disabled` attribute. Note that this will only apply when the `calcite-dropdown-group` selection mode is set to `single` or `multi` - dropdowns will always close when an item in `none` selection mode is selected.
 
 ```html
-<calcite-dropdown disable-close-on-select>
+<calcite-dropdown close-on-select-disabled>
   <calcite-button id="trigger" slot="trigger">Open dropdown</calcite-button>
   <calcite-dropdown-group id="group-1" selection-mode="single">
     <calcite-dropdown-item id="item-1"> Dropdown Item Content </calcite-dropdown-item>
diff --git a/src/components/input-time-picker/input-time-picker.tsx b/src/components/input-time-picker/input-time-picker.tsx
index 8080c852a75..9282f68b080 100644
--- a/src/components/input-time-picker/input-time-picker.tsx
+++ b/src/components/input-time-picker/input-time-picker.tsx
@@ -607,7 +607,7 @@ export class InputTimePicker
           />
         </div>
         <calcite-popover
-          disableFocusTrap={true}
+          focusTrapDisabled={true}
           id={popoverId}
           label="Time Picker"
           open={this.open}
diff --git a/src/components/modal/modal.e2e.ts b/src/components/modal/modal.e2e.ts
index 017a843c765..5c2ee336cf9 100644
--- a/src/components/modal/modal.e2e.ts
+++ b/src/components/modal/modal.e2e.ts
@@ -22,7 +22,7 @@ describe("calcite-modal properties", () => {
     const page = await newE2EPage();
     await page.setContent("<calcite-modal></calcite-modal>");
     const modal = await page.find("calcite-modal");
-    modal.setProperty("disableCloseButton", true);
+    modal.setProperty("closeButtonDisabled", true);
     await page.waitForChanges();
     const closeButton = await page.find("calcite-modal >>> .close");
     expect(closeButton).toBe(null);
@@ -294,7 +294,7 @@ describe("calcite-modal accessibility checks", () => {
   it("traps focus within the modal when open and disabled close button", async () => {
     const page = await newE2EPage();
     await page.setContent(
-      `<calcite-modal disable-close-button>
+      `<calcite-modal close-button-disabled>
         <div slot="content">
           <button class="btn-1">Focus1</button>
           <button class="btn-2">Focus1</button>
@@ -338,7 +338,7 @@ describe("calcite-modal accessibility checks", () => {
       }));
 
     it("focuses content if there is no close button", async () =>
-      focusable(createModalHTML(focusableContentHTML, "disable-close-button"), {
+      focusable(createModalHTML(focusableContentHTML, "close-button-disabled"), {
         focusTargetSelector: `.${focusableContentTargetClass}`
       }));
 
@@ -423,7 +423,7 @@ describe("calcite-modal accessibility checks", () => {
 
   it("should not close when the scrim is clicked", async () => {
     const page = await newE2EPage();
-    await page.setContent(`<calcite-modal disable-outside-close intl-close="test"></calcite-modal>`);
+    await page.setContent(`<calcite-modal outside-close-disabled intl-close="test"></calcite-modal>`);
     const modal = await page.find("calcite-modal");
     modal.setProperty("open", true);
     await page.waitForChanges();
@@ -433,9 +433,9 @@ describe("calcite-modal accessibility checks", () => {
     expect(await modal.getProperty("open")).toBe(true);
   });
 
-  it("does not close when Escape is pressed and disable-escape is set", async () => {
+  it("does not close when Escape is pressed and escape-disabled is set", async () => {
     const page = await newE2EPage();
-    await page.setContent(`<calcite-modal disable-escape></calcite-modal>`);
+    await page.setContent(`<calcite-modal escape-disabled></calcite-modal>`);
     const modal = await page.find("calcite-modal");
     await modal.setProperty("open", true);
     await page.waitForChanges();
diff --git a/src/components/modal/modal.stories.ts b/src/components/modal/modal.stories.ts
index c7afe12ba14..b5041d5a6ca 100644
--- a/src/components/modal/modal.stories.ts
+++ b/src/components/modal/modal.stories.ts
@@ -24,7 +24,7 @@ export const simple = (): string => html`
     width="${select("width", ["s", "m", "l"], "s")}"
     ${boolean("fullscreen", false)}
     ${boolean("docked", false)}
-    ${boolean("disable-escape", false)}
+    ${boolean("escape-disabled", false)}
     intl-close="${text("intl-close", "Close")}"
   >
     <h3 slot="header">Small Modal</h3>
@@ -50,7 +50,7 @@ export const darkThemeRTLCustomSize_TestOnly = (): string => html`
     width="${number("width", 300)}"
     ${boolean("fullscreen", false)}
     ${boolean("docked", false)}
-    ${boolean("disable-escape", false)}
+    ${boolean("escape-disabled", false)}
     intl-close="${text("intl-close", "Close")}"
   >
     <h3 slot="header">Small Modal</h3>
diff --git a/src/components/modal/modal.tsx b/src/components/modal/modal.tsx
index ed9b3a8f303..a3f9870e3bc 100644
--- a/src/components/modal/modal.tsx
+++ b/src/components/modal/modal.tsx
@@ -92,24 +92,24 @@ export class Modal
   beforeClose: (el: HTMLElement) => Promise<void> = () => Promise.resolve();
 
   /** When `true`, disables the component's close button. */
-  @Prop({ reflect: true }) disableCloseButton = false;
+  @Prop({ reflect: true }) closeButtonDisabled = false;
 
   /**
    * When `true`, prevents focus trapping.
    */
-  @Prop({ reflect: true }) disableFocusTrap = false;
+  @Prop({ reflect: true }) focusTrapDisabled = false;
 
-  @Watch("disableFocusTrap")
-  handleDisableFocusTrap(disableFocusTrap: boolean): void {
+  @Watch("focusTrapDisabled")
+  handlefocusTrapDisabled(focusTrapDisabled: boolean): void {
     if (!this.open) {
       return;
     }
 
-    disableFocusTrap ? deactivateFocusTrap(this) : activateFocusTrap(this);
+    focusTrapDisabled ? deactivateFocusTrap(this) : activateFocusTrap(this);
   }
 
   /** When `true`, disables the closing of the component when clicked outside. */
-  @Prop({ reflect: true }) disableOutsideClose = false;
+  @Prop({ reflect: true }) outsideCloseDisabled = false;
 
   /**
    * Accessible name for the component's close button.
@@ -122,7 +122,7 @@ export class Modal
   @Prop({ reflect: true }) docked: boolean;
 
   /** When `true`, disables the default close on escape behavior. */
-  @Prop({ reflect: true }) disableEscape = false;
+  @Prop({ reflect: true }) escapeDisabled = false;
 
   /** Specifies the size of the component. */
   @Prop({ reflect: true }) scale: Scale = "m";
@@ -252,7 +252,7 @@ export class Modal
   }
 
   renderCloseButton(): VNode {
-    return !this.disableCloseButton ? (
+    return !this.closeButtonDisabled ? (
       <button
         aria-label={this.messages.close}
         class={CSS.close}
@@ -350,7 +350,7 @@ export class Modal
 
   @Listen("keydown", { target: "window" })
   handleEscape(event: KeyboardEvent): void {
-    if (this.open && !this.disableEscape && event.key === "Escape" && !event.defaultPrevented) {
+    if (this.open && !this.escapeDisabled && event.key === "Escape" && !event.defaultPrevented) {
       this.close();
       event.preventDefault();
     }
@@ -484,7 +484,7 @@ export class Modal
   }
 
   handleOutsideClose = (): void => {
-    if (this.disableOutsideClose) {
+    if (this.outsideCloseDisabled) {
       return;
     }
 
diff --git a/src/components/modal/readme.md b/src/components/modal/readme.md
index 3fbe7b23b16..18e13e4ee2b 100644
--- a/src/components/modal/readme.md
+++ b/src/components/modal/readme.md
@@ -55,23 +55,23 @@ modal.beforeClose = beforeClose;
 
 ## Properties
 
-| Property              | Attribute               | Description                                                                                                                                                          | Type                                 | Default                   |
-| --------------------- | ----------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------ | ------------------------- |
-| `active`              | `active`                | <span style="color:red">**[DEPRECATED]**</span> use `open` instead.<br/><br/>When `true`, the component is active.                                                   | `boolean`                            | `false`                   |
-| `backgroundColor`     | `background-color`      | Sets the background color of the component's content.                                                                                                                | `"grey" \| "white"`                  | `"white"`                 |
-| `beforeClose`         | --                      | Passes a function to run before the component closes.                                                                                                                | `(el: HTMLElement) => Promise<void>` | `() => Promise.resolve()` |
-| `color`               | `color`                 | Adds a color bar to the top of component for visual impact. Use color to add importance to destructive or workflow dialogs.                                          | `"blue" \| "red"`                    | `undefined`               |
-| `disableCloseButton`  | `disable-close-button`  | When `true`, disables the component's close button.                                                                                                                  | `boolean`                            | `false`                   |
-| `disableEscape`       | `disable-escape`        | When `true`, disables the default close on escape behavior.                                                                                                          | `boolean`                            | `false`                   |
-| `disableFocusTrap`    | `disable-focus-trap`    | When `true`, prevents focus trapping.                                                                                                                                | `boolean`                            | `false`                   |
-| `disableOutsideClose` | `disable-outside-close` | When `true`, disables the closing of the component when clicked outside.                                                                                             | `boolean`                            | `false`                   |
-| `docked`              | `docked`                | When `true`, prevents the component from expanding to the entire screen on mobile devices.                                                                           | `boolean`                            | `undefined`               |
-| `fullscreen`          | `fullscreen`            | Sets the component to always be fullscreen (overrides `width`).                                                                                                      | `boolean`                            | `undefined`               |
-| `intlClose`           | `intl-close`            | Accessible name for the component's close button.                                                                                                                    | `string`                             | `TEXT.close`              |
-| `noPadding`           | `no-padding`            | <span style="color:red">**[DEPRECATED]**</span> Use `--calcite-modal-padding` CSS variable instead.<br/><br/>When `true`, disables spacing to the content area slot. | `boolean`                            | `false`                   |
-| `open`                | `open`                  | When `true`, displays and positions the component.                                                                                                                   | `boolean`                            | `false`                   |
-| `scale`               | `scale`                 | Specifies the size of the component.                                                                                                                                 | `"l" \| "m" \| "s"`                  | `"m"`                     |
-| `width`               | `width`                 | Specifies the width of the component. Can use scale sizes or pass a number (displays in pixels).                                                                     | `"l" \| "m" \| "s" \| number`        | `"m"`                     |
+| Property               | Attribute                | Description                                                                                                                                                          | Type                                 | Default                   |
+| ---------------------- | ------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------ | ------------------------- |
+| `active`               | `active`                 | <span style="color:red">**[DEPRECATED]**</span> use `open` instead.<br/><br/>When `true`, the component is active.                                                   | `boolean`                            | `false`                   |
+| `backgroundColor`      | `background-color`       | Sets the background color of the component's content.                                                                                                                | `"grey" \| "white"`                  | `"white"`                 |
+| `beforeClose`          | --                       | Passes a function to run before the component closes.                                                                                                                | `(el: HTMLElement) => Promise<void>` | `() => Promise.resolve()` |
+| `color`                | `color`                  | Adds a color bar to the top of component for visual impact. Use color to add importance to destructive or workflow dialogs.                                          | `"blue" \| "red"`                    | `undefined`               |
+| `closeButtonDisabled`  | `close-button-disabled`  | When `true`, disables the component's close button.                                                                                                                  | `boolean`                            | `false`                   |
+| `escapeDisabled`       | `escape-disabled`        | When `true`, disables the default close on escape behavior.                                                                                                          | `boolean`                            | `false`                   |
+| `focusTrapDisabled`    | `focus-trap-disabled`    | When `true`, prevents focus trapping.                                                                                                                                | `boolean`                            | `false`                   |
+| `outsideCloseDisabled` | `outside-close-disabled` | When `true`, disables the closing of the component when clicked outside.                                                                                             | `boolean`                            | `false`                   |
+| `docked`               | `docked`                 | When `true`, prevents the component from expanding to the entire screen on mobile devices.                                                                           | `boolean`                            | `undefined`               |
+| `fullscreen`           | `fullscreen`             | Sets the component to always be fullscreen (overrides `width`).                                                                                                      | `boolean`                            | `undefined`               |
+| `intlClose`            | `intl-close`             | Accessible name for the component's close button.                                                                                                                    | `string`                             | `TEXT.close`              |
+| `noPadding`            | `no-padding`             | <span style="color:red">**[DEPRECATED]**</span> Use `--calcite-modal-padding` CSS variable instead.<br/><br/>When `true`, disables spacing to the content area slot. | `boolean`                            | `false`                   |
+| `open`                 | `open`                   | When `true`, displays and positions the component.                                                                                                                   | `boolean`                            | `false`                   |
+| `scale`                | `scale`                  | Specifies the size of the component.                                                                                                                                 | `"l" \| "m" \| "s"`                  | `"m"`                     |
+| `width`                | `width`                  | Specifies the width of the component. Can use scale sizes or pass a number (displays in pixels).                                                                     | `"l" \| "m" \| "s" \| number`        | `"m"`                     |
 
 ## Events
 
diff --git a/src/components/pick-list-item/pick-list-item.e2e.ts b/src/components/pick-list-item/pick-list-item.e2e.ts
index 60e1b8942c9..a3af8f8d366 100644
--- a/src/components/pick-list-item/pick-list-item.e2e.ts
+++ b/src/components/pick-list-item/pick-list-item.e2e.ts
@@ -85,9 +85,9 @@ describe("calcite-pick-list-item", () => {
     expect(properties.get("shiftPressed")._remoteObject.value).toBe(false);
   });
 
-  it("prevents deselection when disableDeselect is true", async () => {
+  it("prevents deselection when deselectDisabled is true", async () => {
     const page = await newE2EPage({
-      html: `<calcite-pick-list-item label="test" value="example" disable-deselect selected></calcite-pick-list-item>`
+      html: `<calcite-pick-list-item label="test" value="example" deselect-disabled selected></calcite-pick-list-item>`
     });
     const item = await page.find("calcite-pick-list-item");
 
diff --git a/src/components/pick-list-item/pick-list-item.tsx b/src/components/pick-list-item/pick-list-item.tsx
index a1b44c5781d..17d256100cf 100644
--- a/src/components/pick-list-item/pick-list-item.tsx
+++ b/src/components/pick-list-item/pick-list-item.tsx
@@ -73,7 +73,7 @@ export class PickListItem
   /**
    * When `false`, the component cannot be deselected by user interaction.
    */
-  @Prop({ reflect: true }) disableDeselect = false;
+  @Prop({ reflect: true }) deselectDisabled = false;
 
   /**
    * @internal
@@ -287,7 +287,7 @@ export class PickListItem
   // --------------------------------------------------------------------------
 
   pickListClickHandler = (event: MouseEvent): void => {
-    if (this.disabled || (this.disableDeselect && this.selected) || this.nonInteractive) {
+    if (this.disabled || (this.deselectDisabled && this.selected) || this.nonInteractive) {
       return;
     }
 
@@ -298,7 +298,7 @@ export class PickListItem
   pickListKeyDownHandler = (event: KeyboardEvent): void => {
     if (event.key === " ") {
       event.preventDefault();
-      if ((this.disableDeselect && this.selected) || this.nonInteractive) {
+      if ((this.deselectDisabled && this.selected) || this.nonInteractive) {
         return;
       }
       this.selected = !this.selected;
diff --git a/src/components/pick-list-item/readme.md b/src/components/pick-list-item/readme.md
index ba92b64d52b..dd0622adde9 100644
--- a/src/components/pick-list-item/readme.md
+++ b/src/components/pick-list-item/readme.md
@@ -6,18 +6,18 @@
 
 ## Properties
 
-| Property             | Attribute          | Description                                                                                                | Type                                                        | Default       |
-| -------------------- | ------------------ | ---------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------- | ------------- |
-| `description`        | `description`      | A description for the component that displays below the label text.                                        | `string`                                                    | `undefined`   |
-| `disableDeselect`    | `disable-deselect` | When `false`, the component cannot be deselected by user interaction.                                      | `boolean`                                                   | `false`       |
-| `disabled`           | `disabled`         | When `true`, interaction is prevented and the component is displayed with lower opacity.                   | `boolean`                                                   | `false`       |
-| `icon`               | `icon`             | Determines the icon SVG symbol that will be shown. Options are `"circle"`, `"square"`, `"grip"` or `null`. | `ICON_TYPES.circle \| ICON_TYPES.grip \| ICON_TYPES.square` | `null`        |
-| `intlRemove`         | `intl-remove`      | When `removable` is `true`, the accessible name for the component's remove button.                         | `string`                                                    | `TEXT.remove` |
-| `label` _(required)_ | `label`            | Label and accessible name for the component. Appears next to the icon.                                     | `string`                                                    | `undefined`   |
-| `metadata`           | --                 | Provides additional metadata to the component. Primary use is for a filter on the parent list.             | `{ [x: string]: unknown; }`                                 | `undefined`   |
-| `removable`          | `removable`        | When `true`, displays a remove action that removes the item from the list.                                 | `boolean`                                                   | `false`       |
-| `selected`           | `selected`         | When `true`, selects an item. Toggles when an item is checked/unchecked.                                   | `boolean`                                                   | `false`       |
-| `value` _(required)_ | `value`            | The component's value.                                                                                     | `any`                                                       | `undefined`   |
+| Property             | Attribute           | Description                                                                                                | Type                                                        | Default       |
+| -------------------- | ------------------- | ---------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------- | ------------- |
+| `description`        | `description`       | A description for the component that displays below the label text.                                        | `string`                                                    | `undefined`   |
+| `deselectDisabled`   | `deselect-disabled` | When `false`, the component cannot be deselected by user interaction.                                      | `boolean`                                                   | `false`       |
+| `disabled`           | `disabled`          | When `true`, interaction is prevented and the component is displayed with lower opacity.                   | `boolean`                                                   | `false`       |
+| `icon`               | `icon`              | Determines the icon SVG symbol that will be shown. Options are `"circle"`, `"square"`, `"grip"` or `null`. | `ICON_TYPES.circle \| ICON_TYPES.grip \| ICON_TYPES.square` | `null`        |
+| `intlRemove`         | `intl-remove`       | When `removable` is `true`, the accessible name for the component's remove button.                         | `string`                                                    | `TEXT.remove` |
+| `label` _(required)_ | `label`             | Label and accessible name for the component. Appears next to the icon.                                     | `string`                                                    | `undefined`   |
+| `metadata`           | --                  | Provides additional metadata to the component. Primary use is for a filter on the parent list.             | `{ [x: string]: unknown; }`                                 | `undefined`   |
+| `removable`          | `removable`         | When `true`, displays a remove action that removes the item from the list.                                 | `boolean`                                                   | `false`       |
+| `selected`           | `selected`          | When `true`, selects an item. Toggles when an item is checked/unchecked.                                   | `boolean`                                                   | `false`       |
+| `value` _(required)_ | `value`             | The component's value.                                                                                     | `any`                                                       | `undefined`   |
 
 ## Events
 
diff --git a/src/components/pick-list/shared-list-logic.ts b/src/components/pick-list/shared-list-logic.ts
index adcd210a783..470f9d4fbd2 100644
--- a/src/components/pick-list/shared-list-logic.ts
+++ b/src/components/pick-list/shared-list-logic.ts
@@ -264,7 +264,7 @@ export function setUpItems<T extends Lists>(
   items.forEach((item) => {
     item.icon = this.getIconType();
     if (!this.multiple) {
-      item.disableDeselect = true;
+      item.deselectDisabled = true;
       toggleSingleSelectItemTabbing(item, false);
     }
     if (item.selected) {
diff --git a/src/components/popover/popover.e2e.ts b/src/components/popover/popover.e2e.ts
index 48d5b007d42..f584b073826 100644
--- a/src/components/popover/popover.e2e.ts
+++ b/src/components/popover/popover.e2e.ts
@@ -73,11 +73,11 @@ describe("calcite-popover", () => {
         defaultValue: false
       },
       {
-        propertyName: "disableFlip",
+        propertyName: "flipDisabled",
         defaultValue: false
       },
       {
-        propertyName: "disablePointer",
+        propertyName: "pointerDisabled",
         defaultValue: false
       },
       {
diff --git a/src/components/popover/popover.stories.ts b/src/components/popover/popover.stories.ts
index de567a2ae88..cd97be15ac4 100644
--- a/src/components/popover/popover.stories.ts
+++ b/src/components/popover/popover.stories.ts
@@ -33,8 +33,8 @@ export const simple = (): string => html`
     ${referenceElementHTML}
     <calcite-popover
       ${boolean("closable", false)}
-      ${boolean("disable-flip", false)}
-      ${boolean("disable-pointer", false)}
+      ${boolean("flip-disabled", false)}
+      ${boolean("pointer-disabled", false)}
       reference-element="reference-element"
       placement="${select("placement", placements, defaultPopoverPlacement)}"
       offset-distance="${number("offset-distance", 6)}"
@@ -56,8 +56,8 @@ export const darkThemeRTL_TestOnly = (): string => html` <style>
     ${referenceElementHTML}
     <calcite-popover
       ${boolean("closable", false)}
-      ${boolean("disable-flip", false)}
-      ${boolean("disable-pointer", false)}
+      ${boolean("flip-disabled", false)}
+      ${boolean("pointer-disabled", false)}
       reference-element="reference-element"
       placement="${select("placement", placements, defaultPopoverPlacement)}"
       offset-distance="${number("offset-distance", 6)}"
diff --git a/src/components/popover/popover.tsx b/src/components/popover/popover.tsx
index 7a5b3c74aec..4606919ba6d 100644
--- a/src/components/popover/popover.tsx
+++ b/src/components/popover/popover.tsx
@@ -101,26 +101,26 @@ export class Popover
   /**
    * When `true`, prevents flipping the component's placement when overlapping its `referenceElement`.
    */
-  @Prop({ reflect: true }) disableFlip = false;
+  @Prop({ reflect: true }) flipDisabled = false;
 
   /**
    * When `true`, prevents focus trapping.
    */
-  @Prop({ reflect: true }) disableFocusTrap = false;
+  @Prop({ reflect: true }) focusTrapDisabled = false;
 
-  @Watch("disableFocusTrap")
-  handleDisableFocusTrap(disableFocusTrap: boolean): void {
+  @Watch("focusTrapDisabled")
+  handlefocusTrapDisabled(focusTrapDisabled: boolean): void {
     if (!this.open) {
       return;
     }
 
-    disableFocusTrap ? deactivateFocusTrap(this) : activateFocusTrap(this);
+    focusTrapDisabled ? deactivateFocusTrap(this) : activateFocusTrap(this);
   }
 
   /**
    * When `true`, removes the caret pointer.
    */
-  @Prop({ reflect: true }) disablePointer = false;
+  @Prop({ reflect: true }) pointerDisabled = false;
 
   /**
    * Defines the available placements that can be used when a flip occurs.
@@ -365,7 +365,7 @@ export class Popover
       effectiveReferenceElement,
       placement,
       overlayPositioning,
-      disableFlip,
+      flipDisabled,
       filteredFlipPlacements,
       offsetDistance,
       offsetSkidding,
@@ -378,11 +378,11 @@ export class Popover
         referenceEl: effectiveReferenceElement,
         overlayPositioning,
         placement,
-        disableFlip,
+        flipDisabled,
         flipPlacements: filteredFlipPlacements,
         offsetDistance,
         offsetSkidding,
-        includeArrow: !this.disablePointer,
+        includeArrow: !this.pointerDisabled,
         arrowEl,
         type: "popover"
       },
@@ -582,10 +582,10 @@ export class Popover
   }
 
   render(): VNode {
-    const { effectiveReferenceElement, heading, label, open, disablePointer } = this;
+    const { effectiveReferenceElement, heading, label, open, pointerDisabled } = this;
     const displayed = effectiveReferenceElement && open;
     const hidden = !displayed;
-    const arrowNode = !disablePointer ? <div class={CSS.arrow} ref={this.storeArrowEl} /> : null;
+    const arrowNode = !pointerDisabled ? <div class={CSS.arrow} ref={this.storeArrowEl} /> : null;
 
     return (
       <Host
diff --git a/src/components/popover/readme.md b/src/components/popover/readme.md
index 94b19551bea..f91de97e621 100644
--- a/src/components/popover/readme.md
+++ b/src/components/popover/readme.md
@@ -47,9 +47,9 @@
 | ------------------------------- | --------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------- |
 | `autoClose`                     | `auto-close`          | When `true`, clicking outside of the component automatically closes open `calcite-popover`s.                                                                                                                                                                                                                                                                                      | `boolean`                                                                                                                                                                                                                                                                                                         | `false`                   |
 | `closable`                      | `closable`            | When `true`, display a close button within the component.                                                                                                                                                                                                                                                                                                                         | `boolean`                                                                                                                                                                                                                                                                                                         | `false`                   |
-| `disableFlip`                   | `disable-flip`        | When `true`, prevents flipping the component's placement when overlapping its `referenceElement`.                                                                                                                                                                                                                                                                                 | `boolean`                                                                                                                                                                                                                                                                                                         | `false`                   |
-| `disableFocusTrap`              | `disable-focus-trap`  | When `true`, prevents focus trapping.                                                                                                                                                                                                                                                                                                                                             | `boolean`                                                                                                                                                                                                                                                                                                         | `false`                   |
-| `disablePointer`                | `disable-pointer`     | When `true`, removes the caret pointer.                                                                                                                                                                                                                                                                                                                                           | `boolean`                                                                                                                                                                                                                                                                                                         | `false`                   |
+| `flipDisabled`                  | `flip-disabled`       | When `true`, prevents flipping the component's placement when overlapping its `referenceElement`.                                                                                                                                                                                                                                                                                 | `boolean`                                                                                                                                                                                                                                                                                                         | `false`                   |
+| `focusTrapDisabled`             | `focus-trap-disabled` | When `true`, prevents focus trapping.                                                                                                                                                                                                                                                                                                                                             | `boolean`                                                                                                                                                                                                                                                                                                         | `false`                   |
+| `pointerDisabled`               | `pointer-disabled`    | When `true`, removes the caret pointer.                                                                                                                                                                                                                                                                                                                                           | `boolean`                                                                                                                                                                                                                                                                                                         | `false`                   |
 | `flipPlacements`                | --                    | Defines the available placements that can be used when a flip occurs.                                                                                                                                                                                                                                                                                                             | `Placement[]`                                                                                                                                                                                                                                                                                                     | `undefined`               |
 | `heading`                       | `heading`             | The component header text.                                                                                                                                                                                                                                                                                                                                                        | `string`                                                                                                                                                                                                                                                                                                          | `undefined`               |
 | `headingLevel`                  | `heading-level`       | Specifies the number at which section headings should start.                                                                                                                                                                                                                                                                                                                      | `1 \| 2 \| 3 \| 4 \| 5 \| 6`                                                                                                                                                                                                                                                                                      | `undefined`               |
diff --git a/src/components/value-list-item/value-list-item.e2e.ts b/src/components/value-list-item/value-list-item.e2e.ts
index 58616241280..468b7429fa9 100644
--- a/src/components/value-list-item/value-list-item.e2e.ts
+++ b/src/components/value-list-item/value-list-item.e2e.ts
@@ -69,9 +69,9 @@ describe("calcite-value-list-item", () => {
     expect(properties.get("shiftPressed")._remoteObject.value).toBe(false);
   });
 
-  it("prevents deselection when disableDeselect is true", async () => {
+  it("prevents deselection when deselectDisabled is true", async () => {
     const page = await newE2EPage({
-      html: `<calcite-value-list-item label="test" value="example" disable-deselect selected></calcite-value-list-item>`
+      html: `<calcite-value-list-item label="test" value="example" deselect-disabled selected></calcite-value-list-item>`
     });
     const item = await page.find("calcite-value-list-item");
 
diff --git a/src/components/value-list-item/value-list-item.tsx b/src/components/value-list-item/value-list-item.tsx
index ddb1a62ec47..dbb9688edd8 100644
--- a/src/components/value-list-item/value-list-item.tsx
+++ b/src/components/value-list-item/value-list-item.tsx
@@ -59,7 +59,7 @@ export class ValueListItem
   /**
    * @internal
    */
-  @Prop() disableDeselect = false;
+  @Prop() deselectDisabled = false;
 
   /**
    * When `true`, prevents the content of the component from user interaction.
@@ -258,7 +258,7 @@ export class ValueListItem
         {this.renderHandle()}
         <calcite-pick-list-item
           description={this.description}
-          disableDeselect={this.disableDeselect}
+          deselectDisabled={this.deselectDisabled}
           disabled={this.disabled}
           label={this.label}
           metadata={this.metadata}
diff --git a/src/demos/color-picker.html b/src/demos/color-picker.html
index 4151da33c2d..d70b168befc 100644
--- a/src/demos/color-picker.html
+++ b/src/demos/color-picker.html
@@ -145,21 +145,21 @@ <h1 style="margin: 0 auto; text-align: center">Alert</h1>
       <div class="parent">
         <div class="child right-aligned-text">Color-picker in Popover</div>
         <div class="child">
-          <calcite-popover disable-pointer placement="bottom-start" reference-element="popover-button-1">
+          <calcite-popover pointer-disabled placement="bottom-start" reference-element="popover-button-1">
             <calcite-color-picker appearance="minimal" scale="s"></calcite-color-picker>
           </calcite-popover>
           <calcite-button id="popover-button-1">Activate Popover</calcite-button>
         </div>
 
         <div class="child">
-          <calcite-popover disable-pointer placement="bottom-start" reference-element="popover-button-2">
+          <calcite-popover pointer-disabled placement="bottom-start" reference-element="popover-button-2">
             <calcite-color-picker appearance="minimal" scale="m"></calcite-color-picker>
           </calcite-popover>
           <calcite-button id="popover-button-2">Activate Popover</calcite-button>
         </div>
 
         <div class="child">
-          <calcite-popover disable-pointer placement="bottom-start" reference-element="popover-button-3">
+          <calcite-popover pointer-disabled placement="bottom-start" reference-element="popover-button-3">
             <calcite-color-picker appearance="minimal" scale="l"></calcite-color-picker>
           </calcite-popover>
           <calcite-button id="popover-button-3">Activate Popover</calcite-button>
diff --git a/src/demos/modal.html b/src/demos/modal.html
index ee0fc9fee1a..5ffc1c0dbec 100644
--- a/src/demos/modal.html
+++ b/src/demos/modal.html
@@ -498,10 +498,10 @@ <h3 slot="header">Information</h3>
 
         <!-- small width disabled -->
         <div class="child">
-          <calcite-modal class="js-modal-esc-disabled-s" disable-escape scale="s">
+          <calcite-modal class="js-modal-esc-disabled-s" escape-disabled scale="s">
             <h3 slot="header">Modal title</h3>
             <div slot="content">
-              <p>This modal has <code>disable-escape</code> set, so pressing the escape key will not dismiss it.</p>
+              <p>This modal has <code>escape-disabled</code> set, so pressing the escape key will not dismiss it.</p>
             </div>
             <calcite-button slot="secondary" width="full" scale="s" appearance="outline">Cancel</calcite-button>
           </calcite-modal>
@@ -513,10 +513,10 @@ <h3 slot="header">Modal title</h3>
 
         <!-- medium width disabled -->
         <div class="child">
-          <calcite-modal class="js-modal-esc-disabled-m" disable-escape scale="m">
+          <calcite-modal class="js-modal-esc-disabled-m" escape-disabled scale="m">
             <h3 slot="header">Modal title</h3>
             <div slot="content">
-              <p>This modal has <code>disable-escape</code> set, so pressing the escape key will not dismiss it.</p>
+              <p>This modal has <code>escape-disabled</code> set, so pressing the escape key will not dismiss it.</p>
             </div>
             <calcite-button slot="secondary" width="full" scale="m" appearance="outline">Cancel</calcite-button>
           </calcite-modal>
@@ -528,10 +528,10 @@ <h3 slot="header">Modal title</h3>
 
         <!-- large width disabled -->
         <div class="child">
-          <calcite-modal class="js-modal-esc-disabled-l" disable-escape scale="l">
+          <calcite-modal class="js-modal-esc-disabled-l" escape-disabled scale="l">
             <h3 slot="header">Modal title</h3>
             <div slot="content">
-              <p>This modal has <code>disable-escape</code> set, so pressing the escape key will not dismiss it.</p>
+              <p>This modal has <code>escape-disabled</code> set, so pressing the escape key will not dismiss it.</p>
             </div>
             <calcite-button slot="secondary" width="full" scale="l" appearance="outline">Cancel</calcite-button>
           </calcite-modal>
@@ -552,7 +552,7 @@ <h3 slot="header">Modal title</h3>
 
         <!-- small width no close button -->
         <div class="child">
-          <calcite-modal class="js-modal-no-close-s" disable-close-button scale="s">
+          <calcite-modal class="js-modal-no-close-s" close-button-disabled scale="s">
             <h3 slot="header">Modal title</h3>
             <div slot="content">
               <p>This modal has no close button.</p>
@@ -567,7 +567,7 @@ <h3 slot="header">Modal title</h3>
 
         <!-- medium width no close button -->
         <div class="child">
-          <calcite-modal class="js-modal-no-close-m" disable-close-button scale="m">
+          <calcite-modal class="js-modal-no-close-m" close-button-disabled scale="m">
             <h3 slot="header">Modal title</h3>
             <div slot="content">
               <p>This modal has no close button.</p>
@@ -582,7 +582,7 @@ <h3 slot="header">Modal title</h3>
 
         <!-- large width no close button -->
         <div class="child">
-          <calcite-modal class="js-modal-no-close-l" disable-close-button scale="l">
+          <calcite-modal class="js-modal-no-close-l" close-button-disabled scale="l">
             <h3 slot="header">Modal title</h3>
             <div slot="content">
               <p>This modal has no close button.</p>
diff --git a/src/demos/shell/block-configurations.html b/src/demos/shell/block-configurations.html
index 95e1f96c947..8f6cc9792f3 100644
--- a/src/demos/shell/block-configurations.html
+++ b/src/demos/shell/block-configurations.html
@@ -811,7 +811,7 @@
                   </calcite-block>
 
                   <calcite-fab slot="fab" id="label-fab" text="Add label class"></calcite-fab>
-                  <calcite-tooltip label="tooltip" reference-element="label-fab" disable-pointer>
+                  <calcite-tooltip label="tooltip" reference-element="label-fab" pointer-disabled>
                     Add label class
                   </calcite-tooltip>
                   <calcite-button slot="footer-actions" appearance="outline" width="half">Cancel</calcite-button>
diff --git a/src/demos/shell/demo-app-advanced-2-shell-header.html b/src/demos/shell/demo-app-advanced-2-shell-header.html
index 8671fdf13fa..108662577c5 100644
--- a/src/demos/shell/demo-app-advanced-2-shell-header.html
+++ b/src/demos/shell/demo-app-advanced-2-shell-header.html
@@ -228,7 +228,7 @@
                     </section>
                   </calcite-block>
                   <calcite-fab slot="fab" id="label-fab" text="Add label class"></calcite-fab>
-                  <calcite-tooltip label="tooltip" reference-element="label-fab" disable-pointer>
+                  <calcite-tooltip label="tooltip" reference-element="label-fab" pointer-disabled>
                     Add label class
                   </calcite-tooltip>
                   <calcite-button slot="footer-actions" appearance="outline" width="half">Cancel</calcite-button>
diff --git a/src/demos/shell/demo-app-advanced-2.html b/src/demos/shell/demo-app-advanced-2.html
index 59f0c30217b..24349a3110d 100644
--- a/src/demos/shell/demo-app-advanced-2.html
+++ b/src/demos/shell/demo-app-advanced-2.html
@@ -224,7 +224,7 @@
                   </section>
                 </calcite-block>
                 <calcite-fab slot="fab" id="label-fab" text="Add label class"></calcite-fab>
-                <calcite-tooltip label="tooltip" reference-element="label-fab" disable-pointer>
+                <calcite-tooltip label="tooltip" reference-element="label-fab" pointer-disabled>
                   Add label class
                 </calcite-tooltip>
               </calcite-panel>
diff --git a/src/demos/shell/demo-app-advanced-3.html b/src/demos/shell/demo-app-advanced-3.html
index 80018a2fca7..e34b29caa61 100644
--- a/src/demos/shell/demo-app-advanced-3.html
+++ b/src/demos/shell/demo-app-advanced-3.html
@@ -515,7 +515,7 @@
                   </section>
                 </calcite-block>
                 <calcite-fab slot="fab" id="label-fab" text="Add label class"></calcite-fab>
-                <calcite-tooltip label="tooltip" reference-element="label-fab" disable-pointer>
+                <calcite-tooltip label="tooltip" reference-element="label-fab" pointer-disabled>
                   Add label class
                 </calcite-tooltip>
               </calcite-panel>
diff --git a/src/demos/shell/demo-app-advanced.html b/src/demos/shell/demo-app-advanced.html
index 852b20fb449..260923b33ce 100644
--- a/src/demos/shell/demo-app-advanced.html
+++ b/src/demos/shell/demo-app-advanced.html
@@ -95,7 +95,7 @@
               <calcite-panel heading="Layers" height-scale="l" width-scale="m">
                 <div id="layerlist-container"></div>
                 <calcite-fab slot="fab" id="layer-fab" text="Add layers"></calcite-fab>
-                <calcite-tooltip label="tooltip" reference-element="layer-fab" disable-pointer
+                <calcite-tooltip label="tooltip" reference-element="layer-fab" pointer-disabled
                   >Add layers</calcite-tooltip
                 >
               </calcite-panel>
@@ -103,7 +103,7 @@
 
             <calcite-shell-panel slot="panel-end" position="end">
               <calcite-action-bar slot="action-bar">
-                <calcite-tooltip slot="expand-tooltip" label="tooltip" disable-pointer>Add layers</calcite-tooltip>
+                <calcite-tooltip slot="expand-tooltip" label="tooltip" pointer-disabled>Add layers</calcite-tooltip>
                 <calcite-action-group>
                   <calcite-action text="Layer properties" icon="sliders-horizontal"> </calcite-action>
                   <calcite-action text="Styles" icon="shapes"> </calcite-action>
@@ -228,7 +228,7 @@
                     </calcite-block>
                   </calcite-sortable-list>
                   <calcite-fab slot="fab" id="label-fab" text="Add label class"></calcite-fab>
-                  <calcite-tooltip label="tootltip" reference-element="label-fab" disable-pointer>
+                  <calcite-tooltip label="tootltip" reference-element="label-fab" pointer-disabled>
                     Add label class
                   </calcite-tooltip>
                 </calcite-flow-item>
diff --git a/src/demos/shell/demo-app-blank.html b/src/demos/shell/demo-app-blank.html
index 1abe8ea77bf..de958b588ea 100644
--- a/src/demos/shell/demo-app-blank.html
+++ b/src/demos/shell/demo-app-blank.html
@@ -64,7 +64,7 @@
                 Actionbar
             </div> -->
               <calcite-action-bar slot="action-bar">
-                <calcite-tooltip slot="expand-tooltip" label="tooltip" disable-pointer>Add layers</calcite-tooltip>
+                <calcite-tooltip slot="expand-tooltip" label="tooltip" pointer-disabled>Add layers</calcite-tooltip>
                 <calcite-action-group>
                   <calcite-action text="Layer properties" icon="sliders-horizontal"> </calcite-action>
                   <calcite-action text="Styles" icon="shapes"> </calcite-action>
diff --git a/src/demos/shell/nesting-testing-flow.html b/src/demos/shell/nesting-testing-flow.html
index c2bdf8aed29..8b0da40d8a2 100644
--- a/src/demos/shell/nesting-testing-flow.html
+++ b/src/demos/shell/nesting-testing-flow.html
@@ -255,7 +255,7 @@
                       </calcite-block>
 
                       <calcite-fab slot="fab" id="label-fab" text="Add label class"></calcite-fab>
-                      <calcite-tooltip label="tooltip" reference-element="label-fab" disable-pointer>
+                      <calcite-tooltip label="tooltip" reference-element="label-fab" pointer-disabled>
                         Add label class
                       </calcite-tooltip>
                       <calcite-button slot="footer-actions" appearance="outline" width="half">Cancel</calcite-button>
diff --git a/src/demos/shell/nesting-testing.html b/src/demos/shell/nesting-testing.html
index 976fec06a52..b75af40c5e9 100644
--- a/src/demos/shell/nesting-testing.html
+++ b/src/demos/shell/nesting-testing.html
@@ -208,7 +208,7 @@
                   </calcite-block>
 
                   <calcite-fab slot="fab" id="label-fab" text="Add label class"></calcite-fab>
-                  <calcite-tooltip label="tooltip" reference-element="label-fab" disable-pointer>
+                  <calcite-tooltip label="tooltip" reference-element="label-fab" pointer-disabled>
                     Add label class
                   </calcite-tooltip>
                   <calcite-button slot="footer-actions" appearance="outline" width="half">Cancel</calcite-button>
diff --git a/src/demos/theme/auto.html b/src/demos/theme/auto.html
index 6b7f0e851a1..51f7fdab1c5 100644
--- a/src/demos/theme/auto.html
+++ b/src/demos/theme/auto.html
@@ -106,7 +106,7 @@
               <calcite-panel heading="Layers" height-scale="l" width-scale="m">
                 <div id="layerlist-container"></div>
                 <calcite-fab slot="fab" id="layer-fab" text="Add layers"></calcite-fab>
-                <calcite-tooltip label="tooltip" reference-element="layer-fab" disable-pointer
+                <calcite-tooltip label="tooltip" reference-element="layer-fab" pointer-disabled
                   >Add layers
                 </calcite-tooltip>
               </calcite-panel>
@@ -114,7 +114,7 @@
 
             <calcite-shell-panel slot="panel-end" position="end">
               <calcite-action-bar slot="action-bar">
-                <calcite-tooltip slot="expand-tooltip" label="tooltip" disable-pointer>Add layers</calcite-tooltip>
+                <calcite-tooltip slot="expand-tooltip" label="tooltip" pointer-disabled>Add layers</calcite-tooltip>
                 <calcite-action-group>
                   <calcite-action text="Layer properties" icon="sliders-horizontal"> </calcite-action>
                   <calcite-action text="Styles" icon="shapes"> </calcite-action>
@@ -238,7 +238,7 @@
                     </calcite-block>
                   </calcite-sortable-list>
                   <calcite-fab slot="fab" id="label-fab" text="Add label class"></calcite-fab>
-                  <calcite-tooltip label="tootltip" reference-element="label-fab" disable-pointer>
+                  <calcite-tooltip label="tootltip" reference-element="label-fab" pointer-disabled>
                     Add label class
                   </calcite-tooltip>
                 </calcite-flow-item>
diff --git a/src/utils/floating-ui.ts b/src/utils/floating-ui.ts
index 34b8d621a72..5452587f459 100644
--- a/src/utils/floating-ui.ts
+++ b/src/utils/floating-ui.ts
@@ -191,7 +191,7 @@ export const FloatingCSS = {
 
 function getMiddleware({
   placement,
-  disableFlip,
+  flipDisabled,
   flipPlacements,
   offsetDistance,
   offsetSkidding,
@@ -199,7 +199,7 @@ function getMiddleware({
   type
 }: {
   placement: LogicalPlacement;
-  disableFlip?: boolean;
+  flipDisabled?: boolean;
   flipPlacements?: EffectivePlacement[];
   offsetDistance?: number;
   offsetSkidding?: number;
@@ -230,7 +230,7 @@ function getMiddleware({
       middleware.push(
         autoPlacement({ alignment: placement === "auto-start" ? "start" : placement === "auto-end" ? "end" : null })
       );
-    } else if (!disableFlip) {
+    } else if (!flipDisabled) {
       middleware.push(flip(flipPlacements ? { fallbackPlacements: flipPlacements } : {}));
     }
 
@@ -287,7 +287,7 @@ export function getEffectivePlacement(floatingEl: HTMLElement, placement: Logica
  * @param options.floatingEl
  * @param options.overlayPositioning
  * @param options.placement
- * @param options.disableFlip
+ * @param options.flipDisabled
  * @param options.flipPlacements
  * @param options.offsetDistance
  * @param options.offsetSkidding
@@ -322,7 +322,7 @@ const debouncedReposition = debounce(positionFloatingUI, repositionDebounceTimeo
  * @param root0.floatingEl
  * @param root0.overlayPositioning
  * @param root0.placement
- * @param root0.disableFlip
+ * @param root0.flipDisabled
  * @param root0.flipPlacements
  * @param root0.offsetDistance
  * @param root0.offsetSkidding
@@ -335,7 +335,7 @@ export async function positionFloatingUI({
   floatingEl,
   overlayPositioning = "absolute",
   placement,
-  disableFlip,
+  flipDisabled,
   flipPlacements,
   offsetDistance,
   offsetSkidding,
@@ -347,9 +347,8 @@ export async function positionFloatingUI({
   floatingEl: HTMLElement;
   overlayPositioning: Strategy;
   placement: LogicalPlacement;
-  disableFlip?: boolean;
+  flipDisabled?: boolean;
   flipPlacements?: EffectivePlacement[];
-
   offsetDistance?: number;
   offsetSkidding?: number;
   arrowEl?: HTMLElement;
@@ -376,7 +375,7 @@ export async function positionFloatingUI({
         : getEffectivePlacement(floatingEl, placement),
     middleware: getMiddleware({
       placement,
-      disableFlip,
+      flipDisabled,
       flipPlacements,
       offsetDistance,
       offsetSkidding,
diff --git a/src/utils/focusTrapComponent.ts b/src/utils/focusTrapComponent.ts
index a131b4cca8a..cd2c241ffa2 100644
--- a/src/utils/focusTrapComponent.ts
+++ b/src/utils/focusTrapComponent.ts
@@ -20,7 +20,7 @@ export interface FocusTrapComponent {
   /**
    * When `true`, prevents focus trapping.
    */
-  disableFocusTrap: boolean;
+  focusTrapDisabled: boolean;
 
   /**
    * The focus trap instance.
@@ -73,7 +73,7 @@ export function connectFocusTrap(component: FocusTrapComponent): void {
  * @param {FocusTrapComponent} component The FocusTrap component.
  */
 export function activateFocusTrap(component: FocusTrapComponent): void {
-  if (!component.disableFocusTrap) {
+  if (!component.focusTrapDisabled) {
     component.focusTrap?.activate();
   }
 }