diff --git a/packages/core/core-types/index.d.ts b/packages/core/core-types/index.d.ts
index 55a27b4bf..26087ea7a 100644
--- a/packages/core/core-types/index.d.ts
+++ b/packages/core/core-types/index.d.ts
@@ -794,4 +794,13 @@ export type PercentLengthType = 'auto' | dip | LengthDipUnit | LengthPxUnit | Le
 /**
  * @deprecated Use `CoreTypes` instead. Enums will be removed in 9.0
  */
-export const Enums: typeof CoreTypes;
+export namespace Enums {
+	export type DeviceOrientationType = CoreTypes.DeviceOrientationType;
+	export type HorizontalAlignmentType = CoreTypes.HorizontalAlignmentType;
+	export type VerticalAlignmentTextType = CoreTypes.VerticalAlignmentTextType;
+	export type VerticalAlignmentType = CoreTypes.VerticalAlignmentType;
+	export type OrientationType = CoreTypes.OrientationType;
+	export type TextAlignmentType = CoreTypes.TextAlignmentType;
+	export type TextTransformType = CoreTypes.TextTransformType;
+	export type VisibilityType = CoreTypes.VisibilityType;
+}
diff --git a/packages/core/core-types/index.ts b/packages/core/core-types/index.ts
index c3310e32b..98729e36e 100644
--- a/packages/core/core-types/index.ts
+++ b/packages/core/core-types/index.ts
@@ -263,50 +263,6 @@ export namespace CoreTypes {
 		export const light = 'light';
 		export const dark = 'dark';
 	}
-
-	// Accuracy,
-	// AndroidActionBarIconVisibility,
-	// AndroidActionItemPosition,
-	// AnimationCurve,
-	// AutocapitalizationType,
-	// AutocapitalizationInputType: typeof AutocapitalizationType,
-	// BackgroundRepeat,
-	// BackgroundRepeatType: typeof BackgroundRepeat,
-	// DeviceOrientation,
-	// DeviceType,
-	// Dock,
-	// FontAttributes,
-	// FontStyle,
-	// FontStyleType: typeof FontStyle,
-	// FontWeight,
-	// FontWeightType: typeof FontWeight,
-	// HorizontalAlignment,
-	// HorizontalAlignmentType: typeof HorizontalAlignment,
-	// IOSActionItemPosition,
-	// ImageFormat,
-	// KeyboardType,
-	// KeyboardInputType: typeof KeyboardType,
-	// NavigationBarVisibility,
-	// Orientation,
-	// OrientationType: typeof Orientation,
-	// ReturnKeyType,
-	// StatusBarStyle,
-	// Stretch,
-	// SystemAppearance,
-	// TextAlignment,
-	// TextAlignmentType: typeof TextAlignment,
-	// TextDecoration,
-	// TextDecorationType: typeof TextDecoration,
-	// TextTransform,
-	// TextTransformType: typeof TextTransform,
-	// UpdateTextTrigger,
-	// UpdateTextTriggerType: typeof UpdateTextTrigger,
-	// VerticalAlignment,
-	// VerticalAlignmentType: typeof VerticalAlignment,
-	// Visibility,
-	// VisibilityType: typeof Visibility,
-	// WhiteSpace,
-	// WhiteSpaceType: typeof WhiteSpace
 }
 
 /**
@@ -347,6 +303,15 @@ export type LengthType = 'auto' | dip | LengthDipUnit | LengthPxUnit;
 export type PercentLengthType = 'auto' | dip | LengthDipUnit | LengthPxUnit | LengthPercentUnit;
 
 /**
- * @deprecated Use `CoreTypes` instead.
+ * @deprecated Use `CoreTypes` instead. Enums will be removed in 9.0
  */
-export const Enums: typeof CoreTypes = CoreTypes;
+export namespace Enums {
+	export type DeviceOrientationType = CoreTypes.DeviceOrientationType;
+	export type HorizontalAlignmentType = CoreTypes.HorizontalAlignmentType;
+	export type VerticalAlignmentTextType = CoreTypes.VerticalAlignmentTextType;
+	export type VerticalAlignmentType = CoreTypes.VerticalAlignmentType;
+	export type OrientationType = CoreTypes.OrientationType;
+	export type TextAlignmentType = CoreTypes.TextAlignmentType;
+	export type TextTransformType = CoreTypes.TextTransformType;
+	export type VisibilityType = CoreTypes.VisibilityType;
+}
diff --git a/packages/core/package.json b/packages/core/package.json
index 682274da7..7f50b4566 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -3,7 +3,7 @@
   "main": "index",
   "types": "index.d.ts",
   "description": "NativeScript Core Modules",
-  "version": "8.0.0-alpha.5",
+  "version": "8.0.0-alpha.6",
   "homepage": "https://nativescript.org",
   "repository": {
       "type": "git",