diff --git a/crates/fidc-core/src/data.rs b/crates/fidc-core/src/data.rs
index 3c518d3..7bc2b27 100644
--- a/crates/fidc-core/src/data.rs
+++ b/crates/fidc-core/src/data.rs
@@ -1988,7 +1988,8 @@ impl DataSet {
         field: &str,
         lookback: usize,
     ) -> Option<f64> {
-        match field {
+        let field = normalize_field(field);
+        match field.as_str() {
             "close" | "prev_close" | "stock_close" | "price" => self
                 .market_series_by_symbol
                 .get(symbol)
@@ -2390,7 +2391,8 @@ fn industry_name_factor_aliases(source: &str, level: usize) -> Vec<String> {
 }
 
 fn factor_numeric_value(snapshot: &DailyFactorSnapshot, field: &str) -> Option<f64> {
-    match field {
+    let field = normalize_field(field);
+    match field.as_str() {
         "market_cap" | "market_cap_bn" => Some(snapshot.market_cap_bn),
         "free_float_cap" | "free_float_market_cap" | "free_float_cap_bn" => {
             Some(snapshot.free_float_cap_bn)