diff --git a/packages/eds-core-react/src/components/next/Autocomplete/autocomplete.css b/packages/eds-core-react/src/components/next/Autocomplete/autocomplete.css
index 0817dc202d..99949d9d23 100644
--- a/packages/eds-core-react/src/components/next/Autocomplete/autocomplete.css
+++ b/packages/eds-core-react/src/components/next/Autocomplete/autocomplete.css
@@ -27,7 +27,7 @@
     }
 
     /* Square connecting corners, suppress focus ring, and use medium border when dropdown is open */
-    &:has(input[aria-expanded='true']) .eds-input-container {
+    &:has(input[aria-expanded='true']) .eds-input {
       border-end-start-radius: 0;
       border-end-end-radius: 0;
       outline-color: var(--eds-color-border-medium);
diff --git a/packages/eds-core-react/src/components/next/Foundation/elements.css b/packages/eds-core-react/src/components/next/Foundation/elements.css
index a886293c20..363d15b8bd 100644
--- a/packages/eds-core-react/src/components/next/Foundation/elements.css
+++ b/packages/eds-core-react/src/components/next/Foundation/elements.css
@@ -370,7 +370,7 @@
   .eds-elements :where(input):not(
     [type='checkbox'], [type='radio'],
     [type='range'], [type='color'], [type='file'], [type='image'],
-    [type='submit'], [type='reset'], [type='button'], .eds-input
+    [type='submit'], [type='reset'], [type='button'], .control
   ) {
     --_bg-color: var(--eds-color-bg-input);
 
diff --git a/packages/eds-core-react/src/components/next/Input/Input.test.tsx b/packages/eds-core-react/src/components/next/Input/Input.test.tsx
index 2599857d3d..1091c85252 100644
--- a/packages/eds-core-react/src/components/next/Input/Input.test.tsx
+++ b/packages/eds-core-react/src/components/next/Input/Input.test.tsx
@@ -65,7 +65,7 @@ describe('Input (Next EDS 2.0)', () => {
     it('Can be extended with className on input element', () => {
       render(<Input value="textfield" className="input-class" readOnly />)
       const input = screen.getByDisplayValue('textfield')
-      expect(input).toHaveClass('eds-input')
+      expect(input).toHaveClass('control')
       expect(input).toHaveClass('input-class')
     })
   })
@@ -100,7 +100,7 @@ describe('Input (Next EDS 2.0)', () => {
     it('Shows error icon when invalid by default', () => {
       const { container } = render(<Input invalid aria-label="Invalid input" />)
       // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
-      const errorIcon = container.querySelector('.eds-error-icon')
+      const errorIcon = container.querySelector('.error-icon')
       expect(errorIcon).toBeInTheDocument()
     })
 
@@ -109,7 +109,7 @@ describe('Input (Next EDS 2.0)', () => {
         <Input invalid hideErrorIcon aria-label="Invalid input" />,
       )
       // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
-      const errorIcon = container.querySelector('.eds-error-icon')
+      const errorIcon = container.querySelector('.error-icon')
       expect(errorIcon).not.toBeInTheDocument()
     })
 
@@ -118,7 +118,7 @@ describe('Input (Next EDS 2.0)', () => {
         <Input invalid disabled aria-label="Disabled invalid input" />,
       )
       // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
-      const errorIcon = container.querySelector('.eds-error-icon')
+      const errorIcon = container.querySelector('.error-icon')
       expect(errorIcon).not.toBeInTheDocument()
     })
 
@@ -127,7 +127,7 @@ describe('Input (Next EDS 2.0)', () => {
         <Input invalid readOnly aria-label="ReadOnly invalid input" />,
       )
       // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
-      const errorIcon = container.querySelector('.eds-error-icon')
+      const errorIcon = container.querySelector('.error-icon')
       expect(errorIcon).not.toBeInTheDocument()
     })
   })
@@ -164,8 +164,8 @@ describe('Input (Next EDS 2.0)', () => {
     it('Text has text class', () => {
       const { container } = render(<Input startText="NOK" endText="kg" />)
       /* eslint-disable testing-library/no-container, testing-library/no-node-access */
-      const startText = container.querySelector('.eds-adornment__text')
-      const endText = container.querySelectorAll('.eds-adornment__text')[1]
+      const startText = container.querySelector('.text')
+      const endText = container.querySelectorAll('.text')[1]
       /* eslint-enable testing-library/no-container, testing-library/no-node-access */
       expect(startText).toBeInTheDocument()
       expect(endText).toBeInTheDocument()
@@ -179,12 +179,8 @@ describe('Input (Next EDS 2.0)', () => {
         />,
       )
       /* eslint-disable testing-library/no-container, testing-library/no-node-access */
-      const startAdornment = container.querySelector(
-        '.eds-adornment__adornment',
-      )
-      const endAdornment = container.querySelectorAll(
-        '.eds-adornment__adornment',
-      )[1]
+      const startAdornment = container.querySelector('.item')
+      const endAdornment = container.querySelectorAll('.item')[1]
       /* eslint-enable testing-library/no-container, testing-library/no-node-access */
       expect(startAdornment).toBeInTheDocument()
       expect(endAdornment).toBeInTheDocument()
@@ -274,14 +270,14 @@ describe('Input (Next EDS 2.0)', () => {
       it('Applies base class and custom containerClassName', () => {
         render(<Input containerClassName="test-class" />)
         const wrapper = getInputWrapper()
-        expect(wrapper).toHaveClass('eds-input-container')
+        expect(wrapper).toHaveClass('eds-input')
         expect(wrapper).toHaveClass('test-class')
       })
 
       it('Applies input class to input element', () => {
         render(<Input value="test" readOnly />)
         const input = screen.getByDisplayValue('test')
-        expect(input).toHaveClass('eds-input')
+        expect(input).toHaveClass('control')
       })
 
       it('Applies disabled data attribute when disabled', () => {
diff --git a/packages/eds-core-react/src/components/next/Input/Input.tsx b/packages/eds-core-react/src/components/next/Input/Input.tsx
index c679c076cc..e6101ee24c 100644
--- a/packages/eds-core-react/src/components/next/Input/Input.tsx
+++ b/packages/eds-core-react/src/components/next/Input/Input.tsx
@@ -29,7 +29,7 @@ export const Input: OverridableComponent<InputProps, HTMLInputElement> =
     const hasStartAdornment = startText || startAdornment
     const hasEndAdornment = endText || endAdornment
 
-    const containerClasses = ['eds-input-container', containerClassName]
+    const containerClasses = ['eds-input', containerClassName]
       .filter(Boolean)
       .join(' ')
 
@@ -46,7 +46,7 @@ export const Input: OverridableComponent<InputProps, HTMLInputElement> =
       >
         {displayErrorIcon && (
           <span
-            className="eds-error-icon"
+            className="error-icon"
             data-font-size="xs"
             data-font-family="ui"
             data-baseline="center"
@@ -55,10 +55,10 @@ export const Input: OverridableComponent<InputProps, HTMLInputElement> =
           </span>
         )}
         {hasStartAdornment && (
-          <div className="eds-adornment" data-color-appearance="neutral">
+          <div className="adornment" data-color-appearance="neutral">
             {startText && (
               <span
-                className="eds-adornment__text"
+                className="text"
                 data-font-family="ui"
                 data-font-size="xs"
                 data-baseline="center"
@@ -67,7 +67,7 @@ export const Input: OverridableComponent<InputProps, HTMLInputElement> =
               </span>
             )}
             {startAdornment && (
-              <span className="eds-adornment__adornment" data-font-size="xs">
+              <span className="item" data-font-size="xs">
                 {startAdornment}
               </span>
             )}
@@ -78,7 +78,7 @@ export const Input: OverridableComponent<InputProps, HTMLInputElement> =
           type={Component === 'textarea' ? undefined : type}
           disabled={disabled}
           readOnly={readOnly}
-          className={['eds-input', className].filter(Boolean).join(' ')}
+          className={['control', className].filter(Boolean).join(' ')}
           data-color-appearance="neutral"
           data-font-family="ui"
           data-font-size="md"
@@ -89,10 +89,10 @@ export const Input: OverridableComponent<InputProps, HTMLInputElement> =
           aria-invalid={invalid || undefined}
         />
         {hasEndAdornment && (
-          <div className="eds-adornment" data-color-appearance="neutral">
+          <div className="adornment" data-color-appearance="neutral">
             {endText && (
               <span
-                className="eds-adornment__text"
+                className="text"
                 data-font-family="ui"
                 data-font-size="xs"
                 data-baseline="center"
@@ -101,7 +101,7 @@ export const Input: OverridableComponent<InputProps, HTMLInputElement> =
               </span>
             )}
             {endAdornment && (
-              <span className="eds-adornment__adornment" data-font-size="xs">
+              <span className="item" data-font-size="xs">
                 {endAdornment}
               </span>
             )}
diff --git a/packages/eds-core-react/src/components/next/Input/__snapshots__/Input.test.tsx.snap b/packages/eds-core-react/src/components/next/Input/__snapshots__/Input.test.tsx.snap
index 4b76c49f82..a63d202658 100644
--- a/packages/eds-core-react/src/components/next/Input/__snapshots__/Input.test.tsx.snap
+++ b/packages/eds-core-react/src/components/next/Input/__snapshots__/Input.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`Input (Next EDS 2.0) Matches snapshot 1`] = `
 <DocumentFragment>
   <div
-    class="eds-input-container"
+    class="eds-input"
     data-color-appearance="neutral"
     data-font-size="md"
     data-readonly="true"
@@ -11,7 +11,7 @@ exports[`Input (Next EDS 2.0) Matches snapshot 1`] = `
     data-space-proportions="squished"
   >
     <input
-      class="eds-input"
+      class="control"
       data-color-appearance="neutral"
       data-font-family="ui"
       data-font-size="md"
diff --git a/packages/eds-core-react/src/components/next/Input/input.css b/packages/eds-core-react/src/components/next/Input/input.css
index 0ded26dd04..a52dfabf0e 100644
--- a/packages/eds-core-react/src/components/next/Input/input.css
+++ b/packages/eds-core-react/src/components/next/Input/input.css
@@ -1,6 +1,6 @@
 @layer eds-components {
   /* Container */
-  .eds-input-container {
+  .eds-input {
     /* Temporary alias until proper input background token is available */
     --_bg-input: var(--eds-color-bg-canvas);
 
@@ -30,10 +30,14 @@
       background-color 150ms,
       outline-color 150ms;
 
+    [data-density='comfortable'] & {
+      padding-block: var(--eds-spacing-proportions-xs-vertical);
+    }
+
     &:hover:not([data-disabled], [data-readonly]) {
       outline-color: var(--eds-color-border-strong);
 
-      & .eds-input {
+      & .control {
         color: var(--eds-color-text-strong);
 
         /* Safari autofill override */
@@ -73,7 +77,7 @@
       cursor: not-allowed;
       outline-color: transparent;
 
-      & .eds-input {
+      & .control {
         cursor: not-allowed;
         color: var(--eds-color-text-disabled);
         opacity: 1;
@@ -89,9 +93,9 @@
         }
       }
 
-      & .eds-adornment__text,
-      & .eds-adornment__adornment,
-      & .eds-error-icon {
+      & .text,
+      & .item,
+      & .error-icon {
         color: var(--eds-color-text-disabled);
       }
     }
@@ -100,101 +104,96 @@
     &[data-readonly] {
       outline-color: transparent;
 
-      & .eds-input {
+      & .control {
         color: var(--_readonly-text-color);
 
         /* Safari autofill override */
         -webkit-text-fill-color: var(--_readonly-text-color);
       }
 
-      & .eds-adornment__text,
-      & .eds-adornment__adornment {
+      & .text,
+      & .item {
         color: var(--_readonly-text-color);
       }
     }
-  }
 
-  /* Comfortable density: uses XS vertical spacing for 24px height */
-  [data-density='comfortable'] .eds-input-container {
-    padding-block: var(--eds-spacing-proportions-xs-vertical);
-  }
-
-  /* Input/Textarea element */
-  .eds-input {
-    --_placeholder-text-color: var(--eds-color-text-subtle);
+    /* Input/Textarea element */
+    & .control {
+      --_placeholder-text-color: var(--eds-color-text-subtle);
 
-    resize: none;
+      resize: none;
 
-    overflow: hidden;
-    flex: 1;
+      overflow: hidden;
+      flex: 1;
 
-    min-inline-size: 0;
-    padding: 0;
-    border: var(--eds-sizing-stroke-none);
+      min-inline-size: 0;
+      padding: 0;
+      border: var(--eds-sizing-stroke-none);
 
-    color: var(--eds-color-text-strong);
-    text-overflow: ellipsis;
-    white-space: nowrap;
+      color: var(--eds-color-text-strong);
+      text-overflow: ellipsis;
+      white-space: nowrap;
 
-    background: transparent;
-    outline: none;
+      background: transparent;
+      outline: none;
 
-    &::placeholder {
-      color: var(--_placeholder-text-color);
+      &::placeholder {
+        color: var(--_placeholder-text-color);
 
-      /* Safari autofill override */
-      -webkit-text-fill-color: var(--_placeholder-text-color);
+        /* Safari autofill override */
+        -webkit-text-fill-color: var(--_placeholder-text-color);
+      }
     }
-  }
 
-  /* Error icon */
-  .eds-error-icon {
-    flex-shrink: 0;
-    color: var(--eds-color-text-subtle);
-  }
+    /* Error icon */
+    & .error-icon {
+      flex-shrink: 0;
+      color: var(--eds-color-text-subtle);
+    }
 
-  /* Adornments container */
-  .eds-adornment {
-    display: flex;
-    flex-shrink: 0;
-    gap: var(--eds-typography-gap-horizontal);
-    align-items: center;
+    /* Adornments container */
+    & .adornment {
+      display: flex;
+      flex-shrink: 0;
+      gap: var(--eds-typography-gap-horizontal);
+      align-items: center;
 
-    color: var(--eds-color-text-subtle);
-  }
+      color: var(--eds-color-text-subtle);
 
-  /* Adornment icons and buttons */
-  .eds-adornment__adornment {
-    display: flex;
-    align-items: center;
-  }
+      /* Adornment icons and buttons */
+      & .item {
+        display: flex;
+        align-items: center;
 
-  /* Prevent button from expanding Input (Button size="small" is 24px, Input needs 20px) */
-  .eds-adornment__adornment:has(button) {
-    block-size: var(--eds-typography-ui-body-md-line-height-default);
-  }
+        /* Prevent button from expanding Input (Button size="small" is 24px, Input needs 20px) */
+        &:has(button) {
+          block-size: var(--eds-typography-ui-body-md-line-height-default);
+        }
 
-  /* Make button fit the 20px space to match Input content height */
-  .eds-adornment__adornment button {
-    inline-size: var(--eds-typography-ui-body-md-line-height-default);
-    block-size: var(--eds-typography-ui-body-md-line-height-default);
-    padding: 0;
-  }
+        /* Make button fit the 20px space to match Input content height */
+        & button {
+          inline-size: var(--eds-typography-ui-body-md-line-height-default);
+          block-size: var(--eds-typography-ui-body-md-line-height-default);
+          padding: 0;
+        }
+      }
+    }
 
-  /* Negative margin aligns buttons with icon adornments
-     Applied to wrapper to avoid [data-font-family] margin override */
+    /* Negative margin aligns buttons with icon adornments
+       Applied to wrapper to avoid [data-font-family] margin override */
 
-  /* End adornment */
-  .eds-input ~ .eds-adornment .eds-adornment__adornment:has(button) {
-    margin-inline-end: calc(
-      (var(--eds-sizing-icon-xs) - var(--eds-typography-ui-body-md-line-height-default)) / 2
-    );
-  }
+    /* End adornment */
+    & .control ~ .adornment .item:has(button) {
+      margin-inline-end: calc(
+        (var(--eds-sizing-icon-xs) - var(--eds-typography-ui-body-md-line-height-default)) / 2
+      );
+    }
 
-  /* Start adornment */
-  .eds-adornment:has(~ .eds-input) .eds-adornment__adornment:has(button) {
-    margin-inline-start: calc(
-      (var(--eds-sizing-icon-xs) - var(--eds-typography-ui-body-md-line-height-default)) / 2
-    );
+    /* Start adornment */
+    & .adornment:has(~ .control) .item:has(button) {
+      margin-inline-start: calc(
+        (var(--eds-sizing-icon-xs) - var(--eds-typography-ui-body-md-line-height-default)) / 2
+      );
+    }
   }
 }
diff --git a/packages/eds-core-react/src/components/next/TextArea/textarea.css b/packages/eds-core-react/src/components/next/TextArea/textarea.css
index 310f3aef1f..0267ec0d89 100644
--- a/packages/eds-core-react/src/components/next/TextArea/textarea.css
+++ b/packages/eds-core-react/src/components/next/TextArea/textarea.css
@@ -15,12 +15,12 @@
       }
     }
 
-    & .eds-input-container {
+    & .eds-input {
       overflow: hidden;
       align-items: flex-start;
       padding-block: var(--eds-container-space-vertical);
 
-      & textarea.eds-input {
+      & textarea.control {
         resize: vertical;
 
         overflow: auto;
@@ -51,7 +51,7 @@
 /* Must be outside @layer: [data-font-family] { margin: 0 } in variables.css
    is unlayered and overrides any margin inside @layer eds-components. */
 .eds-text-area {
-  & .eds-error-icon {
+  & .error-icon {
     margin-block-start: var(--eds-spacing-vertical-2xs);
   }
 
@@ -60,7 +60,7 @@
   }
 
   /* Extend textarea to bottom-right corner so the resize handle sits flush. */
-  & textarea.eds-input {
+  & textarea.control {
     margin-block-end: calc(-1 * var(--eds-container-space-vertical));
     margin-inline-end: calc(-1 * var(--eds-selectable-space-horizontal));
   }
diff --git a/packages/eds-core-react/src/components/next/TextField/TextField.tsx b/packages/eds-core-react/src/components/next/TextField/TextField.tsx
index c73eba5929..67077ea3eb 100644
--- a/packages/eds-core-react/src/components/next/TextField/TextField.tsx
+++ b/packages/eds-core-react/src/components/next/TextField/TextField.tsx
@@ -29,9 +29,9 @@ export const TextField = forwardRef<
     useFieldIds(providedId)
 
   return (
-    <Field disabled={disabled}>
+    <Field disabled={disabled} className="eds-text-field">
       {label && (
-        <div className="eds-text-field__header">
+        <div className="header">
           <Field.Label htmlFor={inputId} indicator={indicator}>
             {label}
           </Field.Label>
@@ -43,7 +43,7 @@ export const TextField = forwardRef<
                 round
                 size="small"
                 tone="neutral"
-                className="eds-text-field__info"
+                className="info"
                 aria-label="More information"
               >
                 <Icon data={info_circle} size="xs" />
diff --git a/packages/eds-core-react/src/components/next/TextField/__snapshots__/TextField.test.tsx.snap b/packages/eds-core-react/src/components/next/TextField/__snapshots__/TextField.test.tsx.snap
index fc375127b9..e84ea24c91 100644
--- a/packages/eds-core-react/src/components/next/TextField/__snapshots__/TextField.test.tsx.snap
+++ b/packages/eds-core-react/src/components/next/TextField/__snapshots__/TextField.test.tsx.snap
@@ -3,10 +3,10 @@
 exports[`TextField (Next EDS 2.0) Matches snapshot 1`] = `
 <div>
   <div
-    class="eds-field"
+    class="eds-field eds-text-field"
   >
     <div
-      class="eds-text-field__header"
+      class="header"
     >
       <label
         class="eds-field__label"
@@ -24,7 +24,7 @@ exports[`TextField (Next EDS 2.0) Matches snapshot 1`] = `
       Description text
     </p>
     <div
-      class="eds-input-container"
+      class="eds-input"
       data-color-appearance="neutral"
       data-font-size="md"
       data-selectable-space="sm"
@@ -32,7 +32,7 @@ exports[`TextField (Next EDS 2.0) Matches snapshot 1`] = `
     >
       <input
         aria-describedby="test-id-description test-id-helper-message"
-        class="eds-input"
+        class="control"
         data-color-appearance="neutral"
         data-font-family="ui"
         data-font-size="md"
diff --git a/packages/eds-core-react/src/components/next/TextField/text-field.css b/packages/eds-core-react/src/components/next/TextField/text-field.css
index 2d82532d31..ee9f5c0f59 100644
--- a/packages/eds-core-react/src/components/next/TextField/text-field.css
+++ b/packages/eds-core-react/src/components/next/TextField/text-field.css
@@ -1,19 +1,21 @@
 @layer eds-components {
-  .eds-text-field__header {
-    display: flex;
-    gap: var(--eds-typography-gap-horizontal);
-    align-items: center;
-    justify-content: space-between;
+  .eds-text-field {
+    & .header {
+      display: flex;
+      gap: var(--eds-typography-gap-horizontal);
+      align-items: center;
+      justify-content: space-between;
 
-    inline-size: 100%;
-  }
+      inline-size: 100%;
+    }
 
-  .eds-text-field__header > .eds-text-field__info,
-  .eds-text-field__header > .eds-tooltip-anchor {
-    flex-shrink: 0;
+    & .header > .info,
+    & .header > .eds-tooltip-anchor {
+      flex-shrink: 0;
 
-    /* Negative margin collapses the button's 24px layout contribution to ~8px,
-       matching Figma's 8px icon container. Label text-box height determines row height. */
-    margin-block: calc(var(--eds-sizing-icon-xs) / -2);
+      /* Negative margin collapses the button's 24px layout contribution to ~8px,
+         matching Figma's 8px icon container. Label text-box height determines row height. */
+      margin-block: calc(var(--eds-sizing-icon-xs) / -2);
+    }
   }
 }