diff --git a/src/SeqViz/Circular/Circular.tsx b/src/SeqViz/Circular/Circular.tsx
index 5430d0bdd..7eaa2ac04 100644
--- a/src/SeqViz/Circular/Circular.tsx
+++ b/src/SeqViz/Circular/Circular.tsx
@@ -3,17 +3,17 @@ import * as React from "react";
 import { Annotation, Coor, ICutSite, ISize, InputRefFuncType, Primer, Ranged } from "../../elements";
 import bindingSites from "../../utils/bindingSites";
 import isEqual from "../../utils/isEqual";
-import { HighlightRegion } from "../Linear/SeqBlock/LinearFind";
+import { HighlightRegion } from "../Linear/SeqBlock/Find";
 import { stackElements } from "../elementsToRows";
 import withViewerHOCs from "../handlers";
 import CentralIndexContext from "../handlers/centralIndex";
 import { SeqVizSelection } from "../handlers/selection";
 import Annotations from "./Annotations";
-import { CircularFind } from "./CircularFind";
-import Selection from "./CircularSelection";
 import CutSites from "./CutSites";
+import { Find } from "./Find";
 import Index from "./Index";
 import Labels, { ILabel } from "./Labels";
+import Selection from "./Selection";
 
 // this will need to change whenever the css of the plasmid viewer text changes
 // just divide the width of some rectangular text by it's number of characters
@@ -355,7 +355,7 @@ class Circular extends React.Component<CircularProps, CircularState> {
             totalRows={totalRows}
             yDiff={yDiff}
           />
-          <CircularFind
+          <Find
             center={general.center}
             findCoor={general.findCoor}
             generateArc={general.generateArc}
diff --git a/src/SeqViz/Circular/CutSites.tsx b/src/SeqViz/Circular/CutSites.tsx
index 0d0fd4ebb..8f11a7101 100644
--- a/src/SeqViz/Circular/CutSites.tsx
+++ b/src/SeqViz/Circular/CutSites.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 
 import { Coor, ICutSite, InputRefFuncType } from "../../elements";
-import { CircularFindArc } from "./CircularFind";
+import { FindArc } from "./Find";
 
 interface CutSitesProps {
   center: Coor;
@@ -123,7 +123,7 @@ export default class CutSites extends React.PureComponent<CutSitesProps> {
   recogHighlightArc = (c: ICutSite) => {
     if (c.highlightColor) {
       return (
-        <CircularFindArc
+        <FindArc
           key={`findArc: ${c.id}`}
           direction={1}
           end={c.end}
diff --git a/src/SeqViz/Circular/CircularFind.tsx b/src/SeqViz/Circular/Find.tsx
similarity index 93%
rename from src/SeqViz/Circular/CircularFind.tsx
rename to src/SeqViz/Circular/Find.tsx
index 4d3465cdc..b288b39d2 100644
--- a/src/SeqViz/Circular/CircularFind.tsx
+++ b/src/SeqViz/Circular/Find.tsx
@@ -1,9 +1,9 @@
 import * as React from "react";
 
 import { Coor, InputRefFuncType, Ranged } from "../../elements";
-import { HighlightRegion } from "../Linear/SeqBlock/LinearFind";
+import { HighlightRegion } from "../Linear/SeqBlock/Find";
 
-interface CircularFindProps {
+interface FindProps {
   center: Coor;
   findCoor: (index: number, radius: number, rotate?: boolean) => Coor;
   generateArc: (args: {
@@ -30,11 +30,11 @@ interface CircularFindProps {
   totalRows: number;
 }
 
-export const CircularFind = (props: CircularFindProps) => {
+export const Find = (props: FindProps) => {
   const { generateArc, getRotation, highlightedRegions, inputRef, lineHeight, radius, search, seqLength } = props;
   const threshold = seqLength >= 200 ? search.length / seqLength <= 0.02 : true;
   const searchArcs = search.map(s => (
-    <CircularFindArc
+    <FindArc
       key={JSON.stringify(s)}
       direction={s.direction || 1}
       end={s.end}
@@ -50,7 +50,7 @@ export const CircularFind = (props: CircularFindProps) => {
   ));
 
   const highlightArcs = highlightedRegions.map(({ color, end, start }) => (
-    <CircularFindArc
+    <FindArc
       key={JSON.stringify({ end, start })}
       direction={1}
       end={end}
@@ -75,7 +75,7 @@ export const CircularFind = (props: CircularFindProps) => {
 /**
  * Create an SVG `path` element that highlights the search result
  */
-export const CircularFindArc = (props: {
+export const FindArc = (props: {
   direction: -1 | 1;
   end: number;
   fillStyle: string;
diff --git a/src/SeqViz/Circular/CircularSelection.tsx b/src/SeqViz/Circular/Selection.tsx
similarity index 97%
rename from src/SeqViz/Circular/CircularSelection.tsx
rename to src/SeqViz/Circular/Selection.tsx
index 41cfd035c..0099e3e89 100644
--- a/src/SeqViz/Circular/CircularSelection.tsx
+++ b/src/SeqViz/Circular/Selection.tsx
@@ -36,7 +36,7 @@ interface CircularSelectionProps {
  * if nothing is selected, it should just be the single cursor
  * without a middle highlighted region
  */
-export default class CircularSelection extends React.PureComponent<CircularSelectionProps> {
+export default class Selection extends React.PureComponent<CircularSelectionProps> {
   static contextType = SelectionContext;
   declare context: React.ContextType<typeof SelectionContext>;
 
diff --git a/src/SeqViz/Linear/Linear.tsx b/src/SeqViz/Linear/Linear.tsx
index aecb68674..2553254d3 100644
--- a/src/SeqViz/Linear/Linear.tsx
+++ b/src/SeqViz/Linear/Linear.tsx
@@ -8,7 +8,7 @@ import { createMultiRows, createSingleRows, stackElements } from "../elementsToR
 import withViewerHOCs from "../handlers";
 import { SeqVizSelection } from "../handlers/selection";
 import InfiniteScroll from "./InfiniteScroll";
-import { HighlightRegion } from "./SeqBlock/LinearFind";
+import { HighlightRegion } from "./SeqBlock/Find";
 import SeqBlock from "./SeqBlock/SeqBlock";
 
 export interface LinearProps {
diff --git a/src/SeqViz/Linear/SeqBlock/LinearFind.tsx b/src/SeqViz/Linear/SeqBlock/Find.tsx
similarity index 95%
rename from src/SeqViz/Linear/SeqBlock/LinearFind.tsx
rename to src/SeqViz/Linear/SeqBlock/Find.tsx
index acf01ef3e..2a7ba9ddf 100644
--- a/src/SeqViz/Linear/SeqBlock/LinearFind.tsx
+++ b/src/SeqViz/Linear/SeqBlock/Find.tsx
@@ -26,7 +26,7 @@ interface FindProps {
 /**
  * Render rectangles around Search results.
  */
-export default function LinearFind(props: FindProps) {
+export default function Find(props: FindProps) {
   const {
     compYDiff,
     filteredRows: searchRows,
@@ -45,7 +45,7 @@ export default function LinearFind(props: FindProps) {
       {/* We use two LinearFindBlocks here because we want to span both the top and bottom strand for a highlight */}
       {highlightedRegions.map(({ color, end, start }) => (
         <React.Fragment key={`highlight-${start}-${end}-1`}>
-          <LinearFindBlock
+          <FindBlock
             compYDiff={compYDiff}
             direction={1}
             end={end}
@@ -59,7 +59,7 @@ export default function LinearFind(props: FindProps) {
             seqBlockRef={seqBlockRef}
             start={start}
           />
-          <LinearFindBlock
+          <FindBlock
             compYDiff={compYDiff}
             direction={-1}
             end={end}
@@ -76,7 +76,7 @@ export default function LinearFind(props: FindProps) {
         </React.Fragment>
       ))}
       {searchRows.map(s => (
-        <LinearFindBlock
+        <FindBlock
           key={JSON.stringify(s)}
           compYDiff={compYDiff}
           direction={s.direction || 1}
@@ -96,7 +96,7 @@ export default function LinearFind(props: FindProps) {
   );
 }
 
-export const LinearFindBlock = (props: {
+export const FindBlock = (props: {
   compYDiff: number;
   direction: -1 | 1;
   end: number;
diff --git a/src/SeqViz/Linear/SeqBlock/SeqBlock.tsx b/src/SeqViz/Linear/SeqBlock/SeqBlock.tsx
index 31ad683c1..56ead46b8 100644
--- a/src/SeqViz/Linear/SeqBlock/SeqBlock.tsx
+++ b/src/SeqViz/Linear/SeqBlock/SeqBlock.tsx
@@ -4,8 +4,8 @@ import { Annotation, ICutSite, ISize, InputRefFuncType, Primer, Ranged } from ".
 import { SeqVizSelection } from "../../handlers/selection";
 import { AnnotationRows } from "./AnnotationRows";
 import CutSiteRow from "./CutSites";
+import Find, { HighlightRegion } from "./Find";
 import IndexRow from "./Index";
-import LinearFind, { HighlightRegion } from "./LinearFind";
 import Primers from "./Primers";
 import Selection from "./Selection";
 import TranslationRows, { Translation } from "./Translations";
@@ -303,7 +303,7 @@ export default class SeqBlock extends React.PureComponent<SeqBlockProps> {
           lastBase={lastBase}
           selectEdgeHeight={selectEdgeHeight}
         />
-        <LinearFind
+        <Find
           compYDiff={compYDiff}
           filteredRows={filteredSearchRows}
           findXAndWidth={this.findXAndWidth}
@@ -412,7 +412,7 @@ export default class SeqBlock extends React.PureComponent<SeqBlockProps> {
           </text>
         ) : null}
 
-        <LinearFind
+        <Find
           {...this.props}
           compYDiff={compYDiff}
           filteredRows={filteredSearchRows}
diff --git a/src/SeqViz/SeqViewer.tsx b/src/SeqViz/SeqViewer.tsx
index 87b75bf33..3199eb5a0 100644
--- a/src/SeqViz/SeqViewer.tsx
+++ b/src/SeqViz/SeqViewer.tsx
@@ -5,7 +5,7 @@ import { Annotation, ICutSite, Ranged } from "../elements";
 import isEqual from "../utils/isEqual";
 import Circular from "./Circular/Circular";
 import Linear from "./Linear/Linear";
-import { HighlightRegion } from "./Linear/SeqBlock/LinearFind";
+import { HighlightRegion } from "./Linear/SeqBlock/Find";
 import CentralIndexContext from "./handlers/centralIndex";
 import { SeqVizSelection } from "./handlers/selection";
 
diff --git a/src/SeqViz/SeqViz.tsx b/src/SeqViz/SeqViz.tsx
index 15f23a38a..51c46b944 100644
--- a/src/SeqViz/SeqViz.tsx
+++ b/src/SeqViz/SeqViz.tsx
@@ -8,7 +8,7 @@ import isEqual from "../utils/isEqual";
 import { directionality, dnaComplement } from "../utils/parser";
 import search from "../utils/search";
 import { annotationFactory, getSeqType } from "../utils/sequence";
-import { HighlightRegion } from "./Linear/SeqBlock/LinearFind";
+import { HighlightRegion } from "./Linear/SeqBlock/Find";
 import SeqViewer from "./SeqViewer";
 import CentralIndexContext from "./handlers/centralIndex";
 import { SelectionContext, SeqVizSelection, defaultSelection } from "./handlers/selection";