diff --git a/AuraTrader/MainForm.pas b/AuraTrader/MainForm.pas
index 2c45440..0f6102e 100644
--- a/AuraTrader/MainForm.pas
+++ b/AuraTrader/MainForm.pas
@@ -32,10 +32,10 @@ uses
     Myc.Futures,
     Myc.Trade.Types,
     Myc.Trade.DataStream,
-    Myc.DataFlow,
+    Myc.Data.Series,
+    Myc.Data.Pipeline,
     Myc.Signals,
     Myc.Mutable,
-    Myc.Trade.DataArray,
     Myc.Signals.FMX,
     Myc.TaskManager,
     Myc.Aura.Module,
@@ -51,7 +51,6 @@ uses
     DynamicFMXControl,
     Myc.FMX.Chart,
     Myc.Trade.Indicators,
-    Myc.DataRecord,
     StrategyTest;
 
 type
@@ -122,6 +121,7 @@ var
 implementation
 
 uses
+    Myc.Data.Records,
     TestModule;
 
 {$R *.fmx}
diff --git a/AuraTrader/StrategyTest.pas b/AuraTrader/StrategyTest.pas
index 673f55c..0d5a999 100644
--- a/AuraTrader/StrategyTest.pas
+++ b/AuraTrader/StrategyTest.pas
@@ -4,10 +4,8 @@ interface
 
 uses
     Myc.Signals,
+    Myc.Data.Pipeline,
     Myc.Trade.Types,
-    Myc.Trade.DataArray,
-    Myc.DataFlow,
-    Myc.DataRecord,
     Myc.Trade.Indicators;
 
 function CreateStrategy1(Timeframe: TTimeframe): TConverter<TDataPoint<TOhlcItem>, Double>; overload;
diff --git a/Src/Myc.DataFlow.Impl.pas b/Src/Myc.Data.Pipeline.Impl.pas
similarity index 96%
rename from Src/Myc.DataFlow.Impl.pas
rename to Src/Myc.Data.Pipeline.Impl.pas
index bdcacc2..0747a15 100644
--- a/Src/Myc.DataFlow.Impl.pas
+++ b/Src/Myc.Data.Pipeline.Impl.pas
@@ -1,4 +1,4 @@
-unit Myc.DataFlow.Impl;
+unit Myc.Data.Pipeline.Impl;
 
 interface
 
@@ -9,9 +9,9 @@ uses
     Myc.Signals,
     Myc.Mutable,
     Myc.Core.Notifier,
-    Myc.DataFlow,
+    Myc.Data.Pipeline,
     Myc.Trade.Types,
-    Myc.Trade.DataArray;
+    Myc.Data.Series;
 
 type
     // Abstract base class for data consumers.
diff --git a/Src/Myc.DataFlow.pas b/Src/Myc.Data.Pipeline.pas
similarity index 96%
rename from Src/Myc.DataFlow.pas
rename to Src/Myc.Data.Pipeline.pas
index 37dd162..160133e 100644
--- a/Src/Myc.DataFlow.pas
+++ b/Src/Myc.Data.Pipeline.pas
@@ -1,4 +1,4 @@
-unit Myc.DataFlow;
+unit Myc.Data.Pipeline;
 
 interface
 
@@ -6,8 +6,8 @@ uses
     Myc.Signals,
     Myc.Mutable,
     Myc.Trade.Types,
-    Myc.Trade.DataArray,
-    Myc.DataRecord;
+    Myc.Data.Series,
+    Myc.Data.Records;
 
 type
     TTag = Pointer;
@@ -151,7 +151,7 @@ type
 implementation
 
 uses
-    Myc.DataFlow.Impl;
+    Myc.Data.Pipeline.Impl;
 
 { TProducer<T> }
 
diff --git a/Src/Myc.DataRecord.pas b/Src/Myc.Data.Records.pas
similarity index 96%
rename from Src/Myc.DataRecord.pas
rename to Src/Myc.Data.Records.pas
index a1ea8d6..701c3c8 100644
--- a/Src/Myc.DataRecord.pas
+++ b/Src/Myc.Data.Records.pas
@@ -1,4 +1,4 @@
-unit Myc.DataRecord;
+unit Myc.Data.Records;
 
 interface
 
diff --git a/Src/Myc.Trade.DataArray.pas b/Src/Myc.Data.Series.pas
similarity index 96%
rename from Src/Myc.Trade.DataArray.pas
rename to Src/Myc.Data.Series.pas
index a3d618c..bfd0db1 100644
--- a/Src/Myc.Trade.DataArray.pas
+++ b/Src/Myc.Data.Series.pas
@@ -1,4 +1,4 @@
-unit Myc.Trade.DataArray;
+unit Myc.Data.Series;
 
 interface
 
diff --git a/Src/Myc.Fmx.Chart.Series.pas b/Src/Myc.Fmx.Chart.Series.pas
index 820a1ba..4834999 100644
--- a/Src/Myc.Fmx.Chart.Series.pas
+++ b/Src/Myc.Fmx.Chart.Series.pas
@@ -9,8 +9,8 @@ uses
     Myc.Signals,
     Myc.Mutable,
     Myc.Trade.Types,
-    Myc.Trade.DataArray,
-    Myc.DataFlow,
+    Myc.Data.Series,
+    Myc.Data.Pipeline,
     Myc.Fmx.Chart;
 
 type
diff --git a/Src/Myc.Fmx.Chart.pas b/Src/Myc.Fmx.Chart.pas
index 0444fa2..fa9f31a 100644
--- a/Src/Myc.Fmx.Chart.pas
+++ b/Src/Myc.Fmx.Chart.pas
@@ -18,7 +18,7 @@ uses
     Myc.Trade.Types,
     Myc.Signals,
     Myc.Mutable,
-    Myc.DataFlow;
+    Myc.Data.Pipeline;
 
 type
     TMycChart = class(TStyledControl)
diff --git a/Src/Myc.Trade.DataStream.pas b/Src/Myc.Trade.DataStream.pas
index 51473c2..c8f4594 100644
--- a/Src/Myc.Trade.DataStream.pas
+++ b/Src/Myc.Trade.DataStream.pas
@@ -12,7 +12,7 @@ uses
     Myc.Signals,
     Myc.Mutable,
     Myc.Trade.Types,
-    Myc.DataFlow,
+    Myc.Data.Pipeline,
     Myc.Core.FileCache;
 
 type
diff --git a/Src/Myc.Trade.Indicators.pas b/Src/Myc.Trade.Indicators.pas
index ff14828..04feb51 100644
--- a/Src/Myc.Trade.Indicators.pas
+++ b/Src/Myc.Trade.Indicators.pas
@@ -7,9 +7,9 @@ uses
     System.Math,
     System.Generics.Collections,
     System.Rtti,
-    Myc.DataRecord,
+    Myc.Data.Records,
     Myc.Trade.Types,
-    Myc.Trade.DataArray;
+    Myc.Data.Series;
 
 type
     // Result for the Moving Average Convergence Divergence (MACD) indicator.