diff --git a/VDS/Components/Calendar/Calendar.swift b/VDS/Components/Calendar/Calendar.swift
index fd3e3452..27d9b011 100644
--- a/VDS/Components/Calendar/Calendar.swift
+++ b/VDS/Components/Calendar/Calendar.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 import Combine
 
 /// A calendar is a monthly view that lets customers select a single date.
diff --git a/VDS/Components/Calendar/CalendarDateViewCell.swift b/VDS/Components/Calendar/CalendarDateViewCell.swift
index d66522d0..4b6f400d 100644
--- a/VDS/Components/Calendar/CalendarDateViewCell.swift
+++ b/VDS/Components/Calendar/CalendarDateViewCell.swift
@@ -6,7 +6,7 @@
 //
 
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 
 final class CalendarDateViewCell: UICollectionViewCell {
     
diff --git a/VDS/Components/Calendar/CalendarFooterReusableView.swift b/VDS/Components/Calendar/CalendarFooterReusableView.swift
index 9547084f..a34eb763 100644
--- a/VDS/Components/Calendar/CalendarFooterReusableView.swift
+++ b/VDS/Components/Calendar/CalendarFooterReusableView.swift
@@ -6,7 +6,7 @@
 //
 
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 
 /// Footer view to show indicators data.
 class CalendarFooterReusableView: UICollectionReusableView {
diff --git a/VDS/Components/Calendar/CalendarHeaderReusableView.swift b/VDS/Components/Calendar/CalendarHeaderReusableView.swift
index d0f7f247..908833ec 100644
--- a/VDS/Components/Calendar/CalendarHeaderReusableView.swift
+++ b/VDS/Components/Calendar/CalendarHeaderReusableView.swift
@@ -6,7 +6,7 @@
 //
 
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 
 /// Header view to display month and year along with days of week.
 class CalendarHeaderReusableView: UICollectionReusableView {
diff --git a/VDS/Components/DatePicker/DatePicker.swift b/VDS/Components/DatePicker/DatePicker.swift
index ff9fbb06..42477151 100644
--- a/VDS/Components/DatePicker/DatePicker.swift
+++ b/VDS/Components/DatePicker/DatePicker.swift
@@ -1,6 +1,6 @@
 import Foundation
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 import Combine
 
 /// A dropdown select is an expandable menu of predefined options that allows a customer to make a single selection.
diff --git a/VDS/Components/TextFields/InputField/FieldTypes/FieldType.swift b/VDS/Components/TextFields/InputField/FieldTypes/FieldType.swift
index ebecb17d..3862afb9 100644
--- a/VDS/Components/TextFields/InputField/FieldTypes/FieldType.swift
+++ b/VDS/Components/TextFields/InputField/FieldTypes/FieldType.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 
 extension InputField {
     
diff --git a/VDS/Components/TextFields/InputField/FieldTypes/SecurityCode.swift b/VDS/Components/TextFields/InputField/FieldTypes/SecurityCode.swift
index cf60eb9a..b8883881 100644
--- a/VDS/Components/TextFields/InputField/FieldTypes/SecurityCode.swift
+++ b/VDS/Components/TextFields/InputField/FieldTypes/SecurityCode.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 
 extension InputField {
                     
diff --git a/VDS/Components/Tilelet/TileletIconModels.swift b/VDS/Components/Tilelet/TileletIconModels.swift
index 788a2155..fb0ed729 100644
--- a/VDS/Components/Tilelet/TileletIconModels.swift
+++ b/VDS/Components/Tilelet/TileletIconModels.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import UIKit
-import VDSTokens
+import VDSCoreTokens
 
 extension Tilelet {