diff --git a/sites/lab/page-templates/design-list.mjs b/sites/lab/page-templates/design-list.mjs
index 4364a2e51c4..f8a0a5a0b9d 100644
--- a/sites/lab/page-templates/design-list.mjs
+++ b/sites/lab/page-templates/design-list.mjs
@@ -6,7 +6,7 @@ import Head from 'next/head'
 import Link from 'next/link'
 import { PageWrapper } from 'site/components/wrappers/page.mjs'
 import { BareLayout } from 'site/components/layouts/bare.mjs'
-import { PageTitle } from 'shared/components/layouts/default.mjs'
+import { PageTitle } from 'shared/components/workbench/layout/default.mjs'
 
 const DesignLinks = ({ list, prefix = '' }) => {
   const { t } = useTranslation(['patterns'])
diff --git a/sites/lab/pages/accessories/index.js b/sites/lab/pages/accessories/index.js
index ade0e3e74b7..6f294db2c1e 100644
--- a/sites/lab/pages/accessories/index.js
+++ b/sites/lab/pages/accessories/index.js
@@ -1,7 +1,7 @@
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
-import PageTemplate from 'site/page-templates/design-list.js'
+import { PatternListPageTemplate } from 'site/page-templates/design-list.mjs'
 
-const Page = () => <PageTemplate section="accessories" />
+const Page = () => <PatternListPageTemplate section="accessories" />
 
 export default Page
 
diff --git a/sites/lab/pages/blocks/index.js b/sites/lab/pages/blocks/index.js
index aee59ddbc2b..5af69821f3b 100644
--- a/sites/lab/pages/blocks/index.js
+++ b/sites/lab/pages/blocks/index.js
@@ -1,7 +1,7 @@
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
-import PageTemplate from 'site/page-templates/design-list.js'
+import { PatternListPageTemplate } from 'site/page-templates/design-list.mjs'
 
-const Page = () => <PageTemplate section="blocks" />
+const Page = () => <PatternListPageTemplate section="blocks" />
 
 export default Page
 
diff --git a/sites/lab/pages/garments/index.js b/sites/lab/pages/garments/index.js
index c54e4b7ae85..1162cab4de7 100644
--- a/sites/lab/pages/garments/index.js
+++ b/sites/lab/pages/garments/index.js
@@ -1,7 +1,7 @@
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
-import PageTemplate from 'site/page-templates/design-list.js'
+import { PatternListPageTemplate } from 'site/page-templates/design-list.mjs'
 
-const Page = () => <PageTemplate section="garments" />
+const Page = () => <PatternListPageTemplate section="garments" />
 
 export default Page
 
diff --git a/sites/lab/pages/utilities/index.js b/sites/lab/pages/utilities/index.js
index b07c408b84b..65ebfaea5e5 100644
--- a/sites/lab/pages/utilities/index.js
+++ b/sites/lab/pages/utilities/index.js
@@ -1,7 +1,7 @@
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
-import PageTemplate from 'site/page-templates/design-list.js'
+import { PatternListPageTemplate } from 'site/page-templates/design-list.mjs'
 
-const Page = () => <PageTemplate section="utilities" />
+const Page = () => <PatternListPageTemplate section="utilities" />
 
 export default Page
 
diff --git a/sites/shared/components/workbench/draft/error.mjs b/sites/shared/components/workbench/draft/error.mjs
index 395bcbbb735..499b7c2fec5 100644
--- a/sites/shared/components/workbench/draft/error.mjs
+++ b/sites/shared/components/workbench/draft/error.mjs
@@ -1,6 +1,6 @@
 import { ErrorView } from 'shared/components/error/view.mjs'
 
-export const Error = (props) => {
+export const DraftError = (props) => {
   const errors = {
     pattern: 0,
     sets: 0,
diff --git a/sites/shared/components/workbench/draft/index.mjs b/sites/shared/components/workbench/draft/index.mjs
index 1ef2e6d46eb..9cd25bce6d9 100644
--- a/sites/shared/components/workbench/draft/index.mjs
+++ b/sites/shared/components/workbench/draft/index.mjs
@@ -1,5 +1,5 @@
 import { SvgWrapper } from './svg.mjs'
-import { Error } from './error.mjs'
+import { DraftError } from './error.mjs'
 
 export const LabDraft = (props) => {
   const { app, draft, gist, updateGist, unsetGist, showInfo, feedback, hasRequiredMeasurements } =
@@ -14,7 +14,7 @@ export const LabDraft = (props) => {
       svg = draft.render()
     } catch (error) {
       console.log('Failed to render design', error)
-      return <Error error={error} {...props} />
+      return <DraftError error={error} {...props} />
     }
     return <div dangerouslySetInnerHTML={{ __html: svg }} />
   }
@@ -26,7 +26,7 @@ export const LabDraft = (props) => {
   } catch (error) {
     console.log('Failed to get render props for design', error)
     return (
-      <Error
+      <DraftError
         error={error}
         patternLogs={patternProps.store.logs}
         setLogs={patternProps.setStores[0].logs}
@@ -44,7 +44,7 @@ export const LabDraft = (props) => {
   return (
     <>
       {errors.length > 0 ? (
-        <Error
+        <DraftError
           {...{
             draft,
             patternProps,
diff --git a/sites/shared/components/workbench/logs.mjs b/sites/shared/components/workbench/logs.mjs
index 47fbaf43821..5333c3e4cee 100644
--- a/sites/shared/components/workbench/logs.mjs
+++ b/sites/shared/components/workbench/logs.mjs
@@ -104,7 +104,7 @@ const StoreLogs = ({ logs, units }) => (
   </div>
 )
 
-const Logs = (props) => {
+export const DraftLogs = (props) => {
   return (
     <Tabs
       tabs={[
@@ -121,4 +121,4 @@ const Logs = (props) => {
   )
 }
 
-export default Logs
+export default DraftLogs
diff --git a/sites/shared/components/workbench/menu/design-options/option-input.mjs b/sites/shared/components/workbench/menu/design-options/option-input.mjs
index a5124b38c16..3568eb1f1a2 100644
--- a/sites/shared/components/workbench/menu/design-options/option-input.mjs
+++ b/sites/shared/components/workbench/menu/design-options/option-input.mjs
@@ -1,15 +1,15 @@
 import { DesignOptionPctDeg } from 'shared/components/workbench/inputs/design-option-pct-deg.mjs'
-import { CountOption } from 'shared/components/workbench/inputs/design-option-count.mjs'
-import { ListOption } from 'shared/components/workbench/inputs/design-option-list.mjs'
+import { DesignOptionCount } from 'shared/components/workbench/inputs/design-option-count.mjs'
+import { DesignOptionList } from 'shared/components/workbench/inputs/design-option-list.mjs'
 import { Popout } from 'shared/components/popout.mjs'
 
 export const Tmp = () => <p>not yet</p>
 
 export const inputs = {
   Pct: DesignOptionPctDeg,
-  Count: CountOption,
+  Count: DesignOptionCount,
   Deg: (props) => <DesignOptionPctDeg {...props} type="deg" />,
-  List: ListOption,
+  List: DesignOptionList,
   Mm: () => (
     <Popout fixme compact>
       Mm options are deprecated. Please report this
diff --git a/sites/shared/components/workbench/menu/test-design-options/index.mjs b/sites/shared/components/workbench/menu/test-design-options/index.mjs
index 248dfdf5cbd..d04d6f2fb4f 100644
--- a/sites/shared/components/workbench/menu/test-design-options/index.mjs
+++ b/sites/shared/components/workbench/menu/test-design-options/index.mjs
@@ -1,7 +1,7 @@
 import { OptionsIcon } from 'shared/components/icons.mjs'
 import { Chevron } from 'shared/components/navigation/primary.mjs'
-import OptionGroup from '../design-options/option-group.mjs'
-import Option from './option.mjs'
+import { OptionGroup } from '../design-options/option-group.mjs'
+import { Option } from './option.mjs'
 import { Ul, Details, TopSummary, TopSumTitle } from 'shared/components/workbench/menu/index.mjs'
 import { useTranslation } from 'next-i18next'
 import { optionsMenuStructure } from 'shared/utils.mjs'
diff --git a/sites/shared/components/workbench/menu/test-design-options/option.mjs b/sites/shared/components/workbench/menu/test-design-options/option.mjs
index 5abde614462..a859a7ddea2 100644
--- a/sites/shared/components/workbench/menu/test-design-options/option.mjs
+++ b/sites/shared/components/workbench/menu/test-design-options/option.mjs
@@ -1,6 +1,6 @@
 import { Li, SumButton, SumDiv } from 'shared/components/workbench/menu/index.mjs'
 
-const Option = (props) => {
+export const Option = (props) => {
   const active = props.sampleSettings?.type === 'option' && props.active === props.option
 
   const setSampleSettings = () => {
@@ -32,5 +32,3 @@ const Option = (props) => {
     </Li>
   )
 }
-
-export default Option
diff --git a/sites/shared/components/workbench/menu/xray/list.mjs b/sites/shared/components/workbench/menu/xray/list.mjs
index c0372a5d9e2..1b7a87781fb 100644
--- a/sites/shared/components/workbench/menu/xray/list.mjs
+++ b/sites/shared/components/workbench/menu/xray/list.mjs
@@ -1,13 +1,13 @@
 import { Chevron } from 'shared/components/navigation/primary.mjs'
 import { ClearIcon, FilterIcon, SearchIcon } from 'shared/components/icons.mjs'
 import { Ul, Li, Details, Summary, SumDiv, Deg } from 'shared/components/workbench/menu/index.mjs'
-import Path from './path.mjs'
-import Point from './point.mjs'
+import { XrayPath } from './path.mjs'
+import { XrayPoint } from './point.mjs'
 import { useTranslation } from 'next-i18next'
 
 const types = {
-  paths: Path,
-  points: Point,
+  paths: XrayPath,
+  points: XrayPoint,
 }
 
 export const XrayList = (props) => {
@@ -131,7 +131,7 @@ export const XrayList = (props) => {
                               <Chevron />
                             </Summary>
                             {type === 'paths' && (
-                              <Path
+                              <XrayPath
                                 pathName={id}
                                 partName={props.partName}
                                 draft={props.draft}
@@ -140,7 +140,7 @@ export const XrayList = (props) => {
                               />
                             )}
                             {type === 'points' && (
-                              <Point
+                              <XrayPoint
                                 pointName={id}
                                 partName={props.partName}
                                 draft={props.draft}
diff --git a/sites/shared/components/workbench/menu/xray/path-ops.mjs b/sites/shared/components/workbench/menu/xray/path-ops.mjs
index dea320ddeb7..622e606ba06 100644
--- a/sites/shared/components/workbench/menu/xray/path-ops.mjs
+++ b/sites/shared/components/workbench/menu/xray/path-ops.mjs
@@ -1,8 +1,8 @@
 import { Chevron } from 'shared/components/navigation/primary'
 import { Ul, Li, Details, Summary, SumDiv, NoSumDiv, Deg } from 'shared/components/workbench/menu'
-import Point from './point'
+import { XrayPoint } from './point'
 
-const MoveLine = ({ op }) => <Point point={op.to} />
+const MoveLine = ({ op }) => <XrayPoint point={op.to} />
 const Curve = ({ op }) =>
   ['cp1', 'cp2', 'to'].map((pnt) => (
     <Li key={pnt}>
@@ -14,7 +14,7 @@ const Curve = ({ op }) =>
           </SumDiv>
           <Chevron />
         </Summary>
-        <Point point={op[pnt]} />
+        <XrayPoint point={op[pnt]} />
       </Details>
     </Li>
   ))
diff --git a/sites/shared/components/workbench/menu/xray/path.mjs b/sites/shared/components/workbench/menu/xray/path.mjs
index 6521d8b3aac..036e5c6c112 100644
--- a/sites/shared/components/workbench/menu/xray/path.mjs
+++ b/sites/shared/components/workbench/menu/xray/path.mjs
@@ -1,7 +1,7 @@
 import { Ul, Li, NoSumDiv, Deg } from 'shared/components/workbench/menu/index.mjs'
 import { formatMm } from 'shared/utils.mjs'
-import Attributes from './attributes.mjs'
-import Ops from './path-ops.mjs'
+import { XrayAttributes } from './attributes.mjs'
+import { XrayPathOps } from './path-ops.mjs'
 
 export const XrayPath = ({ pathName, partName, draft, units }) => {
   const path = draft?.parts?.[partName]?.paths?.[pathName]
@@ -9,7 +9,7 @@ export const XrayPath = ({ pathName, partName, draft, units }) => {
   if (!path) return null
   return (
     <Ul>
-      <Attributes attr={path.attributes} />
+      <XrayAttributes attr={path.attributes} />
       <Li>
         <NoSumDiv>
           <Deg />
@@ -28,7 +28,7 @@ export const XrayPath = ({ pathName, partName, draft, units }) => {
           />
         </NoSumDiv>
       </Li>
-      <Ops ops={path.ops} />
+      <XrayPathOps ops={path.ops} />
     </Ul>
   )
 }
diff --git a/sites/shared/components/workbench/menu/xray/point.mjs b/sites/shared/components/workbench/menu/xray/point.mjs
index 8c315579a65..826edab39b6 100644
--- a/sites/shared/components/workbench/menu/xray/point.mjs
+++ b/sites/shared/components/workbench/menu/xray/point.mjs
@@ -1,6 +1,6 @@
 import { Ul, Li, NoSumDiv, Deg } from 'shared/components/workbench/menu'
 import { round } from 'shared/utils'
-import Attributes from './attributes'
+import { XrayAttributes } from './attributes'
 
 export const XrayPoint = ({ pointName, partName, draft, t }) => {
   const point = draft?.parts?.[partName]?.points?.[pointName]
@@ -16,7 +16,7 @@ export const XrayPoint = ({ pointName, partName, draft, t }) => {
           </NoSumDiv>
         </Li>
       ))}
-      <Attributes attr={point.attributes} t={t} />
+      <XrayAttributes attr={point.attributes} t={t} />
     </Ul>
   ) : null
 }
diff --git a/sites/shared/components/workbench/sample.mjs b/sites/shared/components/workbench/sample.mjs
index e349142c763..e07ac1f83a6 100644
--- a/sites/shared/components/workbench/sample.mjs
+++ b/sites/shared/components/workbench/sample.mjs
@@ -1,7 +1,7 @@
 import { useTranslation } from 'next-i18next'
 import { svgattrPlugin } from '@freesewing/plugin-svgattr'
 import { SvgWrapper } from './draft/svg.mjs'
-import { Error } from './draft/error.mjs'
+import { DraftError } from './draft/error.mjs'
 
 export const LabSample = ({ gist, draft, updateGist, unsetGist, showInfo, app, feedback }) => {
   const { t } = useTranslation(['workbench'])
@@ -32,7 +32,7 @@ export const LabSample = ({ gist, draft, updateGist, unsetGist, showInfo, app, f
     <>
       <h2>{title}</h2>
       {!patternProps || errors.length > 0 ? (
-        <Error {...{ draft, patternProps, updateGist, errors }} />
+        <DraftError {...{ draft, patternProps, updateGist, errors }} />
       ) : null}
       <SvgWrapper
         {...{ draft, patternProps, gist, updateGist, unsetGist, showInfo, app, feedback }}
diff --git a/sites/shared/components/wrappers/workbench.mjs b/sites/shared/components/wrappers/workbench.mjs
index dfd8821760e..c443d8e13fb 100644
--- a/sites/shared/components/wrappers/workbench.mjs
+++ b/sites/shared/components/wrappers/workbench.mjs
@@ -17,13 +17,13 @@ import { ExportDraft } from 'shared/components/workbench/exporting/index.mjs'
 import { GistAsJson, GistAsYaml } from 'shared/components/workbench/gist.mjs'
 import { DraftLogs } from 'shared/components/workbench/logs.mjs'
 import { CutLayout } from 'shared/components/workbench/layout/cut/index.mjs'
-import { PrintingLayout } from 'shared/components/workbench/layout/print/index.mjs'
+import { PrintLayout } from 'shared/components/workbench/layout/print/index.mjs'
 
 const views = {
   measurements: WorkbenchMeasurements,
   draft: LabDraft,
   test: LabSample,
-  printingLayout: PrintingLayout,
+  printingLayout: PrintLayout,
   cuttingLayout: CutLayout,
   export: ExportDraft,
   logs: DraftLogs,