diff --git a/Package.swift b/Package.swift
index e8dcbf1..8e7b70b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -4,20 +4,20 @@
 import PackageDescription
 
 let package = Package(
-    name: "USDA",
+    name: "USDA_FDC",
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
-            name: "USDA",
-            targets: ["USDA"]),
+            name: "USDA_FDC",
+            targets: ["USDA_FDC"]),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
         // Targets can depend on other targets in this package and products from dependencies.
         .target(
-            name: "USDA"),
+            name: "USDA_FDC"),
         .testTarget(
-            name: "USDATests",
-            dependencies: ["USDA"]),
+            name: "USDA_FDCTests",
+            dependencies: ["USDA_FDC"]),
     ]
 )
diff --git a/Sources/USDA/USDA.swift b/Sources/USDA_FDC/USDA_FDC.swift
similarity index 73%
rename from Sources/USDA/USDA.swift
rename to Sources/USDA_FDC/USDA_FDC.swift
index ec2474c..ff50eff 100644
--- a/Sources/USDA/USDA.swift
+++ b/Sources/USDA_FDC/USDA_FDC.swift
@@ -1,6 +1,6 @@
 // The Swift Programming Language
 // https://docs.swift.org/swift-book
 
-final class USDAClient {
+final class USDA_FDC_Client {
         
 }
diff --git a/Sources/USDA/types/AbridgedFoodItem.swift b/Sources/USDA_FDC/types/AbridgedFoodItem.swift
similarity index 100%
rename from Sources/USDA/types/AbridgedFoodItem.swift
rename to Sources/USDA_FDC/types/AbridgedFoodItem.swift
diff --git a/Sources/USDA/types/AbridgedFoodNutrient.swift b/Sources/USDA_FDC/types/AbridgedFoodNutrient.swift
similarity index 100%
rename from Sources/USDA/types/AbridgedFoodNutrient.swift
rename to Sources/USDA_FDC/types/AbridgedFoodNutrient.swift
diff --git a/Sources/USDA/types/BrandedFoodItem.swift b/Sources/USDA_FDC/types/BrandedFoodItem.swift
similarity index 93%
rename from Sources/USDA/types/BrandedFoodItem.swift
rename to Sources/USDA_FDC/types/BrandedFoodItem.swift
index dc45459..9f07dbe 100644
--- a/Sources/USDA/types/BrandedFoodItem.swift
+++ b/Sources/USDA_FDC/types/BrandedFoodItem.swift
@@ -17,8 +17,8 @@ public struct BrandedFoodItem: Codable {
     public let brandedFoodCategory: String?
     public let tradeChannel: [String]?
     public let gpcClassCode: Int?
-    public let foodNutrients: [Any]?
-    public let foodUpdateLog: [Any]?
+    public let foodNutrients: [FoodNutrient]?
+    public let foodUpdateLog: [FoodUpdateLog]?
     public let labelNutrients: LabelNutrients?
 
     public struct LabelNutrients: Codable {
diff --git a/Sources/USDA/types/DataType.swift b/Sources/USDA_FDC/types/DataType.swift
similarity index 100%
rename from Sources/USDA/types/DataType.swift
rename to Sources/USDA_FDC/types/DataType.swift
diff --git a/Sources/USDA/types/FoodAttribute.swift b/Sources/USDA_FDC/types/FoodAttribute.swift
similarity index 100%
rename from Sources/USDA/types/FoodAttribute.swift
rename to Sources/USDA_FDC/types/FoodAttribute.swift
diff --git a/Sources/USDA/types/FoodAttributeType.swift b/Sources/USDA_FDC/types/FoodAttributeType.swift
similarity index 100%
rename from Sources/USDA/types/FoodAttributeType.swift
rename to Sources/USDA_FDC/types/FoodAttributeType.swift
diff --git a/Sources/USDA/types/FoodCategory.swift b/Sources/USDA_FDC/types/FoodCategory.swift
similarity index 100%
rename from Sources/USDA/types/FoodCategory.swift
rename to Sources/USDA_FDC/types/FoodCategory.swift
diff --git a/Sources/USDA/types/FoodComponent.swift b/Sources/USDA_FDC/types/FoodComponent.swift
similarity index 100%
rename from Sources/USDA/types/FoodComponent.swift
rename to Sources/USDA_FDC/types/FoodComponent.swift
diff --git a/Sources/USDA/types/FoodListCriteria.swift b/Sources/USDA_FDC/types/FoodListCriteria.swift
similarity index 100%
rename from Sources/USDA/types/FoodListCriteria.swift
rename to Sources/USDA_FDC/types/FoodListCriteria.swift
diff --git a/Sources/USDA/types/FoodNutrient.swift b/Sources/USDA_FDC/types/FoodNutrient.swift
similarity index 100%
rename from Sources/USDA/types/FoodNutrient.swift
rename to Sources/USDA_FDC/types/FoodNutrient.swift
diff --git a/Sources/USDA/types/FoodNutrientDerivation.swift b/Sources/USDA_FDC/types/FoodNutrientDerivation.swift
similarity index 100%
rename from Sources/USDA/types/FoodNutrientDerivation.swift
rename to Sources/USDA_FDC/types/FoodNutrientDerivation.swift
diff --git a/Sources/USDA/types/FoodNutrientSource.swift b/Sources/USDA_FDC/types/FoodNutrientSource.swift
similarity index 100%
rename from Sources/USDA/types/FoodNutrientSource.swift
rename to Sources/USDA_FDC/types/FoodNutrientSource.swift
diff --git a/Sources/USDA/types/FoodPortion.swift b/Sources/USDA_FDC/types/FoodPortion.swift
similarity index 100%
rename from Sources/USDA/types/FoodPortion.swift
rename to Sources/USDA_FDC/types/FoodPortion.swift
diff --git a/Sources/USDA/types/FoodSearchCriteria.swift b/Sources/USDA_FDC/types/FoodSearchCriteria.swift
similarity index 100%
rename from Sources/USDA/types/FoodSearchCriteria.swift
rename to Sources/USDA_FDC/types/FoodSearchCriteria.swift
diff --git a/Sources/USDA/types/FoodUpdateLog.swift b/Sources/USDA_FDC/types/FoodUpdateLog.swift
similarity index 100%
rename from Sources/USDA/types/FoodUpdateLog.swift
rename to Sources/USDA_FDC/types/FoodUpdateLog.swift
diff --git a/Sources/USDA/types/FoodsCriteria.swift b/Sources/USDA_FDC/types/FoodsCriteria.swift
similarity index 100%
rename from Sources/USDA/types/FoodsCriteria.swift
rename to Sources/USDA_FDC/types/FoodsCriteria.swift
diff --git a/Sources/USDA/types/InputFoodFoundation.swift b/Sources/USDA_FDC/types/InputFoodFoundation.swift
similarity index 100%
rename from Sources/USDA/types/InputFoodFoundation.swift
rename to Sources/USDA_FDC/types/InputFoodFoundation.swift
diff --git a/Sources/USDA/types/InputFoodSurvey.swift b/Sources/USDA_FDC/types/InputFoodSurvey.swift
similarity index 100%
rename from Sources/USDA/types/InputFoodSurvey.swift
rename to Sources/USDA_FDC/types/InputFoodSurvey.swift
diff --git a/Sources/USDA/types/MeasureUnit.swift b/Sources/USDA_FDC/types/MeasureUnit.swift
similarity index 100%
rename from Sources/USDA/types/MeasureUnit.swift
rename to Sources/USDA_FDC/types/MeasureUnit.swift
diff --git a/Sources/USDA/types/Nutrient.swift b/Sources/USDA_FDC/types/Nutrient.swift
similarity index 100%
rename from Sources/USDA/types/Nutrient.swift
rename to Sources/USDA_FDC/types/Nutrient.swift
diff --git a/Sources/USDA/types/NutrientAcquisitionDetails.swift b/Sources/USDA_FDC/types/NutrientAcquisitionDetails.swift
similarity index 100%
rename from Sources/USDA/types/NutrientAcquisitionDetails.swift
rename to Sources/USDA_FDC/types/NutrientAcquisitionDetails.swift
diff --git a/Sources/USDA/types/NutrientAnalysisDetails.swift b/Sources/USDA_FDC/types/NutrientAnalysisDetails.swift
similarity index 100%
rename from Sources/USDA/types/NutrientAnalysisDetails.swift
rename to Sources/USDA_FDC/types/NutrientAnalysisDetails.swift
diff --git a/Sources/USDA/types/NutrientConversionFactors.swift b/Sources/USDA_FDC/types/NutrientConversionFactors.swift
similarity index 100%
rename from Sources/USDA/types/NutrientConversionFactors.swift
rename to Sources/USDA_FDC/types/NutrientConversionFactors.swift
diff --git a/Sources/USDA/types/RetentionFactor.swift b/Sources/USDA_FDC/types/RetentionFactor.swift
similarity index 100%
rename from Sources/USDA/types/RetentionFactor.swift
rename to Sources/USDA_FDC/types/RetentionFactor.swift
diff --git a/Sources/USDA/types/SampleFoodItem.swift b/Sources/USDA_FDC/types/SampleFoodItem.swift
similarity index 100%
rename from Sources/USDA/types/SampleFoodItem.swift
rename to Sources/USDA_FDC/types/SampleFoodItem.swift
diff --git a/Sources/USDA/types/SearchResult.swift b/Sources/USDA_FDC/types/SearchResult.swift
similarity index 100%
rename from Sources/USDA/types/SearchResult.swift
rename to Sources/USDA_FDC/types/SearchResult.swift
diff --git a/Sources/USDA/types/SearchResultFood.swift b/Sources/USDA_FDC/types/SearchResultFood.swift
similarity index 100%
rename from Sources/USDA/types/SearchResultFood.swift
rename to Sources/USDA_FDC/types/SearchResultFood.swift
diff --git a/Sources/USDA/types/SortBy.swift b/Sources/USDA_FDC/types/SortBy.swift
similarity index 100%
rename from Sources/USDA/types/SortBy.swift
rename to Sources/USDA_FDC/types/SortBy.swift
diff --git a/Sources/USDA/types/SortOrder.swift b/Sources/USDA_FDC/types/SortOrder.swift
similarity index 100%
rename from Sources/USDA/types/SortOrder.swift
rename to Sources/USDA_FDC/types/SortOrder.swift
diff --git a/Sources/USDA/types/SurveyFoodItem.swift b/Sources/USDA_FDC/types/SurveyFoodItem.swift
similarity index 100%
rename from Sources/USDA/types/SurveyFoodItem.swift
rename to Sources/USDA_FDC/types/SurveyFoodItem.swift
diff --git a/Sources/USDA/types/TradeChannel.swift b/Sources/USDA_FDC/types/TradeChannel.swift
similarity index 100%
rename from Sources/USDA/types/TradeChannel.swift
rename to Sources/USDA_FDC/types/TradeChannel.swift
diff --git a/Sources/USDA/types/WweiaFoodCategory.swift b/Sources/USDA_FDC/types/WweiaFoodCategory.swift
similarity index 100%
rename from Sources/USDA/types/WweiaFoodCategory.swift
rename to Sources/USDA_FDC/types/WweiaFoodCategory.swift