diff --git a/js/common/model/FocalLengthModelType.ts b/js/common/model/FocalLengthModelType.ts
index f7b5da72..00a5bf3c 100644
--- a/js/common/model/FocalLengthModelType.ts
+++ b/js/common/model/FocalLengthModelType.ts
@@ -7,7 +7,5 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-const FocalLengthModelTypeValues = [ 'direct', 'indirect' ] as const;
-export type FocalLengthModelType = ( typeof FocalLengthModelTypeValues )[number];
-
-export { FocalLengthModelTypeValues };
+export const FocalLengthModelTypeValues = [ 'direct', 'indirect' ] as const;
+export type FocalLengthModelType = ( typeof FocalLengthModelTypeValues )[number];
\ No newline at end of file
diff --git a/js/common/model/OpticShape.ts b/js/common/model/OpticShape.ts
index c3451e53..b06d77fb 100644
--- a/js/common/model/OpticShape.ts
+++ b/js/common/model/OpticShape.ts
@@ -6,7 +6,5 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-const OpticShapeValues = [ 'convex', 'concave', 'flat' ] as const;
-export type OpticShape = ( typeof OpticShapeValues )[number];
-
-export { OpticShapeValues };
\ No newline at end of file
+export const OpticShapeValues = [ 'convex', 'concave', 'flat' ] as const;
+export type OpticShape = ( typeof OpticShapeValues )[number];
\ No newline at end of file
diff --git a/js/common/model/OpticalImageType.ts b/js/common/model/OpticalImageType.ts
index 2ff51167..bfa9f702 100644
--- a/js/common/model/OpticalImageType.ts
+++ b/js/common/model/OpticalImageType.ts
@@ -7,8 +7,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-const OpticalImageTypeValues = [ 'real', 'virtual' ] as const;
+export const OpticalImageTypeValues = [ 'real', 'virtual' ] as const;
 export type OpticalImageType = ( typeof OpticalImageTypeValues )[number];
 
-export { OpticalImageTypeValues };
-
diff --git a/js/common/model/RaysType.ts b/js/common/model/RaysType.ts
index 886be67f..34c73f55 100644
--- a/js/common/model/RaysType.ts
+++ b/js/common/model/RaysType.ts
@@ -6,8 +6,6 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-const RaysTypeValues = [ 'marginal', 'principal', 'many', 'none' ] as const;
+export const RaysTypeValues = [ 'marginal', 'principal', 'many', 'none' ] as const;
 export type RaysType = ( typeof RaysTypeValues )[number];
 
-export { RaysTypeValues };
-