From 49b87efd78a63563d20330c43bd0140d292f9d1f Mon Sep 17 00:00:00 2001
From: Courtney Holcomb <courtneyeholcomb@gmail.com>
Date: Fri, 31 Jan 2025 16:53:52 -0800
Subject: [PATCH] Rename martian_day -> alien_day

---
 .../shared/project_configuration.yaml         |   2 +-
 .../simple_manifest/metrics.yaml              |  14 +-
 .../semantic_models/user_sm_source.yaml       |   6 +-
 .../model/semantics/test_metric_lookup.py     |   4 +-
 ...lable_group_by_items__no_metrics__set0.txt |   2 +-
 ...linkable_element_set_as_spec_set__set0.txt |  22 +-
 .../str/test_all_properties__result0.txt      |  44 +--
 ...le_element_set_from_join_path__result0.txt |   4 +-
 ..._set_from_join_path_multi_hop__result0.txt |   4 +-
 .../test_cyclic_join_manifest__result0.txt    |   6 +-
 ...roperty_for_cumulative_metric__result0.txt |   2 +-
 ..._property_for_derived_metrics__result0.txt |   4 +-
 .../dict/test_measure_properties__obj_0.txt   |   4 +-
 ...linkable_elements_for_measure__result0.txt |  22 +-
 ...s_for_measure_multi_hop_model__result0.txt |   4 +-
 .../to_sql_plan/dataflow_to_subquery.py       |  38 +--
 .../time_spine_table/mf_time_spine.yaml       |   2 +-
 .../query_output/test_fill_nulls_with_0.py    |  12 +-
 .../query_output/test_offset_metrics.py       |  22 +-
 .../query_output/test_query_output.py         |   6 +-
 .../test_cases/itest_granularity.yaml         | 284 +++++++++---------
 .../test_dataflow_to_sql_plan.py              |   8 +-
 .../test_custom_granularity.py                |  56 ++--
 ...timespine_and_fill_nulls_with_0__plan0.sql |   8 +-
 ...timespine_and_fill_nulls_with_0__plan0.sql |   8 +-
 ...timespine_and_fill_nulls_with_0__plan0.sql |   8 +-
 ...timespine_and_fill_nulls_with_0__plan0.sql |   8 +-
 ...timespine_and_fill_nulls_with_0__plan0.sql |   8 +-
 ...timespine_and_fill_nulls_with_0__plan0.sql |   8 +-
 ...timespine_and_fill_nulls_with_0__plan0.sql |   8 +-
 ...timespine_and_fill_nulls_with_0__plan0.xml |   8 +-
 ..._metric_with_non_default_grains__plan0.sql |   4 +-
 ..._metric_with_non_default_grains__plan0.sql |   4 +-
 ..._metric_with_non_default_grains__plan0.sql |   4 +-
 ..._metric_with_non_default_grains__plan0.sql |   4 +-
 ..._metric_with_non_default_grains__plan0.sql |   4 +-
 ..._metric_with_non_default_grains__plan0.sql |   4 +-
 ..._metric_with_non_default_grains__plan0.sql |   4 +-
 ..._metric_with_custom_granularity__plan0.sql |  38 +--
 ...th_custom_granularity__plan0_optimized.sql |  28 +-
 ..._with_custom_granularity_filter__plan0.sql |  46 +--
 ...om_granularity_filter__plan0_optimized.sql |  36 +--
 ...nularity_filter_not_in_group_by__plan0.sql |  22 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |  16 +-
 ..._metric_with_custom_granularity__plan0.sql |  20 +-
 ...th_custom_granularity__plan0_optimized.sql |  14 +-
 .../test_custom_offset_window__plan0.sql      |  24 +-
 ..._custom_offset_window__plan0_optimized.sql |  22 +-
 ..._with_granularity_and_date_part__plan0.sql |  38 +--
 ...ularity_and_date_part__plan0_optimized.sql |  30 +-
 ...indow_with_multiple_time_spines__plan0.sql |  24 +-
 ..._multiple_time_spines__plan0_optimized.sql |  22 +-
 ...t_window_with_only_window_grain__plan0.sql |  50 +--
 ...ith_only_window_grain__plan0_optimized.sql |  30 +-
 ..._metric_with_custom_granularity__plan0.sql |  32 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ..._metric_grouped_by_custom_grain__plan0.sql |  26 +-
 ...ouped_by_custom_grain__plan0_optimized.sql |  16 +-
 ..._with_custom_granularity_filter__plan0.sql |  34 +--
 ...om_granularity_filter__plan0_optimized.sql |  24 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  14 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   8 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  12 +-
 ..._to_non_default_grain__plan0_optimized.sql |   6 +-
 ...metrics_with_custom_granularity__plan0.sql |  30 +-
 ...th_custom_granularity__plan0_optimized.sql |  18 +-
 ..._in_query_for_cumulative_metric__plan0.sql |  12 +-
 ...for_cumulative_metric__plan0_optimized.sql |   6 +-
 ...y_for_join_to_time_spine_metric__plan0.sql |  20 +-
 ..._to_time_spine_metric__plan0_optimized.sql |  12 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  20 +-
 ..._to_non_default_grain__plan0_optimized.sql |  10 +-
 ..._custom_granularity_metric_time__plan0.sql |  14 +-
 ...anularity_metric_time__plan0_optimized.sql |   6 +-
 ...tom_granularity_non_metric_time__plan0.sql |   8 +-
 ...arity_non_metric_time__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  12 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ..._metric_with_custom_granularity__plan0.sql |  18 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  10 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   4 +-
 ..._metric_with_custom_granularity__plan0.sql |  12 +-
 ...th_custom_granularity__plan0_optimized.sql |   6 +-
 ...ith_custom_granularity_and_join__plan0.sql |  12 +-
 ..._granularity_and_join__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  16 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ...th_multi_hop_custom_granularity__plan0.sql |  12 +-
 ...op_custom_granularity__plan0_optimized.sql |   6 +-
 ..._metric_with_custom_granularity__plan0.sql |  38 +--
 ...th_custom_granularity__plan0_optimized.sql |  28 +-
 ..._with_custom_granularity_filter__plan0.sql |  46 +--
 ...om_granularity_filter__plan0_optimized.sql |  36 +--
 ...nularity_filter_not_in_group_by__plan0.sql |  22 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |  16 +-
 ..._metric_with_custom_granularity__plan0.sql |  20 +-
 ...th_custom_granularity__plan0_optimized.sql |  14 +-
 .../test_custom_offset_window__plan0.sql      |  24 +-
 ..._custom_offset_window__plan0_optimized.sql |  22 +-
 ..._with_granularity_and_date_part__plan0.sql |  38 +--
 ...ularity_and_date_part__plan0_optimized.sql |  30 +-
 ...indow_with_multiple_time_spines__plan0.sql |  24 +-
 ..._multiple_time_spines__plan0_optimized.sql |  22 +-
 ...t_window_with_only_window_grain__plan0.sql |  50 +--
 ...ith_only_window_grain__plan0_optimized.sql |  30 +-
 ..._metric_with_custom_granularity__plan0.sql |  32 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ..._metric_grouped_by_custom_grain__plan0.sql |  26 +-
 ...ouped_by_custom_grain__plan0_optimized.sql |  16 +-
 ..._with_custom_granularity_filter__plan0.sql |  34 +--
 ...om_granularity_filter__plan0_optimized.sql |  24 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  14 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   8 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  12 +-
 ..._to_non_default_grain__plan0_optimized.sql |   6 +-
 ...metrics_with_custom_granularity__plan0.sql |  30 +-
 ...th_custom_granularity__plan0_optimized.sql |  18 +-
 ..._in_query_for_cumulative_metric__plan0.sql |  12 +-
 ...for_cumulative_metric__plan0_optimized.sql |   6 +-
 ...y_for_join_to_time_spine_metric__plan0.sql |  20 +-
 ..._to_time_spine_metric__plan0_optimized.sql |  12 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  20 +-
 ..._to_non_default_grain__plan0_optimized.sql |  10 +-
 ..._custom_granularity_metric_time__plan0.sql |  14 +-
 ...anularity_metric_time__plan0_optimized.sql |   6 +-
 ...tom_granularity_non_metric_time__plan0.sql |   8 +-
 ...arity_non_metric_time__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  12 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ..._metric_with_custom_granularity__plan0.sql |  18 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  10 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   4 +-
 ..._metric_with_custom_granularity__plan0.sql |  12 +-
 ...th_custom_granularity__plan0_optimized.sql |   6 +-
 ...ith_custom_granularity_and_join__plan0.sql |  12 +-
 ..._granularity_and_join__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  16 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ...th_multi_hop_custom_granularity__plan0.sql |  12 +-
 ...op_custom_granularity__plan0_optimized.sql |   6 +-
 ..._metric_with_custom_granularity__plan0.sql |  38 +--
 ...th_custom_granularity__plan0_optimized.sql |  28 +-
 ..._with_custom_granularity_filter__plan0.sql |  46 +--
 ...om_granularity_filter__plan0_optimized.sql |  36 +--
 ...nularity_filter_not_in_group_by__plan0.sql |  22 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |  16 +-
 ..._metric_with_custom_granularity__plan0.sql |  20 +-
 ...th_custom_granularity__plan0_optimized.sql |  14 +-
 .../test_custom_offset_window__plan0.sql      |  24 +-
 ..._custom_offset_window__plan0_optimized.sql |  22 +-
 ..._with_granularity_and_date_part__plan0.sql |  38 +--
 ...ularity_and_date_part__plan0_optimized.sql |  30 +-
 ...indow_with_multiple_time_spines__plan0.sql |  24 +-
 ..._multiple_time_spines__plan0_optimized.sql |  22 +-
 ...t_window_with_only_window_grain__plan0.sql |  50 +--
 ...ith_only_window_grain__plan0_optimized.sql |  30 +-
 ..._metric_with_custom_granularity__plan0.sql |  32 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ..._metric_grouped_by_custom_grain__plan0.sql |  26 +-
 ...ouped_by_custom_grain__plan0_optimized.sql |  16 +-
 ..._with_custom_granularity_filter__plan0.sql |  34 +--
 ...om_granularity_filter__plan0_optimized.sql |  24 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  14 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   8 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  12 +-
 ..._to_non_default_grain__plan0_optimized.sql |   6 +-
 ...metrics_with_custom_granularity__plan0.sql |  30 +-
 ...th_custom_granularity__plan0_optimized.sql |  18 +-
 ..._in_query_for_cumulative_metric__plan0.sql |  12 +-
 ...for_cumulative_metric__plan0_optimized.sql |   6 +-
 ...y_for_join_to_time_spine_metric__plan0.sql |  20 +-
 ..._to_time_spine_metric__plan0_optimized.sql |  12 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  20 +-
 ..._to_non_default_grain__plan0_optimized.sql |  10 +-
 ..._custom_granularity_metric_time__plan0.sql |  14 +-
 ...anularity_metric_time__plan0_optimized.sql |   6 +-
 ...tom_granularity_non_metric_time__plan0.sql |   8 +-
 ...arity_non_metric_time__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  12 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ..._metric_with_custom_granularity__plan0.sql |  18 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  10 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   4 +-
 ..._metric_with_custom_granularity__plan0.sql |  12 +-
 ...th_custom_granularity__plan0_optimized.sql |   6 +-
 ...ith_custom_granularity_and_join__plan0.sql |  12 +-
 ..._granularity_and_join__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  16 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ...th_multi_hop_custom_granularity__plan0.sql |  12 +-
 ...op_custom_granularity__plan0_optimized.sql |   6 +-
 ..._metric_with_custom_granularity__plan0.sql |  38 +--
 ...th_custom_granularity__plan0_optimized.sql |  28 +-
 ..._with_custom_granularity_filter__plan0.sql |  46 +--
 ...om_granularity_filter__plan0_optimized.sql |  36 +--
 ...nularity_filter_not_in_group_by__plan0.sql |  22 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |  16 +-
 ..._metric_with_custom_granularity__plan0.sql |  20 +-
 ...th_custom_granularity__plan0_optimized.sql |  14 +-
 .../test_custom_offset_window__plan0.sql      |  24 +-
 ..._custom_offset_window__plan0_optimized.sql |  22 +-
 ..._with_granularity_and_date_part__plan0.sql |  38 +--
 ...ularity_and_date_part__plan0_optimized.sql |  30 +-
 ...indow_with_multiple_time_spines__plan0.sql |  24 +-
 ..._multiple_time_spines__plan0_optimized.sql |  22 +-
 ...t_window_with_only_window_grain__plan0.sql |  50 +--
 ...ith_only_window_grain__plan0_optimized.sql |  30 +-
 ..._metric_with_custom_granularity__plan0.sql |  32 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ..._metric_grouped_by_custom_grain__plan0.sql |  26 +-
 ...ouped_by_custom_grain__plan0_optimized.sql |  16 +-
 ..._with_custom_granularity_filter__plan0.sql |  34 +--
 ...om_granularity_filter__plan0_optimized.sql |  24 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  14 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   8 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  12 +-
 ..._to_non_default_grain__plan0_optimized.sql |   6 +-
 ...metrics_with_custom_granularity__plan0.sql |  30 +-
 ...th_custom_granularity__plan0_optimized.sql |  18 +-
 ..._in_query_for_cumulative_metric__plan0.sql |  12 +-
 ...for_cumulative_metric__plan0_optimized.sql |   6 +-
 ...y_for_join_to_time_spine_metric__plan0.sql |  20 +-
 ..._to_time_spine_metric__plan0_optimized.sql |  12 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  20 +-
 ..._to_non_default_grain__plan0_optimized.sql |  10 +-
 ..._custom_granularity_metric_time__plan0.sql |  14 +-
 ...anularity_metric_time__plan0_optimized.sql |   6 +-
 ...tom_granularity_non_metric_time__plan0.sql |   8 +-
 ...arity_non_metric_time__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  12 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ..._metric_with_custom_granularity__plan0.sql |  18 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  10 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   4 +-
 ..._metric_with_custom_granularity__plan0.sql |  12 +-
 ...th_custom_granularity__plan0_optimized.sql |   6 +-
 ...ith_custom_granularity_and_join__plan0.sql |  12 +-
 ..._granularity_and_join__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  16 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ...th_multi_hop_custom_granularity__plan0.sql |  12 +-
 ...op_custom_granularity__plan0_optimized.sql |   6 +-
 ..._metric_with_custom_granularity__plan0.sql |  38 +--
 ...th_custom_granularity__plan0_optimized.sql |  28 +-
 ..._with_custom_granularity_filter__plan0.sql |  46 +--
 ...om_granularity_filter__plan0_optimized.sql |  36 +--
 ...nularity_filter_not_in_group_by__plan0.sql |  22 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |  16 +-
 ..._metric_with_custom_granularity__plan0.sql |  20 +-
 ...th_custom_granularity__plan0_optimized.sql |  14 +-
 .../test_custom_offset_window__plan0.sql      |  24 +-
 ..._custom_offset_window__plan0_optimized.sql |  22 +-
 ..._with_granularity_and_date_part__plan0.sql |  38 +--
 ...ularity_and_date_part__plan0_optimized.sql |  30 +-
 ...indow_with_multiple_time_spines__plan0.sql |  24 +-
 ..._multiple_time_spines__plan0_optimized.sql |  22 +-
 ...t_window_with_only_window_grain__plan0.sql |  50 +--
 ...ith_only_window_grain__plan0_optimized.sql |  30 +-
 ..._metric_with_custom_granularity__plan0.sql |  32 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ..._metric_grouped_by_custom_grain__plan0.sql |  26 +-
 ...ouped_by_custom_grain__plan0_optimized.sql |  16 +-
 ..._with_custom_granularity_filter__plan0.sql |  34 +--
 ...om_granularity_filter__plan0_optimized.sql |  24 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  14 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   8 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  12 +-
 ..._to_non_default_grain__plan0_optimized.sql |   6 +-
 ...metrics_with_custom_granularity__plan0.sql |  30 +-
 ...th_custom_granularity__plan0_optimized.sql |  18 +-
 ..._in_query_for_cumulative_metric__plan0.sql |  12 +-
 ...for_cumulative_metric__plan0_optimized.sql |   6 +-
 ...y_for_join_to_time_spine_metric__plan0.sql |  20 +-
 ..._to_time_spine_metric__plan0_optimized.sql |  12 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  20 +-
 ..._to_non_default_grain__plan0_optimized.sql |  10 +-
 ..._custom_granularity_metric_time__plan0.sql |  14 +-
 ...anularity_metric_time__plan0_optimized.sql |   6 +-
 ...tom_granularity_non_metric_time__plan0.sql |   8 +-
 ...arity_non_metric_time__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  12 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ..._metric_with_custom_granularity__plan0.sql |  18 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  10 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   4 +-
 ..._metric_with_custom_granularity__plan0.sql |  12 +-
 ...th_custom_granularity__plan0_optimized.sql |   6 +-
 ...ith_custom_granularity_and_join__plan0.sql |  12 +-
 ..._granularity_and_join__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  16 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ...th_multi_hop_custom_granularity__plan0.sql |  12 +-
 ...op_custom_granularity__plan0_optimized.sql |   6 +-
 ..._metric_with_custom_granularity__plan0.sql |  38 +--
 ...th_custom_granularity__plan0_optimized.sql |  28 +-
 ..._with_custom_granularity_filter__plan0.sql |  46 +--
 ...om_granularity_filter__plan0_optimized.sql |  36 +--
 ...nularity_filter_not_in_group_by__plan0.sql |  22 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |  16 +-
 ..._metric_with_custom_granularity__plan0.sql |  20 +-
 ...th_custom_granularity__plan0_optimized.sql |  14 +-
 .../test_custom_offset_window__plan0.sql      |  24 +-
 ..._custom_offset_window__plan0_optimized.sql |  22 +-
 ..._with_granularity_and_date_part__plan0.sql |  38 +--
 ...ularity_and_date_part__plan0_optimized.sql |  30 +-
 ...indow_with_multiple_time_spines__plan0.sql |  24 +-
 ..._multiple_time_spines__plan0_optimized.sql |  22 +-
 ...t_window_with_only_window_grain__plan0.sql |  50 +--
 ...ith_only_window_grain__plan0_optimized.sql |  30 +-
 ..._metric_with_custom_granularity__plan0.sql |  32 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ..._metric_grouped_by_custom_grain__plan0.sql |  26 +-
 ...ouped_by_custom_grain__plan0_optimized.sql |  16 +-
 ..._with_custom_granularity_filter__plan0.sql |  34 +--
 ...om_granularity_filter__plan0_optimized.sql |  24 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  14 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   8 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  12 +-
 ..._to_non_default_grain__plan0_optimized.sql |   6 +-
 ...metrics_with_custom_granularity__plan0.sql |  30 +-
 ...th_custom_granularity__plan0_optimized.sql |  18 +-
 ..._in_query_for_cumulative_metric__plan0.sql |  12 +-
 ...for_cumulative_metric__plan0_optimized.sql |   6 +-
 ...y_for_join_to_time_spine_metric__plan0.sql |  20 +-
 ..._to_time_spine_metric__plan0_optimized.sql |  12 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  20 +-
 ..._to_non_default_grain__plan0_optimized.sql |  10 +-
 ..._custom_granularity_metric_time__plan0.sql |  14 +-
 ...anularity_metric_time__plan0_optimized.sql |   6 +-
 ...tom_granularity_non_metric_time__plan0.sql |   8 +-
 ...arity_non_metric_time__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  12 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ..._metric_with_custom_granularity__plan0.sql |  18 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  10 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   4 +-
 ..._metric_with_custom_granularity__plan0.sql |  12 +-
 ...th_custom_granularity__plan0_optimized.sql |   6 +-
 ...ith_custom_granularity_and_join__plan0.sql |  12 +-
 ..._granularity_and_join__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  16 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ...th_multi_hop_custom_granularity__plan0.sql |  12 +-
 ...op_custom_granularity__plan0_optimized.sql |   6 +-
 ..._metric_with_custom_granularity__plan0.sql |  38 +--
 ...th_custom_granularity__plan0_optimized.sql |  28 +-
 ..._with_custom_granularity_filter__plan0.sql |  46 +--
 ...om_granularity_filter__plan0_optimized.sql |  36 +--
 ...nularity_filter_not_in_group_by__plan0.sql |  22 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |  16 +-
 ..._metric_with_custom_granularity__plan0.sql |  20 +-
 ...th_custom_granularity__plan0_optimized.sql |  14 +-
 .../test_custom_offset_window__plan0.sql      |  24 +-
 ..._custom_offset_window__plan0_optimized.sql |  22 +-
 ..._with_granularity_and_date_part__plan0.sql |  38 +--
 ...ularity_and_date_part__plan0_optimized.sql |  30 +-
 ...indow_with_multiple_time_spines__plan0.sql |  24 +-
 ..._multiple_time_spines__plan0_optimized.sql |  22 +-
 ...t_window_with_only_window_grain__plan0.sql |  50 +--
 ...ith_only_window_grain__plan0_optimized.sql |  30 +-
 ..._metric_with_custom_granularity__plan0.sql |  32 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ..._metric_grouped_by_custom_grain__plan0.sql |  26 +-
 ...ouped_by_custom_grain__plan0_optimized.sql |  16 +-
 ..._with_custom_granularity_filter__plan0.sql |  34 +--
 ...om_granularity_filter__plan0_optimized.sql |  24 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  14 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   8 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  12 +-
 ..._to_non_default_grain__plan0_optimized.sql |   6 +-
 ...metrics_with_custom_granularity__plan0.sql |  30 +-
 ...th_custom_granularity__plan0_optimized.sql |  18 +-
 ..._in_query_for_cumulative_metric__plan0.sql |  12 +-
 ...for_cumulative_metric__plan0_optimized.sql |   6 +-
 ...y_for_join_to_time_spine_metric__plan0.sql |  20 +-
 ..._to_time_spine_metric__plan0_optimized.sql |  12 +-
 ...ity_joined_to_non_default_grain__plan0.sql |  20 +-
 ..._to_non_default_grain__plan0_optimized.sql |  10 +-
 ..._custom_granularity_metric_time__plan0.sql |  14 +-
 ...anularity_metric_time__plan0_optimized.sql |   6 +-
 ...tom_granularity_non_metric_time__plan0.sql |   8 +-
 ...arity_non_metric_time__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  12 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ..._metric_with_custom_granularity__plan0.sql |  18 +-
 ...th_custom_granularity__plan0_optimized.sql |   8 +-
 ...nularity_filter_not_in_group_by__plan0.sql |  10 +-
 ...ilter_not_in_group_by__plan0_optimized.sql |   4 +-
 ..._metric_with_custom_granularity__plan0.sql |  12 +-
 ...th_custom_granularity__plan0_optimized.sql |   6 +-
 ...ith_custom_granularity_and_join__plan0.sql |  12 +-
 ..._granularity_and_join__plan0_optimized.sql |   6 +-
 ..._with_custom_granularity_filter__plan0.sql |   6 +-
 ...om_granularity_filter__plan0_optimized.sql |   4 +-
 ...nularity_in_filter_and_group_by__plan0.sql |  16 +-
 ...n_filter_and_group_by__plan0_optimized.sql |  10 +-
 ...th_multi_hop_custom_granularity__plan0.sql |  12 +-
 ...op_custom_granularity__plan0_optimized.sql |   6 +-
 ...fset_by_custom_granularity_node__plan0.sql |  22 +-
 ...stom_granularity_node__plan0_optimized.sql |  20 +-
 ...ularity_node_with_smaller_grain__plan0.sql |  22 +-
 ...de_with_smaller_grain__plan0_optimized.sql |  20 +-
 ..._offset_custom_granularity_node__plan0.sql |  12 +-
 ...stom_granularity_node__plan0_optimized.sql |  12 +-
 ...fset_by_custom_granularity_node__plan0.xml |  10 +-
 ...ularity_node_with_smaller_grain__plan0.xml |  10 +-
 ..._offset_custom_granularity_node__plan0.xml |  10 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...nth_dimension_and_offset_window__plan0.sql |   4 +-
 ...ved_metric_with_offset_to_grain__plan0.sql |   4 +-
 ...offset_to_grain_and_granularity__plan0.sql |   4 +-
 ...rived_metric_with_offset_window__plan0.sql |   4 +-
 ...h_offset_window_and_granularity__plan0.sql |   4 +-
 ...fset_window_and_offset_to_grain__plan0.sql |   8 +-
 ...offset_to_grain_and_granularity__plan0.sql |   8 +-
 ...h_offset_window_and_time_filter__plan0.sql |   4 +-
 ...erived_offset_cumulative_metric__plan0.sql |   4 +-
 ...offset_metric_with_agg_time_dim__plan0.sql |   4 +-
 ...et_metric_with_one_input_metric__plan0.sql |   4 +-
 ...d_where_constraint_not_selected__plan0.sql |   8 +-
 ...h_offset_multiple_input_metrics__plan0.sql |   4 +-
 .../BigQuery/test_nested_offsets__plan0.sql   |   8 +-
 ...ed_offsets_with_time_constraint__plan0.sql |   8 +-
 ...d_offsets_with_where_constraint__plan0.sql |   8 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...n_metric_multiple_granularities__plan0.sql |   4 +-
 ...fset_to_grain_with_agg_time_dim__plan0.sql |   4 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...w_metric_multiple_granularities__plan0.sql |   4 +-
 ...offset_window_with_agg_time_dim__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...nth_dimension_and_offset_window__plan0.sql |   4 +-
 ...ved_metric_with_offset_to_grain__plan0.sql |   4 +-
 ...offset_to_grain_and_granularity__plan0.sql |   4 +-
 ...rived_metric_with_offset_window__plan0.sql |   4 +-
 ...h_offset_window_and_granularity__plan0.sql |   4 +-
 ...fset_window_and_offset_to_grain__plan0.sql |   8 +-
 ...offset_to_grain_and_granularity__plan0.sql |   8 +-
 ...h_offset_window_and_time_filter__plan0.sql |   4 +-
 ...erived_offset_cumulative_metric__plan0.sql |   4 +-
 ...offset_metric_with_agg_time_dim__plan0.sql |   4 +-
 ...et_metric_with_one_input_metric__plan0.sql |   4 +-
 ...d_where_constraint_not_selected__plan0.sql |   8 +-
 ...h_offset_multiple_input_metrics__plan0.sql |   4 +-
 .../Databricks/test_nested_offsets__plan0.sql |   8 +-
 ...ed_offsets_with_time_constraint__plan0.sql |   8 +-
 ...d_offsets_with_where_constraint__plan0.sql |   8 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...n_metric_multiple_granularities__plan0.sql |   4 +-
 ...fset_to_grain_with_agg_time_dim__plan0.sql |   4 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...w_metric_multiple_granularities__plan0.sql |   4 +-
 ...offset_window_with_agg_time_dim__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...nth_dimension_and_offset_window__plan0.sql |   4 +-
 ...ved_metric_with_offset_to_grain__plan0.sql |   4 +-
 ...offset_to_grain_and_granularity__plan0.sql |   4 +-
 ...rived_metric_with_offset_window__plan0.sql |   4 +-
 ...h_offset_window_and_granularity__plan0.sql |   4 +-
 ...fset_window_and_offset_to_grain__plan0.sql |   8 +-
 ...offset_to_grain_and_granularity__plan0.sql |   8 +-
 ...h_offset_window_and_time_filter__plan0.sql |   4 +-
 ...erived_offset_cumulative_metric__plan0.sql |   4 +-
 ...offset_metric_with_agg_time_dim__plan0.sql |   4 +-
 ...et_metric_with_one_input_metric__plan0.sql |   4 +-
 ...d_where_constraint_not_selected__plan0.sql |   8 +-
 ...h_offset_multiple_input_metrics__plan0.sql |   4 +-
 .../DuckDB/test_nested_offsets__plan0.sql     |   8 +-
 ...ed_offsets_with_time_constraint__plan0.sql |   8 +-
 ...d_offsets_with_where_constraint__plan0.sql |   8 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...n_metric_multiple_granularities__plan0.sql |   4 +-
 ...fset_to_grain_with_agg_time_dim__plan0.sql |   4 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...w_metric_multiple_granularities__plan0.sql |   4 +-
 ...offset_window_with_agg_time_dim__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...nth_dimension_and_offset_window__plan0.sql |   4 +-
 ...ved_metric_with_offset_to_grain__plan0.sql |   4 +-
 ...offset_to_grain_and_granularity__plan0.sql |   4 +-
 ...rived_metric_with_offset_window__plan0.sql |   4 +-
 ...h_offset_window_and_granularity__plan0.sql |   4 +-
 ...fset_window_and_offset_to_grain__plan0.sql |   8 +-
 ...offset_to_grain_and_granularity__plan0.sql |   8 +-
 ...h_offset_window_and_time_filter__plan0.sql |   4 +-
 ...erived_offset_cumulative_metric__plan0.sql |   4 +-
 ...offset_metric_with_agg_time_dim__plan0.sql |   4 +-
 ...et_metric_with_one_input_metric__plan0.sql |   4 +-
 ...d_where_constraint_not_selected__plan0.sql |   8 +-
 ...h_offset_multiple_input_metrics__plan0.sql |   4 +-
 .../Postgres/test_nested_offsets__plan0.sql   |   8 +-
 ...ed_offsets_with_time_constraint__plan0.sql |   8 +-
 ...d_offsets_with_where_constraint__plan0.sql |   8 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...n_metric_multiple_granularities__plan0.sql |   4 +-
 ...fset_to_grain_with_agg_time_dim__plan0.sql |   4 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...w_metric_multiple_granularities__plan0.sql |   4 +-
 ...offset_window_with_agg_time_dim__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...nth_dimension_and_offset_window__plan0.sql |   4 +-
 ...ved_metric_with_offset_to_grain__plan0.sql |   4 +-
 ...offset_to_grain_and_granularity__plan0.sql |   4 +-
 ...rived_metric_with_offset_window__plan0.sql |   4 +-
 ...h_offset_window_and_granularity__plan0.sql |   4 +-
 ...fset_window_and_offset_to_grain__plan0.sql |   8 +-
 ...offset_to_grain_and_granularity__plan0.sql |   8 +-
 ...h_offset_window_and_time_filter__plan0.sql |   4 +-
 ...erived_offset_cumulative_metric__plan0.sql |   4 +-
 ...offset_metric_with_agg_time_dim__plan0.sql |   4 +-
 ...et_metric_with_one_input_metric__plan0.sql |   4 +-
 ...d_where_constraint_not_selected__plan0.sql |   8 +-
 ...h_offset_multiple_input_metrics__plan0.sql |   4 +-
 .../Redshift/test_nested_offsets__plan0.sql   |   8 +-
 ...ed_offsets_with_time_constraint__plan0.sql |   8 +-
 ...d_offsets_with_where_constraint__plan0.sql |   8 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...n_metric_multiple_granularities__plan0.sql |   4 +-
 ...fset_to_grain_with_agg_time_dim__plan0.sql |   4 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...w_metric_multiple_granularities__plan0.sql |   4 +-
 ...offset_window_with_agg_time_dim__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...nth_dimension_and_offset_window__plan0.sql |   4 +-
 ...ved_metric_with_offset_to_grain__plan0.sql |   4 +-
 ...offset_to_grain_and_granularity__plan0.sql |   4 +-
 ...rived_metric_with_offset_window__plan0.sql |   4 +-
 ...h_offset_window_and_granularity__plan0.sql |   4 +-
 ...fset_window_and_offset_to_grain__plan0.sql |   8 +-
 ...offset_to_grain_and_granularity__plan0.sql |   8 +-
 ...h_offset_window_and_time_filter__plan0.sql |   4 +-
 ...erived_offset_cumulative_metric__plan0.sql |   4 +-
 ...offset_metric_with_agg_time_dim__plan0.sql |   4 +-
 ...et_metric_with_one_input_metric__plan0.sql |   4 +-
 ...d_where_constraint_not_selected__plan0.sql |   8 +-
 ...h_offset_multiple_input_metrics__plan0.sql |   4 +-
 .../Snowflake/test_nested_offsets__plan0.sql  |   8 +-
 ...ed_offsets_with_time_constraint__plan0.sql |   8 +-
 ...d_offsets_with_where_constraint__plan0.sql |   8 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...n_metric_multiple_granularities__plan0.sql |   4 +-
 ...fset_to_grain_with_agg_time_dim__plan0.sql |   4 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...w_metric_multiple_granularities__plan0.sql |   4 +-
 ...offset_window_with_agg_time_dim__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...nth_dimension_and_offset_window__plan0.sql |   4 +-
 ...ved_metric_with_offset_to_grain__plan0.sql |   4 +-
 ...offset_to_grain_and_granularity__plan0.sql |   4 +-
 ...rived_metric_with_offset_window__plan0.sql |   4 +-
 ...h_offset_window_and_granularity__plan0.sql |   4 +-
 ...fset_window_and_offset_to_grain__plan0.sql |   8 +-
 ...offset_to_grain_and_granularity__plan0.sql |   8 +-
 ...h_offset_window_and_time_filter__plan0.sql |   4 +-
 ...erived_offset_cumulative_metric__plan0.sql |   4 +-
 ...offset_metric_with_agg_time_dim__plan0.sql |   4 +-
 ...et_metric_with_one_input_metric__plan0.sql |   4 +-
 ...d_where_constraint_not_selected__plan0.sql |   8 +-
 ...h_offset_multiple_input_metrics__plan0.sql |   4 +-
 .../Trino/test_nested_offsets__plan0.sql      |   8 +-
 ...ed_offsets_with_time_constraint__plan0.sql |   8 +-
 ...d_offsets_with_where_constraint__plan0.sql |   8 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...n_metric_multiple_granularities__plan0.sql |   4 +-
 ...fset_to_grain_with_agg_time_dim__plan0.sql |   4 +-
 ...ry_have_different_granularities__plan0.sql |   4 +-
 ...w_metric_multiple_granularities__plan0.sql |   4 +-
 ...offset_window_with_agg_time_dim__plan0.sql |   4 +-
 ...set_metric_with_time_constraint__plan0.sql |   4 +-
 ...custom_grain_in_group_by__query_output.txt |   2 +-
 ...ustom_granularity_filter__query_output.txt |   2 +-
 ...custom_grain_in_group_by__query_output.txt |   2 +-
 ...ustom_granularity_filter__query_output.txt |   2 +-
 ...custom_grain_in_group_by__query_output.txt |   2 +-
 ...ustom_granularity_filter__query_output.txt |   2 +-
 ...custom_grain_in_group_by__query_output.txt |   2 +-
 ...ustom_granularity_filter__query_output.txt |   2 +-
 ...custom_grain_in_group_by__query_output.txt |   2 +-
 ...ustom_granularity_filter__query_output.txt |   2 +-
 ...custom_grain_in_group_by__query_output.txt |   2 +-
 .../test_cumulative_fill_nulls__plan0.sql     |   4 +-
 ...fill_nulls_for_one_input_metric__plan0.sql |   8 +-
 ...ine_with_filter_not_in_group_by__plan0.sql |   6 +-
 ..._not_in_group_by_using_agg_time__plan0.sql |   6 +-
 ..._using_agg_time_and_metric_time__plan0.sql |   6 +-
 ...join_to_time_spine_with_filters__plan0.sql |   8 +-
 ...e_fill_nulls_with_0_metric_time__plan0.sql |   4 +-
 ..._simple_fill_nulls_with_0_month__plan0.sql |   4 +-
 .../test_cumulative_fill_nulls__plan0.sql     |   4 +-
 ...fill_nulls_for_one_input_metric__plan0.sql |   8 +-
 ...ine_with_filter_not_in_group_by__plan0.sql |   6 +-
 ..._not_in_group_by_using_agg_time__plan0.sql |   6 +-
 ..._using_agg_time_and_metric_time__plan0.sql |   6 +-
 ...join_to_time_spine_with_filters__plan0.sql |   8 +-
 ...e_fill_nulls_with_0_metric_time__plan0.sql |   4 +-
 ..._simple_fill_nulls_with_0_month__plan0.sql |   4 +-
 .../test_cumulative_fill_nulls__plan0.sql     |   4 +-
 ...fill_nulls_for_one_input_metric__plan0.sql |   8 +-
 ...ine_with_filter_not_in_group_by__plan0.sql |   6 +-
 ..._not_in_group_by_using_agg_time__plan0.sql |   6 +-
 ..._using_agg_time_and_metric_time__plan0.sql |   6 +-
 ...join_to_time_spine_with_filters__plan0.sql |   8 +-
 ...e_fill_nulls_with_0_metric_time__plan0.sql |   4 +-
 ..._simple_fill_nulls_with_0_month__plan0.sql |   4 +-
 .../test_cumulative_fill_nulls__plan0.sql     |   4 +-
 ...fill_nulls_for_one_input_metric__plan0.sql |   8 +-
 ...ine_with_filter_not_in_group_by__plan0.sql |   6 +-
 ..._not_in_group_by_using_agg_time__plan0.sql |   6 +-
 ..._using_agg_time_and_metric_time__plan0.sql |   6 +-
 ...join_to_time_spine_with_filters__plan0.sql |   8 +-
 ...e_fill_nulls_with_0_metric_time__plan0.sql |   4 +-
 ..._simple_fill_nulls_with_0_month__plan0.sql |   4 +-
 .../test_cumulative_fill_nulls__plan0.sql     |   4 +-
 ...fill_nulls_for_one_input_metric__plan0.sql |   8 +-
 ...ine_with_filter_not_in_group_by__plan0.sql |   6 +-
 ..._not_in_group_by_using_agg_time__plan0.sql |   6 +-
 ..._using_agg_time_and_metric_time__plan0.sql |   6 +-
 ...join_to_time_spine_with_filters__plan0.sql |   8 +-
 ...e_fill_nulls_with_0_metric_time__plan0.sql |   4 +-
 ..._simple_fill_nulls_with_0_month__plan0.sql |   4 +-
 .../test_cumulative_fill_nulls__plan0.sql     |   4 +-
 ...fill_nulls_for_one_input_metric__plan0.sql |   8 +-
 ...ine_with_filter_not_in_group_by__plan0.sql |   6 +-
 ..._not_in_group_by_using_agg_time__plan0.sql |   6 +-
 ..._using_agg_time_and_metric_time__plan0.sql |   6 +-
 ...join_to_time_spine_with_filters__plan0.sql |   8 +-
 ...e_fill_nulls_with_0_metric_time__plan0.sql |   4 +-
 ..._simple_fill_nulls_with_0_month__plan0.sql |   4 +-
 .../test_cumulative_fill_nulls__plan0.sql     |   4 +-
 ...fill_nulls_for_one_input_metric__plan0.sql |   8 +-
 ...ine_with_filter_not_in_group_by__plan0.sql |   6 +-
 ..._not_in_group_by_using_agg_time__plan0.sql |   6 +-
 ..._using_agg_time_and_metric_time__plan0.sql |   6 +-
 ...join_to_time_spine_with_filters__plan0.sql |   8 +-
 ...e_fill_nulls_with_0_metric_time__plan0.sql |   4 +-
 ..._simple_fill_nulls_with_0_month__plan0.sql |   4 +-
 .../test_metric_time_date_part__plan0.sql     |   6 +-
 ...st_offset_window_with_date_part__plan0.sql |   4 +-
 .../test_metric_time_date_part__plan0.sql     |   6 +-
 ...st_offset_window_with_date_part__plan0.sql |   4 +-
 .../test_metric_time_date_part__plan0.sql     |   6 +-
 ...st_offset_window_with_date_part__plan0.sql |   4 +-
 .../test_metric_time_date_part__plan0.sql     |   6 +-
 ...st_offset_window_with_date_part__plan0.sql |   4 +-
 .../test_metric_time_date_part__plan0.sql     |   6 +-
 ...st_offset_window_with_date_part__plan0.sql |   4 +-
 .../test_metric_time_date_part__plan0.sql     |   6 +-
 ...st_offset_window_with_date_part__plan0.sql |   4 +-
 .../test_metric_time_date_part__plan0.sql     |   6 +-
 ...st_offset_window_with_date_part__plan0.sql |   4 +-
 ...dimensions_with_time_constraint__plan0.sql |   6 +-
 .../BigQuery/test_metric_time_only__plan0.sql |   6 +-
 .../test_metric_time_quarter_alone__plan0.sql |   6 +-
 ...tric_time_with_other_dimensions__plan0.sql |   6 +-
 ...dimensions_with_time_constraint__plan0.sql |   6 +-
 .../test_metric_time_only__plan0.sql          |   6 +-
 .../test_metric_time_quarter_alone__plan0.sql |   6 +-
 ...tric_time_with_other_dimensions__plan0.sql |   6 +-
 ...dimensions_with_time_constraint__plan0.sql |   6 +-
 .../DuckDB/test_metric_time_only__plan0.sql   |   6 +-
 .../test_metric_time_quarter_alone__plan0.sql |   6 +-
 ...tric_time_with_other_dimensions__plan0.sql |   6 +-
 ...dimensions_with_time_constraint__plan0.sql |   6 +-
 .../Postgres/test_metric_time_only__plan0.sql |   6 +-
 .../test_metric_time_quarter_alone__plan0.sql |   6 +-
 ...tric_time_with_other_dimensions__plan0.sql |   6 +-
 ...dimensions_with_time_constraint__plan0.sql |   6 +-
 .../Redshift/test_metric_time_only__plan0.sql |   6 +-
 .../test_metric_time_quarter_alone__plan0.sql |   6 +-
 ...tric_time_with_other_dimensions__plan0.sql |   6 +-
 ...dimensions_with_time_constraint__plan0.sql |   6 +-
 .../test_metric_time_only__plan0.sql          |   6 +-
 .../test_metric_time_quarter_alone__plan0.sql |   6 +-
 ...tric_time_with_other_dimensions__plan0.sql |   6 +-
 ...dimensions_with_time_constraint__plan0.sql |   6 +-
 .../Trino/test_metric_time_only__plan0.sql    |   6 +-
 .../test_metric_time_quarter_alone__plan0.sql |   6 +-
 ...tric_time_with_other_dimensions__plan0.sql |   6 +-
 ...dimensions_with_time_constraint__plan0.xml |   6 +-
 .../SqlPlan/test_metric_time_only__plan0.xml  |   6 +-
 .../test_metric_time_quarter_alone__plan0.xml |   6 +-
 ...tric_time_with_other_dimensions__plan0.xml |   6 +-
 ...t_window_with_base_grain__query_output.txt |   4 +-
 ...ith_grains_and_date_part__query_output.txt |   2 +-
 ...th_matching_custom_grain__query_output.txt |   4 +-
 ...t_window_with_base_grain__query_output.txt |   4 +-
 ...ith_grains_and_date_part__query_output.txt |   2 +-
 ...th_matching_custom_grain__query_output.txt |   4 +-
 ...t_window_with_base_grain__query_output.txt |   4 +-
 ...ith_grains_and_date_part__query_output.txt |   2 +-
 ...th_matching_custom_grain__query_output.txt |   4 +-
 ...t_window_with_base_grain__query_output.txt |   4 +-
 ...ith_grains_and_date_part__query_output.txt |   2 +-
 ...th_matching_custom_grain__query_output.txt |   4 +-
 ...t_window_with_base_grain__query_output.txt |   4 +-
 ...ith_grains_and_date_part__query_output.txt |   2 +-
 ...th_matching_custom_grain__query_output.txt |   4 +-
 ...t_window_with_base_grain__query_output.txt |   2 +-
 ...th_matching_custom_grain__query_output.txt |   2 +-
 ...t_window_with_base_grain__query_output.txt |   4 +-
 ...ith_grains_and_date_part__query_output.txt |   2 +-
 ...th_matching_custom_grain__query_output.txt |   4 +-
 ...spine_metric_predicate_pushdown__plan0.sql |  12 +-
 ..._metric_with_query_time_filters__plan0.sql |   4 +-
 ...ine_pushdown_filter_application__plan0.sql |   4 +-
 ...spine_metric_predicate_pushdown__plan0.sql |  12 +-
 ..._metric_with_query_time_filters__plan0.sql |   4 +-
 ...ine_pushdown_filter_application__plan0.sql |   4 +-
 ...spine_metric_predicate_pushdown__plan0.sql |  12 +-
 ..._metric_with_query_time_filters__plan0.sql |   4 +-
 ...ine_pushdown_filter_application__plan0.sql |   4 +-
 ...spine_metric_predicate_pushdown__plan0.sql |  12 +-
 ..._metric_with_query_time_filters__plan0.sql |   4 +-
 ...ine_pushdown_filter_application__plan0.sql |   4 +-
 ...spine_metric_predicate_pushdown__plan0.sql |  12 +-
 ..._metric_with_query_time_filters__plan0.sql |   4 +-
 ...ine_pushdown_filter_application__plan0.sql |   4 +-
 ...spine_metric_predicate_pushdown__plan0.sql |  12 +-
 ..._metric_with_query_time_filters__plan0.sql |   4 +-
 ...ine_pushdown_filter_application__plan0.sql |   4 +-
 ...spine_metric_predicate_pushdown__plan0.sql |  12 +-
 ..._metric_with_query_time_filters__plan0.sql |   4 +-
 ...ine_pushdown_filter_application__plan0.sql |   4 +-
 ...est_multiple_time_spines__query_output.txt |   2 +-
 .../test_min_max_metric_time__plan0.sql       |   6 +-
 .../test_min_max_metric_time_week__plan0.sql  |   6 +-
 .../test_min_max_metric_time__plan0.sql       |   6 +-
 .../test_min_max_metric_time_week__plan0.sql  |   6 +-
 .../test_min_max_metric_time__plan0.sql       |   6 +-
 .../test_min_max_metric_time_week__plan0.sql  |   6 +-
 .../test_min_max_metric_time__plan0.sql       |   6 +-
 .../test_min_max_metric_time_week__plan0.sql  |   6 +-
 .../test_min_max_metric_time__plan0.sql       |   6 +-
 .../test_min_max_metric_time_week__plan0.sql  |   6 +-
 .../test_min_max_metric_time__plan0.sql       |   6 +-
 .../test_min_max_metric_time_week__plan0.sql  |   6 +-
 .../Trino/test_min_max_metric_time__plan0.sql |   6 +-
 .../test_min_max_metric_time_week__plan0.sql  |   6 +-
 ...e_with_input_measure_constraint__plan0.sql |   6 +-
 ...ne_with_queried_time_constraint__plan0.sql |   6 +-
 .../test_simple_join_to_time_spine__plan0.sql |   4 +-
 ..._join_to_time_spine_with_filter__plan0.sql |   4 +-
 ..._time_spine_with_queried_filter__plan0.sql |   4 +-
 ...e_with_input_measure_constraint__plan0.sql |   6 +-
 ...ne_with_queried_time_constraint__plan0.sql |   6 +-
 .../test_simple_join_to_time_spine__plan0.sql |   4 +-
 ..._join_to_time_spine_with_filter__plan0.sql |   4 +-
 ..._time_spine_with_queried_filter__plan0.sql |   4 +-
 ...e_with_input_measure_constraint__plan0.sql |   6 +-
 ...ne_with_queried_time_constraint__plan0.sql |   6 +-
 .../test_simple_join_to_time_spine__plan0.sql |   4 +-
 ..._join_to_time_spine_with_filter__plan0.sql |   4 +-
 ..._time_spine_with_queried_filter__plan0.sql |   4 +-
 ...e_with_input_measure_constraint__plan0.sql |   6 +-
 ...ne_with_queried_time_constraint__plan0.sql |   6 +-
 .../test_simple_join_to_time_spine__plan0.sql |   4 +-
 ..._join_to_time_spine_with_filter__plan0.sql |   4 +-
 ..._time_spine_with_queried_filter__plan0.sql |   4 +-
 ...e_with_input_measure_constraint__plan0.sql |   6 +-
 ...ne_with_queried_time_constraint__plan0.sql |   6 +-
 .../test_simple_join_to_time_spine__plan0.sql |   4 +-
 ..._join_to_time_spine_with_filter__plan0.sql |   4 +-
 ..._time_spine_with_queried_filter__plan0.sql |   4 +-
 ...e_with_input_measure_constraint__plan0.sql |   6 +-
 ...ne_with_queried_time_constraint__plan0.sql |   6 +-
 .../test_simple_join_to_time_spine__plan0.sql |   4 +-
 ..._join_to_time_spine_with_filter__plan0.sql |   4 +-
 ..._time_spine_with_queried_filter__plan0.sql |   4 +-
 ...e_with_input_measure_constraint__plan0.sql |   6 +-
 ...ne_with_queried_time_constraint__plan0.sql |   6 +-
 .../test_simple_join_to_time_spine__plan0.sql |   4 +-
 ..._join_to_time_spine_with_filter__plan0.sql |   4 +-
 ..._time_spine_with_queried_filter__plan0.sql |   4 +-
 811 files changed, 4727 insertions(+), 4727 deletions(-)

diff --git a/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/shared/project_configuration.yaml b/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/shared/project_configuration.yaml
index 4961f4d2fe..96df913ae6 100644
--- a/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/shared/project_configuration.yaml
+++ b/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/shared/project_configuration.yaml
@@ -49,4 +49,4 @@ project_configuration:
         name: ds
         time_granularity: day
       custom_granularities:
-        - name: martian_day
+        - name: alien_day
diff --git a/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/simple_manifest/metrics.yaml b/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/simple_manifest/metrics.yaml
index 4cdad77e57..685dde7521 100644
--- a/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/simple_manifest/metrics.yaml
+++ b/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/simple_manifest/metrics.yaml
@@ -720,14 +720,14 @@ metric:
         offset_window: 2 days
 ---
 metric:
-  name: "bookings_offset_martian_day"
+  name: "bookings_offset_alien_day"
   description: bookings metric offset by a martian day.
   type: derived
   type_params:
     expr: 2 * bookings
     metrics:
       - name: bookings
-        offset_window: 1 martian_day
+        offset_window: 1 alien_day
 ---
 metric:
   name: bookings_at_start_of_month
@@ -861,23 +861,23 @@ metric:
         alias: shared_alias
 ---
 metric:
-  name: bookings_offset_one_martian_day
-  description: bookings offset by one martian_day
+  name: bookings_offset_one_alien_day
+  description: bookings offset by one alien_day
   type: derived
   type_params:
     expr: bookings
     metrics:
       - name: bookings
-        offset_window: 1 martian_day
+        offset_window: 1 alien_day
 ---
 metric:
-  name: bookings_martian_day_over_martian_day
+  name: bookings_alien_day_over_alien_day
   description: bookings growth martian day over martian day
   type: derived
   type_params:
     expr: bookings - bookings_offset / NULLIF(bookings_offset, 0)
     metrics:
       - name: bookings
-        offset_window: 1 martian_day
+        offset_window: 1 alien_day
         alias: bookings_offset
       - name: bookings
diff --git a/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/simple_manifest/semantic_models/user_sm_source.yaml b/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/simple_manifest/semantic_models/user_sm_source.yaml
index 991bc24571..f66f7f11a5 100644
--- a/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/simple_manifest/semantic_models/user_sm_source.yaml
+++ b/metricflow-semantics/metricflow_semantics/test_helpers/semantic_manifest_yamls/simple_manifest/semantic_models/user_sm_source.yaml
@@ -134,11 +134,11 @@ metric:
       join_to_timespine: true
 ---
 metric:
-  name: archived_users_offset_1_martian_day
-  description: archived_users offset by 1 martian_day
+  name: archived_users_offset_1_alien_day
+  description: archived_users offset by 1 alien_day
   type: derived
   type_params:
     expr: archived_users
     metrics:
       - name: archived_users
-        offset_window: 1 martian_day
+        offset_window: 1 alien_day
diff --git a/metricflow-semantics/tests_metricflow_semantics/model/semantics/test_metric_lookup.py b/metricflow-semantics/tests_metricflow_semantics/model/semantics/test_metric_lookup.py
index b69c82d624..cac1c2ab24 100644
--- a/metricflow-semantics/tests_metricflow_semantics/model/semantics/test_metric_lookup.py
+++ b/metricflow-semantics/tests_metricflow_semantics/model/semantics/test_metric_lookup.py
@@ -28,7 +28,7 @@ def test_custom_offset_window_for_metric(
     simple_semantic_manifest_lookup: SemanticManifestLookup,
 ) -> None:
     """Test offset window with custom grain supplied."""
-    metric = simple_semantic_manifest_lookup.metric_lookup.get_metric(MetricReference("bookings_offset_martian_day"))
+    metric = simple_semantic_manifest_lookup.metric_lookup.get_metric(MetricReference("bookings_offset_alien_day"))
 
     assert len(metric.input_metrics) == 1
-    assert metric.input_metrics[0].offset_window == PydanticMetricTimeWindow(count=1, granularity="martian_day")
+    assert metric.input_metrics[0].offset_window == PydanticMetricTimeWindow(count=1, granularity="alien_day")
diff --git a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_available_group_by_items.py/LinkableSpecSet/test_available_group_by_items__no_metrics__set0.txt b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_available_group_by_items.py/LinkableSpecSet/test_available_group_by_items__no_metrics__set0.txt
index ac99eed6a3..73a610a9fb 100644
--- a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_available_group_by_items.py/LinkableSpecSet/test_available_group_by_items__no_metrics__set0.txt
+++ b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_available_group_by_items.py/LinkableSpecSet/test_available_group_by_items__no_metrics__set0.txt
@@ -4,7 +4,7 @@ test_filename: test_available_group_by_items.py
 [
   "TimeDimension('metric_time', 'day')",
   "TimeDimension('metric_time', 'hour')",
-  "TimeDimension('metric_time', 'martian_day')",
+  "TimeDimension('metric_time', 'alien_day')",
   "TimeDimension('metric_time', 'microsecond')",
   "TimeDimension('metric_time', 'millisecond')",
   "TimeDimension('metric_time', 'minute')",
diff --git a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/list/test_linkable_element_set_as_spec_set__set0.txt b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/list/test_linkable_element_set_as_spec_set__set0.txt
index 2bcc409a19..a57991f437 100644
--- a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/list/test_linkable_element_set_as_spec_set__set0.txt
+++ b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/list/test_linkable_element_set_as_spec_set__set0.txt
@@ -86,7 +86,7 @@ docstring:
   'listing__created_at__extract_month',
   'listing__created_at__extract_quarter',
   'listing__created_at__extract_year',
-  'listing__created_at__martian_day',
+  'listing__created_at__alien_day',
   'listing__created_at__month',
   'listing__created_at__quarter',
   'listing__created_at__week',
@@ -105,7 +105,7 @@ docstring:
   'listing__ds__extract_month',
   'listing__ds__extract_quarter',
   'listing__ds__extract_year',
-  'listing__ds__martian_day',
+  'listing__ds__alien_day',
   'listing__ds__month',
   'listing__ds__quarter',
   'listing__ds__week',
@@ -144,7 +144,7 @@ docstring:
   'metric_time__extract_month',
   'metric_time__extract_quarter',
   'metric_time__extract_year',
-  'metric_time__martian_day',
+  'metric_time__alien_day',
   'metric_time__month',
   'metric_time__quarter',
   'metric_time__week',
@@ -163,7 +163,7 @@ docstring:
   'user__archived_at__extract_quarter',
   'user__archived_at__extract_year',
   'user__archived_at__hour',
-  'user__archived_at__martian_day',
+  'user__archived_at__alien_day',
   'user__archived_at__month',
   'user__archived_at__quarter',
   'user__archived_at__week',
@@ -178,7 +178,7 @@ docstring:
   'user__bio_added_ts__extract_quarter',
   'user__bio_added_ts__extract_year',
   'user__bio_added_ts__hour',
-  'user__bio_added_ts__martian_day',
+  'user__bio_added_ts__alien_day',
   'user__bio_added_ts__minute',
   'user__bio_added_ts__month',
   'user__bio_added_ts__quarter',
@@ -194,7 +194,7 @@ docstring:
   'user__created_at__extract_month',
   'user__created_at__extract_quarter',
   'user__created_at__extract_year',
-  'user__created_at__martian_day',
+  'user__created_at__alien_day',
   'user__created_at__month',
   'user__created_at__quarter',
   'user__created_at__week',
@@ -207,7 +207,7 @@ docstring:
   'user__ds__extract_month',
   'user__ds__extract_quarter',
   'user__ds__extract_year',
-  'user__ds__martian_day',
+  'user__ds__alien_day',
   'user__ds__month',
   'user__ds__quarter',
   'user__ds__week',
@@ -219,7 +219,7 @@ docstring:
   'user__ds_latest__extract_month',
   'user__ds_latest__extract_quarter',
   'user__ds_latest__extract_year',
-  'user__ds_latest__martian_day',
+  'user__ds_latest__alien_day',
   'user__ds_latest__month',
   'user__ds_latest__quarter',
   'user__ds_latest__week',
@@ -231,7 +231,7 @@ docstring:
   'user__ds_partitioned__extract_month',
   'user__ds_partitioned__extract_quarter',
   'user__ds_partitioned__extract_year',
-  'user__ds_partitioned__martian_day',
+  'user__ds_partitioned__alien_day',
   'user__ds_partitioned__month',
   'user__ds_partitioned__quarter',
   'user__ds_partitioned__week',
@@ -248,7 +248,7 @@ docstring:
   'user__last_login_ts__extract_quarter',
   'user__last_login_ts__extract_year',
   'user__last_login_ts__hour',
-  'user__last_login_ts__martian_day',
+  'user__last_login_ts__alien_day',
   'user__last_login_ts__minute',
   'user__last_login_ts__month',
   'user__last_login_ts__quarter',
@@ -262,7 +262,7 @@ docstring:
   'user__last_profile_edit_ts__extract_quarter',
   'user__last_profile_edit_ts__extract_year',
   'user__last_profile_edit_ts__hour',
-  'user__last_profile_edit_ts__martian_day',
+  'user__last_profile_edit_ts__alien_day',
   'user__last_profile_edit_ts__millisecond',
   'user__last_profile_edit_ts__minute',
   'user__last_profile_edit_ts__month',
diff --git a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_all_properties__result0.txt b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_all_properties__result0.txt
index 60021f16eb..b2b1e0b109 100644
--- a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_all_properties__result0.txt
+++ b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_all_properties__result0.txt
@@ -11,7 +11,7 @@ Model Join-Path                                            Entity Links
 ('bookings_source',)                                       ()                   metric_time                               QUARTER      ['DATE_PART', 'METRIC_TIME']
 ('bookings_source',)                                       ()                   metric_time                               YEAR         ['DATE_PART', 'METRIC_TIME']
 ('bookings_source',)                                       ()                   metric_time           day                              ['METRIC_TIME']
-('bookings_source',)                                       ()                   metric_time           martian_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
+('bookings_source',)                                       ()                   metric_time           alien_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('bookings_source',)                                       ()                   metric_time           month                            ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('bookings_source',)                                       ()                   metric_time           quarter                          ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('bookings_source',)                                       ()                   metric_time           week                             ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
@@ -25,7 +25,7 @@ Model Join-Path                                            Entity Links
 ('bookings_source', 'listings_latest')                     ('listing',)         created_at                                QUARTER      ['DATE_PART', 'JOINED']
 ('bookings_source', 'listings_latest')                     ('listing',)         created_at                                YEAR         ['DATE_PART', 'JOINED']
 ('bookings_source', 'listings_latest')                     ('listing',)         created_at            day                              ['JOINED']
-('bookings_source', 'listings_latest')                     ('listing',)         created_at            martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('bookings_source', 'listings_latest')                     ('listing',)         created_at            alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')                     ('listing',)         created_at            month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')                     ('listing',)         created_at            quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')                     ('listing',)         created_at            week                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -37,7 +37,7 @@ Model Join-Path                                            Entity Links
 ('bookings_source', 'listings_latest')                     ('listing',)         ds                                        QUARTER      ['DATE_PART', 'JOINED']
 ('bookings_source', 'listings_latest')                     ('listing',)         ds                                        YEAR         ['DATE_PART', 'JOINED']
 ('bookings_source', 'listings_latest')                     ('listing',)         ds                    day                              ['JOINED']
-('bookings_source', 'listings_latest')                     ('listing',)         ds                    martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('bookings_source', 'listings_latest')                     ('listing',)         ds                    alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')                     ('listing',)         ds                    month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')                     ('listing',)         ds                    quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')                     ('listing',)         ds                    week                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -54,7 +54,7 @@ Model Join-Path                                            Entity Links
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  archived_at                               YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  archived_at           day                              ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  archived_at           hour                             ['JOINED', 'MULTI_HOP']
-('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  archived_at           martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  archived_at           alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  archived_at           month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  archived_at           quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  archived_at           week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -67,7 +67,7 @@ Model Join-Path                                            Entity Links
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  bio_added_ts                              YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  bio_added_ts          day                              ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  bio_added_ts          hour                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
-('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  bio_added_ts          martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  bio_added_ts          alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  bio_added_ts          minute                           ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  bio_added_ts          month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  bio_added_ts          quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -81,7 +81,7 @@ Model Join-Path                                            Entity Links
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  created_at                                QUARTER      ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  created_at                                YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  created_at            day                              ['JOINED', 'MULTI_HOP']
-('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  created_at            martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  created_at            alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  created_at            month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  created_at            quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  created_at            week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -93,7 +93,7 @@ Model Join-Path                                            Entity Links
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds                                        QUARTER      ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds                                        YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds                    day                              ['JOINED', 'MULTI_HOP']
-('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds                    martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds                    alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds                    month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds                    quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds                    week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -105,7 +105,7 @@ Model Join-Path                                            Entity Links
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds_partitioned                            QUARTER      ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds_partitioned                            YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds_partitioned        day                              ['JOINED', 'MULTI_HOP']
-('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds_partitioned        martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds_partitioned        alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds_partitioned        month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds_partitioned        quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  ds_partitioned        week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -119,7 +119,7 @@ Model Join-Path                                            Entity Links
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_login_ts                             YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_login_ts         day                              ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_login_ts         hour                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
-('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_login_ts         martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_login_ts         alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_login_ts         minute                           ['JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_login_ts         month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_login_ts         quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -133,7 +133,7 @@ Model Join-Path                                            Entity Links
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_profile_edit_ts                      YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_profile_edit_ts  day                              ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_profile_edit_ts  hour                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
-('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_profile_edit_ts  martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_profile_edit_ts  alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_profile_edit_ts  millisecond                      ['JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_profile_edit_ts  minute                           ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_ds_source')  ('listing', 'user')  last_profile_edit_ts  month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -148,7 +148,7 @@ Model Join-Path                                            Entity Links
 ('bookings_source', 'listings_latest', 'users_latest')     ('listing', 'user')  ds_latest                                 QUARTER      ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_latest')     ('listing', 'user')  ds_latest                                 YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_latest')     ('listing', 'user')  ds_latest             day                              ['JOINED', 'MULTI_HOP']
-('bookings_source', 'listings_latest', 'users_latest')     ('listing', 'user')  ds_latest             martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('bookings_source', 'listings_latest', 'users_latest')     ('listing', 'user')  ds_latest             alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_latest')     ('listing', 'user')  ds_latest             month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_latest')     ('listing', 'user')  ds_latest             quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('bookings_source', 'listings_latest', 'users_latest')     ('listing', 'user')  ds_latest             week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -163,7 +163,7 @@ Model Join-Path                                            Entity Links
 ('views_source',)                                          ()                   metric_time                               QUARTER      ['DATE_PART', 'METRIC_TIME']
 ('views_source',)                                          ()                   metric_time                               YEAR         ['DATE_PART', 'METRIC_TIME']
 ('views_source',)                                          ()                   metric_time           day                              ['METRIC_TIME']
-('views_source',)                                          ()                   metric_time           martian_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
+('views_source',)                                          ()                   metric_time           alien_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('views_source',)                                          ()                   metric_time           month                            ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('views_source',)                                          ()                   metric_time           quarter                          ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('views_source',)                                          ()                   metric_time           week                             ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
@@ -177,7 +177,7 @@ Model Join-Path                                            Entity Links
 ('views_source', 'listings_latest')                        ('listing',)         created_at                                QUARTER      ['DATE_PART', 'JOINED']
 ('views_source', 'listings_latest')                        ('listing',)         created_at                                YEAR         ['DATE_PART', 'JOINED']
 ('views_source', 'listings_latest')                        ('listing',)         created_at            day                              ['JOINED']
-('views_source', 'listings_latest')                        ('listing',)         created_at            martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('views_source', 'listings_latest')                        ('listing',)         created_at            alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('views_source', 'listings_latest')                        ('listing',)         created_at            month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('views_source', 'listings_latest')                        ('listing',)         created_at            quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('views_source', 'listings_latest')                        ('listing',)         created_at            week                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -189,7 +189,7 @@ Model Join-Path                                            Entity Links
 ('views_source', 'listings_latest')                        ('listing',)         ds                                        QUARTER      ['DATE_PART', 'JOINED']
 ('views_source', 'listings_latest')                        ('listing',)         ds                                        YEAR         ['DATE_PART', 'JOINED']
 ('views_source', 'listings_latest')                        ('listing',)         ds                    day                              ['JOINED']
-('views_source', 'listings_latest')                        ('listing',)         ds                    martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('views_source', 'listings_latest')                        ('listing',)         ds                    alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('views_source', 'listings_latest')                        ('listing',)         ds                    month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('views_source', 'listings_latest')                        ('listing',)         ds                    quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('views_source', 'listings_latest')                        ('listing',)         ds                    week                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -206,7 +206,7 @@ Model Join-Path                                            Entity Links
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  archived_at                               YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  archived_at           day                              ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  archived_at           hour                             ['JOINED', 'MULTI_HOP']
-('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  archived_at           martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  archived_at           alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  archived_at           month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  archived_at           quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  archived_at           week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -219,7 +219,7 @@ Model Join-Path                                            Entity Links
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  bio_added_ts                              YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  bio_added_ts          day                              ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  bio_added_ts          hour                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
-('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  bio_added_ts          martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  bio_added_ts          alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  bio_added_ts          minute                           ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  bio_added_ts          month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  bio_added_ts          quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -233,7 +233,7 @@ Model Join-Path                                            Entity Links
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  created_at                                QUARTER      ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  created_at                                YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  created_at            day                              ['JOINED', 'MULTI_HOP']
-('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  created_at            martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  created_at            alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  created_at            month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  created_at            quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  created_at            week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -245,7 +245,7 @@ Model Join-Path                                            Entity Links
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds                                        QUARTER      ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds                                        YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds                    day                              ['JOINED', 'MULTI_HOP']
-('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds                    martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds                    alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds                    month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds                    quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds                    week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -257,7 +257,7 @@ Model Join-Path                                            Entity Links
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds_partitioned                            QUARTER      ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds_partitioned                            YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds_partitioned        day                              ['JOINED', 'MULTI_HOP']
-('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds_partitioned        martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds_partitioned        alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds_partitioned        month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds_partitioned        quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  ds_partitioned        week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -271,7 +271,7 @@ Model Join-Path                                            Entity Links
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_login_ts                             YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_login_ts         day                              ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_login_ts         hour                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
-('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_login_ts         martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_login_ts         alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_login_ts         minute                           ['JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_login_ts         month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_login_ts         quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -285,7 +285,7 @@ Model Join-Path                                            Entity Links
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_profile_edit_ts                      YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_profile_edit_ts  day                              ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_profile_edit_ts  hour                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
-('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_profile_edit_ts  martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_profile_edit_ts  alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_profile_edit_ts  millisecond                      ['JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_profile_edit_ts  minute                           ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_ds_source')     ('listing', 'user')  last_profile_edit_ts  month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -300,7 +300,7 @@ Model Join-Path                                            Entity Links
 ('views_source', 'listings_latest', 'users_latest')        ('listing', 'user')  ds_latest                                 QUARTER      ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_latest')        ('listing', 'user')  ds_latest                                 YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_latest')        ('listing', 'user')  ds_latest             day                              ['JOINED', 'MULTI_HOP']
-('views_source', 'listings_latest', 'users_latest')        ('listing', 'user')  ds_latest             martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('views_source', 'listings_latest', 'users_latest')        ('listing', 'user')  ds_latest             alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_latest')        ('listing', 'user')  ds_latest             month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_latest')        ('listing', 'user')  ds_latest             quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'listings_latest', 'users_latest')        ('listing', 'user')  ds_latest             week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
diff --git a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_create_linkable_element_set_from_join_path__result0.txt b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_create_linkable_element_set_from_join_path__result0.txt
index 612c4b5719..d49ed53969 100644
--- a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_create_linkable_element_set_from_join_path__result0.txt
+++ b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_create_linkable_element_set_from_join_path__result0.txt
@@ -12,7 +12,7 @@ Model Join-Path                         Entity Links    Name             Time Gr
 ('bookings_source', 'listings_latest')  ('listing',)    created_at                           QUARTER      ['DATE_PART', 'JOINED']
 ('bookings_source', 'listings_latest')  ('listing',)    created_at                           YEAR         ['DATE_PART', 'JOINED']
 ('bookings_source', 'listings_latest')  ('listing',)    created_at       day                              ['JOINED']
-('bookings_source', 'listings_latest')  ('listing',)    created_at       martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('bookings_source', 'listings_latest')  ('listing',)    created_at       alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')  ('listing',)    created_at       month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')  ('listing',)    created_at       quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')  ('listing',)    created_at       week                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -24,7 +24,7 @@ Model Join-Path                         Entity Links    Name             Time Gr
 ('bookings_source', 'listings_latest')  ('listing',)    ds                                   QUARTER      ['DATE_PART', 'JOINED']
 ('bookings_source', 'listings_latest')  ('listing',)    ds                                   YEAR         ['DATE_PART', 'JOINED']
 ('bookings_source', 'listings_latest')  ('listing',)    ds               day                              ['JOINED']
-('bookings_source', 'listings_latest')  ('listing',)    ds               martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('bookings_source', 'listings_latest')  ('listing',)    ds               alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')  ('listing',)    ds               month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')  ('listing',)    ds               quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('bookings_source', 'listings_latest')  ('listing',)    ds               week                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
diff --git a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_create_linkable_element_set_from_join_path_multi_hop__result0.txt b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_create_linkable_element_set_from_join_path_multi_hop__result0.txt
index ffdfe221ff..90b252f681 100644
--- a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_create_linkable_element_set_from_join_path_multi_hop__result0.txt
+++ b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_create_linkable_element_set_from_join_path_multi_hop__result0.txt
@@ -12,7 +12,7 @@ Model Join-Path                                         Entity Links          Na
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  created_at                           QUARTER      ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  created_at                           YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  created_at       day                              ['JOINED', 'MULTI_HOP']
-('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  created_at       martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  created_at       alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  created_at       month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  created_at       quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  created_at       week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
@@ -24,7 +24,7 @@ Model Join-Path                                         Entity Links          Na
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  ds                                   QUARTER      ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  ds                                   YEAR         ['DATE_PART', 'JOINED', 'MULTI_HOP']
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  ds               day                              ['JOINED', 'MULTI_HOP']
-('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  ds               martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
+('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  ds               alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  ds               month                            ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  ds               quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
 ('views_source', 'bookings_source', 'listings_latest')  ('guest', 'listing')  ds               week                             ['DERIVED_TIME_GRANULARITY', 'JOINED', 'MULTI_HOP']
diff --git a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_cyclic_join_manifest__result0.txt b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_cyclic_join_manifest__result0.txt
index 4bb8b9677d..1a9df69695 100644
--- a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_cyclic_join_manifest__result0.txt
+++ b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_cyclic_join_manifest__result0.txt
@@ -12,7 +12,7 @@ Model Join-Path                                Entity Links        Name
 ('listings_latest',)                           ()                  metric_time                          QUARTER      ['DATE_PART', 'METRIC_TIME']
 ('listings_latest',)                           ()                  metric_time                          YEAR         ['DATE_PART', 'METRIC_TIME']
 ('listings_latest',)                           ()                  metric_time      day                              ['METRIC_TIME']
-('listings_latest',)                           ()                  metric_time      martian_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
+('listings_latest',)                           ()                  metric_time      alien_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('listings_latest',)                           ()                  metric_time      month                            ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('listings_latest',)                           ()                  metric_time      quarter                          ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('listings_latest',)                           ()                  metric_time      week                             ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
@@ -25,7 +25,7 @@ Model Join-Path                                Entity Links        Name
 ('listings_latest',)                           ('cyclic_entity',)  ds                                   QUARTER      ['DATE_PART', 'LOCAL']
 ('listings_latest',)                           ('cyclic_entity',)  ds                                   YEAR         ['DATE_PART', 'LOCAL']
 ('listings_latest',)                           ('cyclic_entity',)  ds               day                              ['LOCAL']
-('listings_latest',)                           ('cyclic_entity',)  ds               martian_day                      ['DERIVED_TIME_GRANULARITY', 'LOCAL']
+('listings_latest',)                           ('cyclic_entity',)  ds               alien_day                      ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                           ('cyclic_entity',)  ds               month                            ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                           ('cyclic_entity',)  ds               quarter                          ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                           ('cyclic_entity',)  ds               week                             ['DERIVED_TIME_GRANULARITY', 'LOCAL']
@@ -38,7 +38,7 @@ Model Join-Path                                Entity Links        Name
 ('listings_latest',)                           ('listing',)        ds                                   QUARTER      ['DATE_PART', 'LOCAL']
 ('listings_latest',)                           ('listing',)        ds                                   YEAR         ['DATE_PART', 'LOCAL']
 ('listings_latest',)                           ('listing',)        ds               day                              ['LOCAL']
-('listings_latest',)                           ('listing',)        ds               martian_day                      ['DERIVED_TIME_GRANULARITY', 'LOCAL']
+('listings_latest',)                           ('listing',)        ds               alien_day                      ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                           ('listing',)        ds               month                            ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                           ('listing',)        ds               quarter                          ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                           ('listing',)        ds               week                             ['DERIVED_TIME_GRANULARITY', 'LOCAL']
diff --git a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_metric_time_property_for_cumulative_metric__result0.txt b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_metric_time_property_for_cumulative_metric__result0.txt
index 7283191768..56e74997c1 100644
--- a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_metric_time_property_for_cumulative_metric__result0.txt
+++ b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_metric_time_property_for_cumulative_metric__result0.txt
@@ -4,7 +4,7 @@ test_filename: test_linkable_spec_resolver.py
 Model Join-Path    Entity Links    Name         Time Granularity    Date Part    Properties
 -----------------  --------------  -----------  ------------------  -----------  -------------------------------------------
 ('revenue',)       ()              metric_time  day                              ['METRIC_TIME']
-('revenue',)       ()              metric_time  martian_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
+('revenue',)       ()              metric_time  alien_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('revenue',)       ()              metric_time  month                            ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('revenue',)       ()              metric_time  quarter                          ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('revenue',)       ()              metric_time  week                             ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
diff --git a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_metric_time_property_for_derived_metrics__result0.txt b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_metric_time_property_for_derived_metrics__result0.txt
index 4d28f651e8..530ddede96 100644
--- a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_metric_time_property_for_derived_metrics__result0.txt
+++ b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_linkable_spec_resolver.py/str/test_metric_time_property_for_derived_metrics__result0.txt
@@ -10,7 +10,7 @@ Model Join-Path       Entity Links    Name         Time Granularity    Date Part
 ('bookings_source',)  ()              metric_time                      QUARTER      ['DATE_PART', 'METRIC_TIME']
 ('bookings_source',)  ()              metric_time                      YEAR         ['DATE_PART', 'METRIC_TIME']
 ('bookings_source',)  ()              metric_time  day                              ['METRIC_TIME']
-('bookings_source',)  ()              metric_time  martian_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
+('bookings_source',)  ()              metric_time  alien_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('bookings_source',)  ()              metric_time  month                            ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('bookings_source',)  ()              metric_time  quarter                          ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('bookings_source',)  ()              metric_time  week                             ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
@@ -22,7 +22,7 @@ Model Join-Path       Entity Links    Name         Time Granularity    Date Part
 ('views_source',)     ()              metric_time                      QUARTER      ['DATE_PART', 'METRIC_TIME']
 ('views_source',)     ()              metric_time                      YEAR         ['DATE_PART', 'METRIC_TIME']
 ('views_source',)     ()              metric_time  day                              ['METRIC_TIME']
-('views_source',)     ()              metric_time  martian_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
+('views_source',)     ()              metric_time  alien_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('views_source',)     ()              metric_time  month                            ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('views_source',)     ()              metric_time  quarter                          ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('views_source',)     ()              metric_time  week                             ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
diff --git a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_measure_lookup.py/dict/test_measure_properties__obj_0.txt b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_measure_lookup.py/dict/test_measure_properties__obj_0.txt
index 4291df52fd..1bd7fcaabd 100644
--- a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_measure_lookup.py/dict/test_measure_properties__obj_0.txt
+++ b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_measure_lookup.py/dict/test_measure_properties__obj_0.txt
@@ -99,7 +99,7 @@ docstring:
         element_name='ds',
         entity_links=(EntityReference(element_name='booking'),),
         time_granularity=ExpandedTimeGranularity(
-          name='martian_day',
+          name='alien_day',
           base_granularity=DAY,
         ),
       ),
@@ -233,7 +233,7 @@ docstring:
         element_name='ds',
         entity_links=(EntityReference(element_name='booking_monthly'),),
         time_granularity=ExpandedTimeGranularity(
-          name='martian_day',
+          name='alien_day',
           base_granularity=DAY,
         ),
       ),
diff --git a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_semantic_model_container.py/str/test_linkable_elements_for_measure__result0.txt b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_semantic_model_container.py/str/test_linkable_elements_for_measure__result0.txt
index 8c442e5c01..8f84bf2d5e 100644
--- a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_semantic_model_container.py/str/test_linkable_elements_for_measure__result0.txt
+++ b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_semantic_model_container.py/str/test_linkable_elements_for_measure__result0.txt
@@ -13,7 +13,7 @@ Model Join-Path                             Entity Links
 ('listings_latest',)                        ()                                             metric_time                                                              QUARTER      ['DATE_PART', 'METRIC_TIME']
 ('listings_latest',)                        ()                                             metric_time                                                              YEAR         ['DATE_PART', 'METRIC_TIME']
 ('listings_latest',)                        ()                                             metric_time                                          day                              ['METRIC_TIME']
-('listings_latest',)                        ()                                             metric_time                                          martian_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
+('listings_latest',)                        ()                                             metric_time                                          alien_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('listings_latest',)                        ()                                             metric_time                                          month                            ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('listings_latest',)                        ()                                             metric_time                                          quarter                          ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('listings_latest',)                        ()                                             metric_time                                          week                             ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
@@ -232,7 +232,7 @@ Model Join-Path                             Entity Links
 ('listings_latest',)                        ('listing',)                                   created_at                                                               QUARTER      ['DATE_PART', 'LOCAL']
 ('listings_latest',)                        ('listing',)                                   created_at                                                               YEAR         ['DATE_PART', 'LOCAL']
 ('listings_latest',)                        ('listing',)                                   created_at                                           day                              ['LOCAL']
-('listings_latest',)                        ('listing',)                                   created_at                                           martian_day                      ['DERIVED_TIME_GRANULARITY', 'LOCAL']
+('listings_latest',)                        ('listing',)                                   created_at                                           alien_day                      ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                        ('listing',)                                   created_at                                           month                            ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                        ('listing',)                                   created_at                                           quarter                          ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                        ('listing',)                                   created_at                                           week                             ['DERIVED_TIME_GRANULARITY', 'LOCAL']
@@ -244,7 +244,7 @@ Model Join-Path                             Entity Links
 ('listings_latest',)                        ('listing',)                                   ds                                                                       QUARTER      ['DATE_PART', 'LOCAL']
 ('listings_latest',)                        ('listing',)                                   ds                                                                       YEAR         ['DATE_PART', 'LOCAL']
 ('listings_latest',)                        ('listing',)                                   ds                                                   day                              ['LOCAL']
-('listings_latest',)                        ('listing',)                                   ds                                                   martian_day                      ['DERIVED_TIME_GRANULARITY', 'LOCAL']
+('listings_latest',)                        ('listing',)                                   ds                                                   alien_day                      ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                        ('listing',)                                   ds                                                   month                            ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                        ('listing',)                                   ds                                                   quarter                          ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('listings_latest',)                        ('listing',)                                   ds                                                   week                             ['DERIVED_TIME_GRANULARITY', 'LOCAL']
@@ -262,7 +262,7 @@ Model Join-Path                             Entity Links
 ('listings_latest', 'users_ds_source')      ('user',)                                      archived_at                                                              YEAR         ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      archived_at                                          day                              ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      archived_at                                          hour                             ['JOINED']
-('listings_latest', 'users_ds_source')      ('user',)                                      archived_at                                          martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('listings_latest', 'users_ds_source')      ('user',)                                      archived_at                                          alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      archived_at                                          month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      archived_at                                          quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      archived_at                                          week                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -275,7 +275,7 @@ Model Join-Path                             Entity Links
 ('listings_latest', 'users_ds_source')      ('user',)                                      bio_added_ts                                                             YEAR         ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      bio_added_ts                                         day                              ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      bio_added_ts                                         hour                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
-('listings_latest', 'users_ds_source')      ('user',)                                      bio_added_ts                                         martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('listings_latest', 'users_ds_source')      ('user',)                                      bio_added_ts                                         alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      bio_added_ts                                         minute                           ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      bio_added_ts                                         month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      bio_added_ts                                         quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -289,7 +289,7 @@ Model Join-Path                             Entity Links
 ('listings_latest', 'users_ds_source')      ('user',)                                      created_at                                                               QUARTER      ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      created_at                                                               YEAR         ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      created_at                                           day                              ['JOINED']
-('listings_latest', 'users_ds_source')      ('user',)                                      created_at                                           martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('listings_latest', 'users_ds_source')      ('user',)                                      created_at                                           alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      created_at                                           month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      created_at                                           quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      created_at                                           week                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -301,7 +301,7 @@ Model Join-Path                             Entity Links
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds                                                                       QUARTER      ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds                                                                       YEAR         ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds                                                   day                              ['JOINED']
-('listings_latest', 'users_ds_source')      ('user',)                                      ds                                                   martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('listings_latest', 'users_ds_source')      ('user',)                                      ds                                                   alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds                                                   month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds                                                   quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds                                                   week                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -313,7 +313,7 @@ Model Join-Path                             Entity Links
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds_partitioned                                                           QUARTER      ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds_partitioned                                                           YEAR         ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds_partitioned                                       day                              ['JOINED']
-('listings_latest', 'users_ds_source')      ('user',)                                      ds_partitioned                                       martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('listings_latest', 'users_ds_source')      ('user',)                                      ds_partitioned                                       alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds_partitioned                                       month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds_partitioned                                       quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      ds_partitioned                                       week                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -327,7 +327,7 @@ Model Join-Path                             Entity Links
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_login_ts                                                            YEAR         ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_login_ts                                        day                              ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_login_ts                                        hour                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
-('listings_latest', 'users_ds_source')      ('user',)                                      last_login_ts                                        martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('listings_latest', 'users_ds_source')      ('user',)                                      last_login_ts                                        alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_login_ts                                        minute                           ['JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_login_ts                                        month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_login_ts                                        quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -341,7 +341,7 @@ Model Join-Path                             Entity Links
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_profile_edit_ts                                                     YEAR         ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_profile_edit_ts                                 day                              ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_profile_edit_ts                                 hour                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
-('listings_latest', 'users_ds_source')      ('user',)                                      last_profile_edit_ts                                 martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('listings_latest', 'users_ds_source')      ('user',)                                      last_profile_edit_ts                                 alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_profile_edit_ts                                 millisecond                      ['JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_profile_edit_ts                                 minute                           ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_ds_source')      ('user',)                                      last_profile_edit_ts                                 month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
@@ -356,7 +356,7 @@ Model Join-Path                             Entity Links
 ('listings_latest', 'users_latest')         ('user',)                                      ds_latest                                                                QUARTER      ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_latest')         ('user',)                                      ds_latest                                                                YEAR         ['DATE_PART', 'JOINED']
 ('listings_latest', 'users_latest')         ('user',)                                      ds_latest                                            day                              ['JOINED']
-('listings_latest', 'users_latest')         ('user',)                                      ds_latest                                            martian_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
+('listings_latest', 'users_latest')         ('user',)                                      ds_latest                                            alien_day                      ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_latest')         ('user',)                                      ds_latest                                            month                            ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_latest')         ('user',)                                      ds_latest                                            quarter                          ['DERIVED_TIME_GRANULARITY', 'JOINED']
 ('listings_latest', 'users_latest')         ('user',)                                      ds_latest                                            week                             ['DERIVED_TIME_GRANULARITY', 'JOINED']
diff --git a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_semantic_model_container.py/str/test_linkable_elements_for_measure_multi_hop_model__result0.txt b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_semantic_model_container.py/str/test_linkable_elements_for_measure_multi_hop_model__result0.txt
index 6f7717c3fd..b1cd59bf6b 100644
--- a/metricflow-semantics/tests_metricflow_semantics/snapshots/test_semantic_model_container.py/str/test_linkable_elements_for_measure_multi_hop_model__result0.txt
+++ b/metricflow-semantics/tests_metricflow_semantics/snapshots/test_semantic_model_container.py/str/test_linkable_elements_for_measure_multi_hop_model__result0.txt
@@ -13,7 +13,7 @@ Model Join-Path                                                Entity Links
 ('account_month_txns',)                                        ()                                      metric_time                                 QUARTER      ['DATE_PART', 'METRIC_TIME']
 ('account_month_txns',)                                        ()                                      metric_time                                 YEAR         ['DATE_PART', 'METRIC_TIME']
 ('account_month_txns',)                                        ()                                      metric_time             day                              ['METRIC_TIME']
-('account_month_txns',)                                        ()                                      metric_time             martian_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
+('account_month_txns',)                                        ()                                      metric_time             alien_day                      ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('account_month_txns',)                                        ()                                      metric_time             month                            ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('account_month_txns',)                                        ()                                      metric_time             quarter                          ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
 ('account_month_txns',)                                        ()                                      metric_time             week                             ['DERIVED_TIME_GRANULARITY', 'METRIC_TIME']
@@ -27,7 +27,7 @@ Model Join-Path                                                Entity Links
 ('account_month_txns',)                                        ('account_id',)                         ds                                          QUARTER      ['DATE_PART', 'LOCAL']
 ('account_month_txns',)                                        ('account_id',)                         ds                                          YEAR         ['DATE_PART', 'LOCAL']
 ('account_month_txns',)                                        ('account_id',)                         ds                      day                              ['LOCAL']
-('account_month_txns',)                                        ('account_id',)                         ds                      martian_day                      ['DERIVED_TIME_GRANULARITY', 'LOCAL']
+('account_month_txns',)                                        ('account_id',)                         ds                      alien_day                      ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('account_month_txns',)                                        ('account_id',)                         ds                      month                            ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('account_month_txns',)                                        ('account_id',)                         ds                      quarter                          ['DERIVED_TIME_GRANULARITY', 'LOCAL']
 ('account_month_txns',)                                        ('account_id',)                         ds                      week                             ['DERIVED_TIME_GRANULARITY', 'LOCAL']
diff --git a/metricflow/plan_conversion/to_sql_plan/dataflow_to_subquery.py b/metricflow/plan_conversion/to_sql_plan/dataflow_to_subquery.py
index 83f561d0b9..6a719b4bb9 100644
--- a/metricflow/plan_conversion/to_sql_plan/dataflow_to_subquery.py
+++ b/metricflow/plan_conversion/to_sql_plan/dataflow_to_subquery.py
@@ -1101,9 +1101,9 @@ def visit_metric_time_dimension_transform_node(self, node: MetricTimeDimensionTr
                     spec=metric_time_dimension_spec,
                 )
             )
-            output_column_to_input_column[
-                metric_time_dimension_column_association.column_name
-            ] = matching_time_dimension_instance.associated_column.column_name
+            output_column_to_input_column[metric_time_dimension_column_association.column_name] = (
+                matching_time_dimension_instance.associated_column.column_name
+            )
 
         output_instance_set = InstanceSet(
             measure_instances=tuple(output_measure_instances),
@@ -1890,10 +1890,10 @@ def visit_offset_base_grain_by_custom_grain_node(self, node: OffsetBaseGrainByCu
         WITH cte AS (
           SELECT
             ds AS ds__day
-            , martian_day AS ds__martian_day
-            , FIRST_VALUE(ds) OVER (PARTITION BY martian_day ORDER BY ds) AS ds__martian_day__first_value
-            , LAST_VALUE(ds) OVER (PARTITION BY martian_day ORDER BY ds) AS ds__martian_day__last_value
-            , ROW_NUMBER() OVER (PARTITION BY martian_day ORDER BY ds) AS ds__day__row_number
+            , alien_day AS ds__alien_day
+            , FIRST_VALUE(ds) OVER (PARTITION BY alien_day ORDER BY ds) AS ds__alien_day__first_value
+            , LAST_VALUE(ds) OVER (PARTITION BY alien_day ORDER BY ds) AS ds__alien_day__last_value
+            , ROW_NUMBER() OVER (PARTITION BY alien_day ORDER BY ds) AS ds__day__row_number
           FROM mf_time_spine
         )
 
@@ -1905,29 +1905,29 @@ def visit_offset_base_grain_by_custom_grain_node(self, node: OffsetBaseGrainByCu
           SELECT
             cte.ds__day AS ds__day
             , CASE
-              WHEN ds__martian_day__first_value__offset + INTERVAL (ds__day__row_number - 1) day <= ds__martian_day__last_value__offset
-              THEN ds__martian_day__first_value__offset + INTERVAL (ds__day__row_number - 1) day
+              WHEN ds__alien_day__first_value__offset + INTERVAL (ds__day__row_number - 1) day <= ds__alien_day__last_value__offset
+              THEN ds__alien_day__first_value__offset + INTERVAL (ds__day__row_number - 1) day
               ELSE NULL
             END AS ds__day__lead
           FROM cte
           INNER JOIN (
             SELECT
-              ds__martian_day
-              , LEAD(ds__martian_day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__first_value__offset
-              , LEAD(ds__martian_day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__last_value__offset
+              ds__alien_day
+              , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__offset
+              , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__offset
             FROM (
               SELECT
-                ds__martian_day
-                , ds__martian_day__first_value
-                , ds__martian_day__last_value
+                ds__alien_day
+                , ds__alien_day__first_value
+                , ds__alien_day__last_value
               FROM cte
               GROUP BY
-                ds__martian_day
-                , ds__martian_day__first_value
-                , ds__martian_day__last_value
+                ds__alien_day
+                , ds__alien_day__first_value
+                , ds__alien_day__last_value
             ) a
           ) b
-          ON cte.ds__martian_day = b.ds__martian_day
+          ON cte.ds__alien_day = b.ds__alien_day
         )
 
         Note: if a grain is queried that is smaller than that of the custom grain's base grain, will use that grain in place
diff --git a/tests_metricflow/fixtures/source_table_snapshots/time_spine_table/mf_time_spine.yaml b/tests_metricflow/fixtures/source_table_snapshots/time_spine_table/mf_time_spine.yaml
index fe2e1c0c88..42f5f59ed1 100644
--- a/tests_metricflow/fixtures/source_table_snapshots/time_spine_table/mf_time_spine.yaml
+++ b/tests_metricflow/fixtures/source_table_snapshots/time_spine_table/mf_time_spine.yaml
@@ -7,7 +7,7 @@ table_snapshot:
       type: STRING
     - name: fiscal_year
       type: STRING
-    - name: martian_day
+    - name: alien_day
       type: TIME
 
   rows:
diff --git a/tests_metricflow/integration/query_output/test_fill_nulls_with_0.py b/tests_metricflow/integration/query_output/test_fill_nulls_with_0.py
index 9cb93184b3..48daa4af3f 100644
--- a/tests_metricflow/integration/query_output/test_fill_nulls_with_0.py
+++ b/tests_metricflow/integration/query_output/test_fill_nulls_with_0.py
@@ -282,8 +282,8 @@ def test_join_to_time_spine_with_custom_grain_in_group_by(  # noqa: D103
     query_result = it_helpers.mf_engine.query(
         MetricFlowQueryRequest.create_with_random_request_id(
             metric_names=["bookings_join_to_time_spine"],
-            group_by_names=["booking__ds__martian_day"],
-            order_by_names=["booking__ds__martian_day"],
+            group_by_names=["booking__ds__alien_day"],
+            order_by_names=["booking__ds__alien_day"],
         )
     )
     assert query_result.result_df is not None, "Unexpected empty result."
@@ -312,9 +312,9 @@ def test_join_to_timespine_metric_with_custom_granularity_filter(  # noqa: D103
     query_result = it_helpers.mf_engine.query(
         MetricFlowQueryRequest.create_with_random_request_id(
             metric_names=("bookings_join_to_time_spine",),
-            group_by_names=("metric_time__martian_day",),
-            order_by_names=("metric_time__martian_day",),
-            where_constraints=["{{ TimeDimension('metric_time', 'martian_day') }} = '2020-01-08'"],
+            group_by_names=("metric_time__alien_day",),
+            order_by_names=("metric_time__alien_day",),
+            where_constraints=["{{ TimeDimension('metric_time', 'alien_day') }} = '2020-01-08'"],
         )
     )
     assert query_result.result_df is not None, "Unexpected empty result."
@@ -345,7 +345,7 @@ def test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by
             metric_names=("bookings_join_to_time_spine",),
             group_by_names=("metric_time__day",),
             order_by_names=("metric_time__day",),
-            where_constraints=["{{ TimeDimension('metric_time', 'martian_day') }} = '2020-01-08'"],
+            where_constraints=["{{ TimeDimension('metric_time', 'alien_day') }} = '2020-01-08'"],
         )
     )
     assert query_result.result_df is not None, "Unexpected empty result."
diff --git a/tests_metricflow/integration/query_output/test_offset_metrics.py b/tests_metricflow/integration/query_output/test_offset_metrics.py
index 12fa3b791c..c8f068061c 100644
--- a/tests_metricflow/integration/query_output/test_offset_metrics.py
+++ b/tests_metricflow/integration/query_output/test_offset_metrics.py
@@ -70,12 +70,12 @@ def test_custom_offset_window_with_base_grain(
     sql_client: SqlClient,
     it_helpers: IntegrationTestHelpers,
 ) -> None:
-    """Gives a side by side comparison of bookings and bookings_offset_one_martian_day."""
+    """Gives a side by side comparison of bookings and bookings_offset_one_alien_day."""
     query_result = it_helpers.mf_engine.query(
         MetricFlowQueryRequest.create_with_random_request_id(
-            metric_names=["bookings", "bookings_offset_one_martian_day"],
-            group_by_names=["metric_time__day", "metric_time__martian_day"],
-            order_by_names=["metric_time__day", "metric_time__martian_day"],
+            metric_names=["bookings", "bookings_offset_one_alien_day"],
+            group_by_names=["metric_time__day", "metric_time__alien_day"],
+            order_by_names=["metric_time__day", "metric_time__alien_day"],
         )
     )
     assert query_result.result_df is not None, "Unexpected empty result."
@@ -98,16 +98,16 @@ def test_custom_offset_window_with_grains_and_date_part(  # noqa: D103
 ) -> None:
     query_result = it_helpers.mf_engine.query(
         MetricFlowQueryRequest.create_with_random_request_id(
-            metric_names=["bookings_offset_one_martian_day"],
+            metric_names=["bookings_offset_one_alien_day"],
             group_by=(
                 TimeDimensionParameter(name="booking__ds", grain=TimeGranularity.MONTH.name),
                 TimeDimensionParameter(name="metric_time", date_part=DatePart.YEAR),
-                TimeDimensionParameter(name="metric_time", grain="martian_day"),
+                TimeDimensionParameter(name="metric_time", grain="alien_day"),
             ),
             order_by=(
                 OrderByParameter(TimeDimensionParameter(name="booking__ds", grain=TimeGranularity.MONTH.name)),
                 OrderByParameter(TimeDimensionParameter(name="metric_time", date_part=DatePart.YEAR)),
-                OrderByParameter(TimeDimensionParameter(name="metric_time", grain="martian_day")),
+                OrderByParameter(TimeDimensionParameter(name="metric_time", grain="alien_day")),
             ),
         )
     )
@@ -129,12 +129,12 @@ def test_custom_offset_window_with_matching_custom_grain(
     sql_client: SqlClient,
     it_helpers: IntegrationTestHelpers,
 ) -> None:
-    """Gives a side by side comparison of bookings and bookings_offset_one_martian_day."""
+    """Gives a side by side comparison of bookings and bookings_offset_one_alien_day."""
     query_result = it_helpers.mf_engine.query(
         MetricFlowQueryRequest.create_with_random_request_id(
-            metric_names=["bookings", "bookings_offset_one_martian_day"],
-            group_by_names=["booking__ds__martian_day", "metric_time__martian_day"],
-            order_by_names=["booking__ds__martian_day", "metric_time__martian_day"],
+            metric_names=["bookings", "bookings_offset_one_alien_day"],
+            group_by_names=["booking__ds__alien_day", "metric_time__alien_day"],
+            order_by_names=["booking__ds__alien_day", "metric_time__alien_day"],
         )
     )
     assert query_result.result_df is not None, "Unexpected empty result."
diff --git a/tests_metricflow/integration/query_output/test_query_output.py b/tests_metricflow/integration/query_output/test_query_output.py
index 33029bfe6f..d02f7e5a4a 100644
--- a/tests_metricflow/integration/query_output/test_query_output.py
+++ b/tests_metricflow/integration/query_output/test_query_output.py
@@ -185,10 +185,10 @@ def test_multiple_time_spines(  # noqa: D103
             metric_names=[
                 "subdaily_join_to_time_spine_metric",
                 "subdaily_cumulative_window_metric",
-                "archived_users_offset_1_martian_day",
+                "archived_users_offset_1_alien_day",
             ],
-            group_by_names=["metric_time__martian_day", "metric_time__hour"],
-            order_by_names=["metric_time__martian_day", "metric_time__hour"],
+            group_by_names=["metric_time__alien_day", "metric_time__hour"],
+            order_by_names=["metric_time__alien_day", "metric_time__hour"],
         )
     )
     assert query_result.result_df is not None, "Unexpected empty result."
diff --git a/tests_metricflow/integration/test_cases/itest_granularity.yaml b/tests_metricflow/integration/test_cases/itest_granularity.yaml
index 2aa3b6b90a..ba1ec7abc2 100644
--- a/tests_metricflow/integration/test_cases/itest_granularity.yaml
+++ b/tests_metricflow/integration/test_cases/itest_granularity.yaml
@@ -316,50 +316,50 @@ integration_test:
   description: A simple metric queried with a custom granularity
   model: SIMPLE_MODEL
   metrics: [ "bookings"]
-  group_bys: ["booking__ds__martian_day"]
+  group_bys: ["booking__ds__alien_day"]
   check_query: |
     SELECT
-      b.martian_day AS booking__ds__martian_day
+      b.alien_day AS booking__ds__alien_day
       , SUM(1) AS bookings
     FROM {{ source_schema }}.fct_bookings a
     LEFT OUTER JOIN {{ source_schema }}.mf_time_spine b
     ON {{ render_date_trunc("a.ds", TimeGranularity.DAY) }} = b.ds
-    GROUP BY b.martian_day
+    GROUP BY b.alien_day
 ---
 integration_test:
   name: simple_metric_with_custom_granularity_and_join
   description: A simple metric queried with a custom granularity
   model: SIMPLE_MODEL
   metrics: [ "bookings"]
-  group_bys: ["listing__ds__martian_day"]
+  group_bys: ["listing__ds__alien_day"]
   check_query: |
     SELECT
-      c.martian_day AS listing__ds__martian_day
+      c.alien_day AS listing__ds__alien_day
       , SUM(1) AS bookings
     FROM {{ source_schema }}.fct_bookings a
     LEFT OUTER JOIN {{ source_schema }}.dim_listings_latest l
       ON a.listing_id = l.listing_id
     LEFT OUTER JOIN {{ source_schema }}.mf_time_spine c
       ON {{ render_date_trunc("l.created_at", TimeGranularity.DAY) }} = c.ds
-    GROUP BY c.martian_day
+    GROUP BY c.alien_day
 ---
 integration_test:
   name: cumulative_metric_with_custom_granularity
   description: A cumulative metric queried with a custom granularity
   model: SIMPLE_MODEL
   metrics: [ "trailing_2_months_revenue"]
-  group_bys: ["metric_time__martian_day"]
+  group_bys: ["metric_time__alien_day"]
   check_query: |
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , trailing_2_months_revenue
     FROM (
       SELECT
-        metric_time__martian_day
-        , AVG(txn_revenue) OVER (PARTITION BY metric_time__martian_day) AS trailing_2_months_revenue
+        metric_time__alien_day
+        , AVG(txn_revenue) OVER (PARTITION BY metric_time__alien_day) AS trailing_2_months_revenue
       FROM (
         SELECT
-          ts2.martian_day AS metric_time__martian_day
+          ts2.alien_day AS metric_time__alien_day
           , ts.ds AS metric_time__day
           , SUM(r.revenue) AS txn_revenue
         FROM {{ source_schema }}.mf_time_spine ts
@@ -368,47 +368,47 @@ integration_test:
           AND ({{ render_date_trunc("r.created_at", TimeGranularity.DAY) }} > {{ render_date_sub("ts", "ds", 2, TimeGranularity.MONTH) }})
         LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts2
           ON ts.ds = ts2.ds
-        GROUP BY ts2.martian_day, ts.ds
+        GROUP BY ts2.alien_day, ts.ds
       ) ts
     ) subq_9
-    GROUP BY metric_time__martian_day, trailing_2_months_revenue
+    GROUP BY metric_time__alien_day, trailing_2_months_revenue
 ---
 integration_test:
   name: derived_offset_metric_with_custom_granularity
   description: A derived metric queried with a custom granularity
   model: SIMPLE_MODEL
   metrics: [ "booking_fees_last_week_per_booker_this_week"]
-  group_bys: ["metric_time__martian_day"]
+  group_bys: ["metric_time__alien_day"]
   check_query: |
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , booking_value * 0.05 / bookers AS booking_fees_last_week_per_booker_this_week
     FROM (
       SELECT
-        COALESCE(subq_8.metric_time__martian_day, subq_14.metric_time__martian_day) AS metric_time__martian_day
+        COALESCE(subq_8.metric_time__alien_day, subq_14.metric_time__alien_day) AS metric_time__alien_day
         , MAX(subq_8.booking_value) AS booking_value
         , MAX(subq_14.bookers) AS bookers
       FROM (
         SELECT
-          ts2.martian_day AS metric_time__martian_day
+          ts2.alien_day AS metric_time__alien_day
           , SUM(b.booking_value) AS booking_value
         FROM {{ source_schema }}.mf_time_spine ts
         INNER JOIN {{ source_schema }}.fct_bookings b
           ON {{ render_date_sub("ts", "ds", 1, TimeGranularity.WEEK) }} = {{ render_date_trunc("b.ds", TimeGranularity.DAY) }}
         LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts2 ON ts.ds = ts2.ds
-        GROUP BY ts2.martian_day
+        GROUP BY ts2.alien_day
       ) subq_8
       FULL OUTER JOIN (
         SELECT
-          ts3.martian_day AS metric_time__martian_day
+          ts3.alien_day AS metric_time__alien_day
           , COUNT(DISTINCT b.guest_id) AS bookers
         FROM {{ source_schema }}.fct_bookings b
         LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts3
           ON {{ render_date_trunc("b.ds", TimeGranularity.DAY) }} = ts3.ds
-        GROUP BY ts3.martian_day
+        GROUP BY ts3.alien_day
       ) subq_14
-      ON subq_8.metric_time__martian_day = subq_14.metric_time__martian_day
-      GROUP BY COALESCE(subq_8.metric_time__martian_day, subq_14.metric_time__martian_day)
+      ON subq_8.metric_time__alien_day = subq_14.metric_time__alien_day
+      GROUP BY COALESCE(subq_8.metric_time__alien_day, subq_14.metric_time__alien_day)
     ) subq_15
 ---
 integration_test:
@@ -416,38 +416,38 @@ integration_test:
   description: A derived metric queried with a custom granularity
   model: SIMPLE_MODEL
   metrics: [ "bookings", "listings"]
-  group_bys: ["metric_time__martian_day", "listing__ds__month"]
+  group_bys: ["metric_time__alien_day", "listing__ds__month"]
   check_query: |
     SELECT
-      COALESCE(subq_10.metric_time__martian_day, subq_16.metric_time__martian_day) AS metric_time__martian_day
+      COALESCE(subq_10.metric_time__alien_day, subq_16.metric_time__alien_day) AS metric_time__alien_day
       , COALESCE(subq_10.listing__ds__month, subq_16.listing__ds__month) AS listing__ds__month
       , MAX(subq_10.bookings) AS bookings
       , MAX(subq_16.listings) AS listings
     FROM (
       SELECT
-        ts.martian_day AS metric_time__martian_day
+        ts.alien_day AS metric_time__alien_day
         , {{ render_date_trunc("l.created_at", TimeGranularity.MONTH) }} AS listing__ds__month
         , SUM(1) AS bookings
       FROM {{ source_schema }}.fct_bookings b
       LEFT OUTER JOIN {{ source_schema }}.dim_listings_latest l ON b.listing_id = l.listing_id
       LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts
         ON {{ render_date_trunc("b.ds", TimeGranularity.DAY) }} = ts.ds
-      GROUP BY ts.martian_day, {{ render_date_trunc("l.created_at", TimeGranularity.MONTH) }}
+      GROUP BY ts.alien_day, {{ render_date_trunc("l.created_at", TimeGranularity.MONTH) }}
     ) subq_10
     FULL OUTER JOIN (
       SELECT
-        ts.martian_day AS metric_time__martian_day
+        ts.alien_day AS metric_time__alien_day
         , {{ render_date_trunc("l.created_at", TimeGranularity.MONTH) }} AS listing__ds__month
         , SUM(1) AS listings
       FROM {{ source_schema }}.dim_listings_latest l
       LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts
         ON {{ render_date_trunc("l.created_at", TimeGranularity.DAY) }} = ts.ds
-      GROUP BY ts.martian_day, {{ render_date_trunc("l.created_at", TimeGranularity.MONTH) }}
+      GROUP BY ts.alien_day, {{ render_date_trunc("l.created_at", TimeGranularity.MONTH) }}
     ) subq_16
-    ON (subq_10.metric_time__martian_day = subq_16.metric_time__martian_day)
+    ON (subq_10.metric_time__alien_day = subq_16.metric_time__alien_day)
       AND (subq_10.listing__ds__month = subq_16.listing__ds__month)
     GROUP BY
-      COALESCE(subq_10.metric_time__martian_day, subq_16.metric_time__martian_day)
+      COALESCE(subq_10.metric_time__alien_day, subq_16.metric_time__alien_day)
       , COALESCE(subq_10.listing__ds__month, subq_16.listing__ds__month)
 ---
 integration_test:
@@ -456,33 +456,33 @@ integration_test:
   model: SIMPLE_MODEL
   metrics: ["bookings"]
   where_filter: |
-    {{ render_time_constraint(render_time_dimension_template('listing__ds', 'martian_day'), start_time="2019-12-20") }}
+    {{ render_time_constraint(render_time_dimension_template('listing__ds', 'alien_day'), start_time="2019-12-20") }}
   check_query: |
     SELECT
       SUM(1) AS bookings
     FROM {{ source_schema }}.fct_bookings b
     LEFT OUTER JOIN {{ source_schema }}.dim_listings_latest l ON b.listing_id = l.listing_id
     LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts ON {{ render_date_trunc("l.created_at", TimeGranularity.DAY) }} = ts.ds
-    WHERE {{ render_time_constraint("ts.martian_day", start_time="2019-12-20") }}
+    WHERE {{ render_time_constraint("ts.alien_day", start_time="2019-12-20") }}
 ---
 integration_test:
   name: simple_metric_with_custom_granularity_in_filter_and_group_by
   description: Simple metric queried with a filter on a custom grain, where that grain is also used in the group by.
   model: SIMPLE_MODEL
   metrics: ["bookings"]
-  group_bys: ["listing__ds__martian_day"]
+  group_bys: ["listing__ds__alien_day"]
   where_filter: |
-    {{ render_time_constraint(render_time_dimension_template('listing__ds', 'martian_day'), start_time="2019-12-20") }}
+    {{ render_time_constraint(render_time_dimension_template('listing__ds', 'alien_day'), start_time="2019-12-20") }}
   check_query: |
     SELECT
-      ts.martian_day AS listing__ds__martian_day
+      ts.alien_day AS listing__ds__alien_day
       , SUM(1) AS bookings
     FROM {{ source_schema }}.fct_bookings b
     LEFT OUTER JOIN {{ source_schema }}.dim_listings_latest l ON b.listing_id = l.listing_id
     LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts
     ON {{ render_date_trunc("l.created_at", TimeGranularity.DAY) }} = ts.ds
-    WHERE {{ render_time_constraint("ts.martian_day", start_time="2019-12-20") }}
-    GROUP BY ts.martian_day
+    WHERE {{ render_time_constraint("ts.alien_day", start_time="2019-12-20") }}
+    GROUP BY ts.alien_day
 ---
 integration_test:
   name: test_no_metrics_with_custom_granularity_filter
@@ -490,7 +490,7 @@ integration_test:
   model: SIMPLE_MODEL
   group_bys: ["metric_time__day"]
   where_filter: |
-    {{ render_time_constraint(render_time_dimension_template('listing__ds', 'martian_day'), start_time="2019-12-20") }}
+    {{ render_time_constraint(render_time_dimension_template('listing__ds', 'alien_day'), start_time="2019-12-20") }}
   check_query: |
     SELECT
       {{ render_date_trunc("ts.ds", TimeGranularity.DAY) }} AS metric_time__day
@@ -498,34 +498,34 @@ integration_test:
     CROSS JOIN {{ source_schema }}.mf_time_spine ts
     LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts2
     ON {{ render_date_trunc("l.created_at", TimeGranularity.DAY) }} = ts2.ds
-    WHERE {{ render_time_constraint("ts2.martian_day", start_time="2019-12-20") }}
+    WHERE {{ render_time_constraint("ts2.alien_day", start_time="2019-12-20") }}
     GROUP BY {{ render_date_trunc("ts.ds", TimeGranularity.DAY) }}
 ---
 integration_test:
   name: test_no_metrics_with_custom_granularity_in_filter_and_group_by
   description: Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
   model: SIMPLE_MODEL
-  group_bys: ["listing__ds__martian_day"]
+  group_bys: ["listing__ds__alien_day"]
   where_filter: |
-    {{ render_time_constraint(render_time_dimension_template('listing__ds', 'martian_day'), start_time="2019-12-20") }}
+    {{ render_time_constraint(render_time_dimension_template('listing__ds', 'alien_day'), start_time="2019-12-20") }}
   check_query: |
     SELECT
-      ts.martian_day AS listing__ds__martian_day
+      ts.alien_day AS listing__ds__alien_day
     FROM {{ source_schema }}.dim_listings_latest l
     LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts
       ON {{ render_date_trunc("l.created_at", TimeGranularity.DAY) }} = ts.ds
-    WHERE {{ render_time_constraint("ts.martian_day", start_time="2019-12-20") }}
-    GROUP BY ts.martian_day
+    WHERE {{ render_time_constraint("ts.alien_day", start_time="2019-12-20") }}
+    GROUP BY ts.alien_day
 ---
 integration_test:
   name: test_simple_metric_with_multi_hop_custom_granularity
   description: Test querying a simple metric with a custom grain on a multi-hop dimension
   model: SIMPLE_MODEL
   metrics: ["bookings"]
-  group_bys: ["listing__user__ds__martian_day"]
+  group_bys: ["listing__user__ds__alien_day"]
   check_query: |
     SELECT
-      ts.martian_day AS listing__user__ds__martian_day
+      ts.alien_day AS listing__user__ds__alien_day
       , SUM(1) AS bookings
     FROM {{ source_schema }}.fct_bookings b
     LEFT OUTER JOIN {{ source_schema }}.dim_listings_latest l
@@ -533,7 +533,7 @@ integration_test:
     LEFT OUTER JOIN {{ source_schema }}.dim_users u ON l.user_id = u.user_id
       AND {{ render_date_trunc("b.ds_partitioned", TimeGranularity.DAY) }} = {{ render_date_trunc("u.ds_partitioned", TimeGranularity.DAY) }}
     LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts ON {{ render_date_trunc("u.ds", TimeGranularity.DAY) }} = ts.ds
-    GROUP BY ts.martian_day
+    GROUP BY ts.alien_day
 ---
 integration_test:
   name: test_offset_metric_with_custom_granularity_filter_not_in_group_by
@@ -542,7 +542,7 @@ integration_test:
   metrics: ["bookings_5_day_lag"]
   group_bys: ["metric_time__day"]
   where_filter: |
-    {{ render_time_constraint(render_time_dimension_template('metric_time', 'martian_day'), start_time="2020-01-01") }}
+    {{ render_time_constraint(render_time_dimension_template('metric_time', 'alien_day'), start_time="2020-01-01") }}
   check_query: |
     SELECT
       ts.ds AS metric_time__day
@@ -550,7 +550,7 @@ integration_test:
     FROM {{ source_schema }}.mf_time_spine ts
     INNER JOIN {{ source_schema }}.fct_bookings b ON {{ render_date_sub("ts", "ds", 5, TimeGranularity.DAY) }} = {{ render_date_trunc("b.ds", TimeGranularity.DAY) }}
     LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts1 ON ts.ds = ts1.ds
-    WHERE {{ render_time_constraint("ts1.martian_day", "2020-01-01") }}
+    WHERE {{ render_time_constraint("ts1.alien_day", "2020-01-01") }}
     GROUP BY ts.ds
 ---
 integration_test:
@@ -558,27 +558,27 @@ integration_test:
   description: Test querying a conversion metric with a custom grain
   model: SIMPLE_MODEL
   metrics: ["visit_buy_conversion_rate"]
-  group_bys: ["metric_time__martian_day"]
+  group_bys: ["metric_time__alien_day"]
   check_query: |
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , CAST(buys AS {{ double_data_type_name }}) / CAST(NULLIF(visits, 0) AS {{ double_data_type_name }}) AS visit_buy_conversion_rate
     FROM (
       SELECT
-        COALESCE(subq_5.metric_time__martian_day, subq_17.metric_time__martian_day) AS metric_time__martian_day
+        COALESCE(subq_5.metric_time__alien_day, subq_17.metric_time__alien_day) AS metric_time__alien_day
         , MAX(subq_5.visits) AS visits
         , MAX(subq_17.buys) AS buys
       FROM (
         SELECT
-          ts.martian_day AS metric_time__martian_day
+          ts.alien_day AS metric_time__alien_day
           , SUM(1) AS visits
         FROM {{ source_schema }}.fct_visits v
         LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts ON {{ render_date_trunc("V.ds", TimeGranularity.DAY) }} = ts.ds
-        GROUP BY ts.martian_day
+        GROUP BY ts.alien_day
       ) subq_5
       FULL OUTER JOIN (
         SELECT
-          ts2.martian_day AS metric_time__martian_day
+          ts2.alien_day AS metric_time__alien_day
           , SUM(subq_12.buys) AS buys
         FROM (
           SELECT DISTINCT
@@ -623,10 +623,10 @@ integration_test:
           ON subq_8.user = subq_11.user AND subq_8.ds__day <= subq_11.ds__day
         ) subq_12
         LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts2 ON subq_12.metric_time__day = ts2.ds
-        GROUP BY ts2.martian_day
+        GROUP BY ts2.alien_day
       ) subq_17
-      ON subq_5.metric_time__martian_day = subq_17.metric_time__martian_day
-      GROUP BY COALESCE(subq_5.metric_time__martian_day, subq_17.metric_time__martian_day)
+      ON subq_5.metric_time__alien_day = subq_17.metric_time__alien_day
+      GROUP BY COALESCE(subq_5.metric_time__alien_day, subq_17.metric_time__alien_day)
     ) subq_18
 ---
 integration_test:
@@ -634,27 +634,27 @@ integration_test:
   description: Test querying a windowed conversion metric with a custom grain
   model: SIMPLE_MODEL
   metrics: ["visit_buy_conversion_rate_7days"]
-  group_bys: ["metric_time__martian_day"]
+  group_bys: ["metric_time__alien_day"]
   check_query: |
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , CAST(buys AS {{ double_data_type_name }}) / CAST(NULLIF(visits, 0) AS {{ double_data_type_name }}) AS visit_buy_conversion_rate_7days
     FROM (
       SELECT
-        COALESCE(subq_5.metric_time__martian_day, subq_17.metric_time__martian_day) AS metric_time__martian_day
+        COALESCE(subq_5.metric_time__alien_day, subq_17.metric_time__alien_day) AS metric_time__alien_day
         , MAX(subq_5.visits) AS visits
         , MAX(subq_17.buys) AS buys
       FROM (
         SELECT
-          ts.martian_day AS metric_time__martian_day
+          ts.alien_day AS metric_time__alien_day
           , SUM(1) AS visits
         FROM {{ source_schema }}.fct_visits v
         LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts ON {{ render_date_trunc("V.ds", TimeGranularity.DAY) }} = ts.ds
-        GROUP BY ts.martian_day
+        GROUP BY ts.alien_day
       ) subq_5
       FULL OUTER JOIN (
         SELECT
-          ts2.martian_day AS metric_time__martian_day
+          ts2.alien_day AS metric_time__alien_day
           , SUM(subq_12.buys) AS buys
         FROM (
           SELECT DISTINCT
@@ -702,10 +702,10 @@ integration_test:
         ) subq_12
         LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts2
         ON subq_12.metric_time__day = ts2.ds
-        GROUP BY ts2.martian_day
+        GROUP BY ts2.alien_day
       ) subq_17
-      ON subq_5.metric_time__martian_day = subq_17.metric_time__martian_day
-      GROUP BY COALESCE(subq_5.metric_time__martian_day, subq_17.metric_time__martian_day)
+      ON subq_5.metric_time__alien_day = subq_17.metric_time__alien_day
+      GROUP BY COALESCE(subq_5.metric_time__alien_day, subq_17.metric_time__alien_day)
     ) subq_18
 ---
 integration_test:
@@ -713,26 +713,26 @@ integration_test:
   description: Test querying a conversion metric with a custom grain in the filter (also in group by)
   model: SIMPLE_MODEL
   metrics: ["visit_buy_conversion_rate"]
-  group_bys: ["metric_time__martian_day"]
+  group_bys: ["metric_time__alien_day"]
   where_filter: |
-    {{ render_time_constraint(render_time_dimension_template('metric_time', 'martian_day'), start_time="2019-12-20") }}
+    {{ render_time_constraint(render_time_dimension_template('metric_time', 'alien_day'), start_time="2019-12-20") }}
   check_query: |
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , CAST(buys AS {{ double_data_type_name }}) / CAST(NULLIF(visits, 0) AS {{ double_data_type_name }}) AS visit_buy_conversion_rate
     FROM (
       SELECT
-        COALESCE(subq_6.metric_time__martian_day, subq_19.metric_time__martian_day) AS metric_time__martian_day
+        COALESCE(subq_6.metric_time__alien_day, subq_19.metric_time__alien_day) AS metric_time__alien_day
         , MAX(subq_6.visits) AS visits
         , MAX(subq_19.buys) AS buys
       FROM (
         SELECT
-          metric_time__martian_day
+          metric_time__alien_day
           , SUM(visits) AS visits
         FROM (
           SELECT
             subq_1.visits AS visits
-            , subq_2.martian_day AS metric_time__martian_day
+            , subq_2.alien_day AS metric_time__alien_day
           FROM (
             SELECT
               {{ render_date_trunc("ds", TimeGranularity.DAY) }} AS metric_time__day
@@ -744,13 +744,13 @@ integration_test:
           ON
             subq_1.metric_time__day = subq_2.ds
         ) subq_3
-        WHERE CAST(metric_time__martian_day AS TIMESTAMP) >= CAST('2019-12-20' AS TIMESTAMP)
+        WHERE CAST(metric_time__alien_day AS TIMESTAMP) >= CAST('2019-12-20' AS TIMESTAMP)
         GROUP BY
-          metric_time__martian_day
+          metric_time__alien_day
       ) subq_6
       FULL OUTER JOIN (
         SELECT
-          metric_time__martian_day
+          metric_time__alien_day
           , SUM(buys) AS buys
         FROM (
           SELECT DISTINCT
@@ -762,14 +762,14 @@ integration_test:
               ORDER BY subq_11.ds__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_11.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_11.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_14.user
                 , subq_14.ds__day
                 , subq_14.mf_internal_uuid
               ORDER BY subq_11.ds__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_11.ds__day) OVER (
               PARTITION BY
                 subq_14.user
@@ -798,7 +798,7 @@ integration_test:
             , subq_14.buys AS buys
           FROM (
             SELECT
-              metric_time__martian_day
+              metric_time__alien_day
               , ds__day
               , metric_time__day
               , subq_9.user
@@ -809,7 +809,7 @@ integration_test:
                 , subq_7.ds__day AS metric_time__day
                 , subq_7.user AS user
                 , subq_7.visits AS visits
-                , subq_8.martian_day AS metric_time__martian_day
+                , subq_8.alien_day AS metric_time__alien_day
               FROM (
                 SELECT
                   1 AS visits
@@ -822,7 +822,7 @@ integration_test:
               ON
                 subq_7.ds__day = subq_8.ds
             ) subq_9
-            WHERE CAST(metric_time__martian_day AS TIMESTAMP) >= CAST('2019-12-20' AS TIMESTAMP)
+            WHERE CAST(metric_time__alien_day AS TIMESTAMP) >= CAST('2019-12-20' AS TIMESTAMP)
           ) subq_11
           INNER JOIN (
             SELECT
@@ -840,12 +840,12 @@ integration_test:
             )
         ) subq_15
         GROUP BY
-          metric_time__martian_day
+          metric_time__alien_day
       ) subq_19
       ON
-        subq_6.metric_time__martian_day = subq_19.metric_time__martian_day
+        subq_6.metric_time__alien_day = subq_19.metric_time__alien_day
       GROUP BY
-        COALESCE(subq_6.metric_time__martian_day, subq_19.metric_time__martian_day)
+        COALESCE(subq_6.metric_time__alien_day, subq_19.metric_time__alien_day)
     ) subq_20
 ---
 integration_test:
@@ -854,7 +854,7 @@ integration_test:
   model: SIMPLE_MODEL
   metrics: ["visit_buy_conversion_rate"]
   where_filter: |
-    {{ render_time_constraint(render_time_dimension_template('metric_time', 'martian_day'), start_time="2019-12-20") }}
+    {{ render_time_constraint(render_time_dimension_template('metric_time', 'alien_day'), start_time="2019-12-20") }}
   check_query: |
     SELECT
       CAST(MAX(subq_18.buys) AS {{ double_data_type_name }}) / CAST(NULLIF(MAX(subq_6.visits), 0) AS {{ double_data_type_name }}) AS visit_buy_conversion_rate
@@ -863,7 +863,7 @@ integration_test:
         SUM(1) AS visits
       FROM {{ source_schema }}.fct_visits v1
       LEFT OUTER JOIN {{ source_schema }}.mf_time_spine ts ON {{ render_date_trunc("v1.ds", TimeGranularity.DAY) }} = ts.ds
-      WHERE CAST(ts.martian_day AS TIMESTAMP) >= CAST('2019-12-20' AS TIMESTAMP)
+      WHERE CAST(ts.alien_day AS TIMESTAMP) >= CAST('2019-12-20' AS TIMESTAMP)
     ) subq_6
     CROSS JOIN (
       SELECT
@@ -878,14 +878,14 @@ integration_test:
             ORDER BY subq_11.ds__day DESC
             ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
           ) AS visits
-          , FIRST_VALUE(subq_11.metric_time__martian_day) OVER (
+          , FIRST_VALUE(subq_11.metric_time__alien_day) OVER (
             PARTITION BY
               subq_14.user
               , subq_14.ds__day
               , subq_14.mf_internal_uuid
             ORDER BY subq_11.ds__day DESC
             ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-          ) AS metric_time__martian_day
+          ) AS metric_time__alien_day
           , FIRST_VALUE(subq_11.ds__day) OVER (
             PARTITION BY
               subq_14.user
@@ -918,10 +918,10 @@ integration_test:
             , {{ render_date_trunc("v2.ds", TimeGranularity.DAY) }} AS metric_time__day
             , v2.user_id AS user
             , 1 AS visits
-            , subq_8.martian_day AS metric_time__martian_day
+            , subq_8.alien_day AS metric_time__alien_day
           FROM {{ source_schema }}.fct_visits v2
           LEFT OUTER JOIN {{ source_schema }}.mf_time_spine subq_8 ON {{ render_date_trunc("v2.ds", TimeGranularity.DAY) }} = subq_8.ds
-          WHERE CAST(subq_8.martian_day AS TIMESTAMP) >= CAST('2019-12-20' AS TIMESTAMP)
+          WHERE CAST(subq_8.alien_day AS TIMESTAMP) >= CAST('2019-12-20' AS TIMESTAMP)
         ) subq_11
         INNER JOIN (
           SELECT
@@ -940,51 +940,51 @@ integration_test:
   description: Test a join to time spine metric with custom grain in group by
   model: SIMPLE_MODEL
   metrics: ["bookings_join_to_time_spine"]
-  group_bys: ["metric_time__martian_day"]
+  group_bys: ["metric_time__alien_day"]
   check_query: |
     SELECT
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
       , subq_5.bookings AS bookings_join_to_time_spine
     FROM (
       SELECT
-        martian_day AS metric_time__martian_day
+        alien_day AS metric_time__alien_day
       FROM {{ source_schema }}.mf_time_spine subq_7
-      GROUP BY martian_day
+      GROUP BY alien_day
     ) subq_6
     LEFT OUTER JOIN (
       SELECT
-        subq_2.martian_day AS metric_time__martian_day
+        subq_2.alien_day AS metric_time__alien_day
         , SUM(1) AS bookings
       FROM {{ source_schema }}.fct_bookings b
       LEFT OUTER JOIN {{ source_schema }}.mf_time_spine subq_2
       ON {{ render_date_trunc("b.ds", TimeGranularity.DAY) }} = subq_2.ds
-      GROUP BY subq_2.martian_day
+      GROUP BY subq_2.alien_day
     ) subq_5
-    ON subq_6.metric_time__martian_day = subq_5.metric_time__martian_day
+    ON subq_6.metric_time__alien_day = subq_5.metric_time__alien_day
 ---
 integration_test:
   name: custom_offset_window
   description: Test querying a metric with a custom offset window
   model: SIMPLE_MODEL
-  metrics: ["bookings_offset_one_martian_day"]
+  metrics: ["bookings_offset_one_alien_day"]
   group_bys: ["metric_time__day"]
   check_query: |
     WITH cte AS (
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS ds__martian_day__first_value
+        ) AS ds__alien_day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS ds__martian_day__last_value
+        ) AS ds__alien_day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM {{ source_schema }}.mf_time_spine ts
@@ -992,34 +992,34 @@ integration_test:
 
     SELECT
       subq_8.ds__day__lead AS metric_time__day
-      , SUM(1) AS bookings_offset_one_martian_day
+      , SUM(1) AS bookings_offset_one_alien_day
     FROM (
       SELECT
         cte.ds__day AS ds__day
         , CASE
-          WHEN {{ render_date_add("subq_7.ds__martian_day__first_value__offset", "(cte.ds__day__row_number - 1)", TimeGranularity.DAY) }} <= subq_7.ds__martian_day__last_value__offset
-            THEN {{ render_date_add("subq_7.ds__martian_day__first_value__offset", "(cte.ds__day__row_number - 1)", TimeGranularity.DAY) }}
-          ELSE subq_7.ds__martian_day__last_value__offset
+          WHEN {{ render_date_add("subq_7.ds__alien_day__first_value__offset", "(cte.ds__day__row_number - 1)", TimeGranularity.DAY) }} <= subq_7.ds__alien_day__last_value__offset
+            THEN {{ render_date_add("subq_7.ds__alien_day__first_value__offset", "(cte.ds__day__row_number - 1)", TimeGranularity.DAY) }}
+          ELSE subq_7.ds__alien_day__last_value__offset
         END AS ds__day__lead
       FROM cte
       INNER JOIN (
         SELECT
-          ds__martian_day
-          , LEAD(ds__martian_day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__first_value__offset
-          , LEAD(ds__martian_day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__last_value__offset
+          ds__alien_day
+          , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__offset
+          , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__offset
         FROM (
           SELECT
-            ds__martian_day__first_value
-            , ds__martian_day__last_value
-            , ds__martian_day
+            ds__alien_day__first_value
+            , ds__alien_day__last_value
+            , ds__alien_day
           FROM cte
           GROUP BY
-            ds__martian_day__first_value
-            , ds__martian_day__last_value
-            , ds__martian_day
+            ds__alien_day__first_value
+            , ds__alien_day__last_value
+            , ds__alien_day
         ) subq_5
       ) subq_7
-      ON cte.ds__martian_day = subq_7.ds__martian_day
+      ON cte.ds__alien_day = subq_7.ds__alien_day
     ) subq_8
     INNER JOIN {{ source_schema }}.fct_bookings b ON subq_8.ds__day = {{ render_date_trunc("b.ds", TimeGranularity.DAY) }}
     GROUP BY subq_8.ds__day__lead
@@ -1028,66 +1028,66 @@ integration_test:
   name: custom_offset_window_with_grain_and_date_part
   description: Test querying a metric with a custom offset window
   model: SIMPLE_MODEL
-  metrics: ["bookings_offset_one_martian_day"]
-  group_by_objs: [{"name": "booking__ds", "grain": "week"}, {"name": "metric_time", "date_part": "month"}, {"name": "booking__ds", "grain": "martian_day"}]
+  metrics: ["bookings_offset_one_alien_day"]
+  group_by_objs: [{"name": "booking__ds", "grain": "week"}, {"name": "metric_time", "date_part": "month"}, {"name": "booking__ds", "grain": "alien_day"}]
   check_query: |
     WITH cte AS (
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS ds__martian_day__first_value
+        ) AS ds__alien_day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS ds__martian_day__last_value
+        ) AS ds__alien_day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM {{ source_schema }}.mf_time_spine ts
     )
 
     SELECT
-      subq_11.martian_day AS booking__ds__martian_day
+      subq_11.alien_day AS booking__ds__alien_day
       , {{ render_date_trunc("subq_8.ds__day__lead", TimeGranularity.WEEK) }} AS booking__ds__week
       , {{ render_extract("subq_8.ds__day__lead", DatePart.MONTH) }} AS metric_time__extract_month
-      , SUM(1) AS bookings_offset_one_martian_day
+      , SUM(1) AS bookings_offset_one_alien_day
     FROM (
       SELECT
         cte.ds__day
         , CASE
-          WHEN {{ render_date_add("subq_7.ds__martian_day__first_value__offset", "(cte.ds__day__row_number - 1)", TimeGranularity.DAY) }} <= subq_7.ds__martian_day__last_value__offset
-            THEN {{ render_date_add("subq_7.ds__martian_day__first_value__offset", "(cte.ds__day__row_number - 1)", TimeGranularity.DAY) }}
-          ELSE subq_7.ds__martian_day__last_value__offset
+          WHEN {{ render_date_add("subq_7.ds__alien_day__first_value__offset", "(cte.ds__day__row_number - 1)", TimeGranularity.DAY) }} <= subq_7.ds__alien_day__last_value__offset
+            THEN {{ render_date_add("subq_7.ds__alien_day__first_value__offset", "(cte.ds__day__row_number - 1)", TimeGranularity.DAY) }}
+          ELSE subq_7.ds__alien_day__last_value__offset
         END AS ds__day__lead
       FROM cte
       INNER JOIN (
         SELECT
-          ds__martian_day
-          , LEAD(ds__martian_day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__first_value__offset
-          , LEAD(ds__martian_day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__last_value__offset
+          ds__alien_day
+          , LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__offset
+          , LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__offset
         FROM (
           SELECT
-            ds__martian_day__first_value
-            , ds__martian_day__last_value
-            , ds__martian_day
+            ds__alien_day__first_value
+            , ds__alien_day__last_value
+            , ds__alien_day
           FROM cte
           GROUP BY
-            ds__martian_day__first_value
-            , ds__martian_day__last_value
-            , ds__martian_day
+            ds__alien_day__first_value
+            , ds__alien_day__last_value
+            , ds__alien_day
         ) subq_5
       ) subq_7
-      ON cte.ds__martian_day = subq_7.ds__martian_day
+      ON cte.ds__alien_day = subq_7.ds__alien_day
     ) subq_8
     INNER JOIN {{ source_schema }}.fct_bookings b ON subq_8.ds__day = {{ render_date_trunc("b.ds", TimeGranularity.DAY) }}
     LEFT OUTER JOIN {{ source_schema }}.mf_time_spine subq_11 ON subq_8.ds__day__lead = subq_11.ds
     GROUP BY
-      subq_11.martian_day
+      subq_11.alien_day
       , {{ render_date_trunc("subq_8.ds__day__lead", TimeGranularity.WEEK) }}
       , {{ render_extract("subq_8.ds__day__lead", DatePart.MONTH) }}
diff --git a/tests_metricflow/plan_conversion/test_dataflow_to_sql_plan.py b/tests_metricflow/plan_conversion/test_dataflow_to_sql_plan.py
index 25ab6615ed..261a7abe07 100644
--- a/tests_metricflow/plan_conversion/test_dataflow_to_sql_plan.py
+++ b/tests_metricflow/plan_conversion/test_dataflow_to_sql_plan.py
@@ -719,7 +719,7 @@ def test_offset_by_custom_granularity_node(  # noqa: D103
     sql_client: SqlClient,
 ) -> None:
     offset_base_grain_by_custom_grain_node = dataflow_plan_builder.build_custom_offset_time_spine_node(
-        offset_window=PydanticMetricTimeWindow(count=3, granularity="martian_day"),
+        offset_window=PydanticMetricTimeWindow(count=3, granularity="alien_day"),
         required_time_spine_specs=(
             DataSet.metric_time_dimension_spec(ExpandedTimeGranularity.from_time_granularity(TimeGranularity.MONTH)),
         ),
@@ -749,7 +749,7 @@ def test_offset_by_custom_granularity_node_with_smaller_grain(  # noqa: D103
         DataSet.metric_time_dimension_spec(ExpandedTimeGranularity.from_time_granularity(TimeGranularity.HOUR)),
     )
     offset_base_grain_by_custom_grain_node = dataflow_plan_builder.build_custom_offset_time_spine_node(
-        offset_window=PydanticMetricTimeWindow(count=5, granularity="martian_day"),
+        offset_window=PydanticMetricTimeWindow(count=5, granularity="alien_day"),
         required_time_spine_specs=time_spine_specs,
         use_offset_custom_granularity_node=False,
         required_time_spine_sources=dataflow_plan_builder.choose_time_spine_sources(time_spine_specs),
@@ -774,10 +774,10 @@ def test_offset_custom_granularity_node(  # noqa: D103
     sql_client: SqlClient,
 ) -> None:
     offset_base_grain_by_custom_grain_node = dataflow_plan_builder.build_custom_offset_time_spine_node(
-        offset_window=PydanticMetricTimeWindow(count=3, granularity="martian_day"),
+        offset_window=PydanticMetricTimeWindow(count=3, granularity="alien_day"),
         required_time_spine_specs=(
             DataSet.metric_time_dimension_spec(
-                ExpandedTimeGranularity(name="martian_day", base_granularity=TimeGranularity.DAY)
+                ExpandedTimeGranularity(name="alien_day", base_granularity=TimeGranularity.DAY)
             ),
         ),
         use_offset_custom_granularity_node=True,
diff --git a/tests_metricflow/query_rendering/test_custom_granularity.py b/tests_metricflow/query_rendering/test_custom_granularity.py
index caac64499f..11fc0e4a05 100644
--- a/tests_metricflow/query_rendering/test_custom_granularity.py
+++ b/tests_metricflow/query_rendering/test_custom_granularity.py
@@ -29,16 +29,16 @@
 metric_time_with_custom_grain = TimeDimensionSpec(
     "metric_time",
     entity_links=(),
-    time_granularity=ExpandedTimeGranularity(name="martian_day", base_granularity=TimeGranularity.DAY),
+    time_granularity=ExpandedTimeGranularity(name="alien_day", base_granularity=TimeGranularity.DAY),
 )
 normal_time_dim_with_custom_grain1 = TimeDimensionSpec(
     element_name="ds",
-    time_granularity=ExpandedTimeGranularity(name="martian_day", base_granularity=TimeGranularity.DAY),
+    time_granularity=ExpandedTimeGranularity(name="alien_day", base_granularity=TimeGranularity.DAY),
     entity_links=(EntityReference("booking"),),
 )
 normal_time_dim_with_custom_grain2 = TimeDimensionSpec(
     element_name="bio_added_ts",
-    time_granularity=ExpandedTimeGranularity(name="martian_day", base_granularity=TimeGranularity.DAY),
+    time_granularity=ExpandedTimeGranularity(name="alien_day", base_granularity=TimeGranularity.DAY),
     entity_links=(EntityReference("user"),),
 )
 
@@ -257,7 +257,7 @@ def test_simple_metric_with_custom_granularity_and_join(  # noqa: D103
         time_dimension_specs=(
             TimeDimensionSpec(
                 element_name="ds",
-                time_granularity=ExpandedTimeGranularity(name="martian_day", base_granularity=TimeGranularity.DAY),
+                time_granularity=ExpandedTimeGranularity(name="alien_day", base_granularity=TimeGranularity.DAY),
                 entity_links=(EntityReference("listing"),),
             ),
         ),
@@ -287,7 +287,7 @@ def test_simple_metric_with_custom_granularity_filter(
     query_spec = query_parser.parse_and_validate_query(
         metric_names=("bookings",),
         where_constraints=[
-            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'martian_day') }} = '2020-01-01'"))
+            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'alien_day') }} = '2020-01-01'"))
         ],
     ).query_spec
 
@@ -314,9 +314,9 @@ def test_simple_metric_with_custom_granularity_in_filter_and_group_by(
     """Simple metric queried with a filter on a custom grain, where that grain is also used in the group by."""
     query_spec = query_parser.parse_and_validate_query(
         metric_names=("bookings",),
-        group_by_names=("metric_time__martian_day",),
+        group_by_names=("metric_time__alien_day",),
         where_constraints=[
-            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'martian_day') }} = '2020-01-01'"))
+            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'alien_day') }} = '2020-01-01'"))
         ],
     ).query_spec
 
@@ -343,7 +343,7 @@ def test_no_metrics_with_custom_granularity_filter(
     query_spec = query_parser.parse_and_validate_query(
         group_by_names=("listing__ds__day",),
         where_constraints=[
-            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('listing__ds', 'martian_day') }} = '2020-01-01'"))
+            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('listing__ds', 'alien_day') }} = '2020-01-01'"))
         ],
     ).query_spec
 
@@ -368,9 +368,9 @@ def test_no_metrics_with_custom_granularity_in_filter_and_group_by(
 ) -> None:
     """Group by items only queried with a filter on a custom grain, where that grain is also used in the group by."""
     query_spec = query_parser.parse_and_validate_query(
-        group_by_names=("listing__ds__martian_day",),
+        group_by_names=("listing__ds__alien_day",),
         where_constraints=[
-            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('listing__ds', 'martian_day') }} = '2020-01-01'"))
+            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('listing__ds', 'alien_day') }} = '2020-01-01'"))
         ],
     ).query_spec
 
@@ -396,7 +396,7 @@ def test_simple_metric_with_multi_hop_custom_granularity(
     """Test simple metric with a multi hop dimension and custom grain."""
     query_spec = query_parser.parse_and_validate_query(
         metric_names=("bookings",),
-        group_by_names=("listing__user__ds__martian_day",),
+        group_by_names=("listing__user__ds__alien_day",),
     ).query_spec
 
     render_and_check(
@@ -445,7 +445,7 @@ def test_offset_metric_with_custom_granularity_filter_not_in_group_by(  # noqa:
         metric_names=("bookings_5_day_lag",),
         group_by_names=("metric_time__day",),
         where_constraints=[
-            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'martian_day') }} = '2020-01-01'"))
+            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'alien_day') }} = '2020-01-01'"))
         ],
     ).query_spec
 
@@ -470,7 +470,7 @@ def test_conversion_metric_with_custom_granularity(  # noqa: D103
 ) -> None:
     query_spec = query_parser.parse_and_validate_query(
         metric_names=("visit_buy_conversion_rate_7days",),
-        group_by_names=("metric_time__martian_day",),
+        group_by_names=("metric_time__alien_day",),
     ).query_spec
 
     render_and_check(
@@ -494,9 +494,9 @@ def test_conversion_metric_with_custom_granularity_filter(  # noqa: D103
 ) -> None:
     query_spec = query_parser.parse_and_validate_query(
         metric_names=("visit_buy_conversion_rate_7days",),
-        group_by_names=("metric_time__martian_day",),
+        group_by_names=("metric_time__alien_day",),
         where_constraints=[
-            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'martian_day') }} = '2020-01-01'"))
+            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'alien_day') }} = '2020-01-01'"))
         ],
     ).query_spec
 
@@ -522,7 +522,7 @@ def test_conversion_metric_with_custom_granularity_filter_not_in_group_by(  # no
     query_spec = query_parser.parse_and_validate_query(
         metric_names=("visit_buy_conversion_rate_7days",),
         where_constraints=[
-            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'martian_day') }} = '2020-01-01'"))
+            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'alien_day') }} = '2020-01-01'"))
         ],
     ).query_spec
 
@@ -547,7 +547,7 @@ def test_join_to_time_spine_metric_grouped_by_custom_grain(  # noqa: D103
 ) -> None:
     query_spec = query_parser.parse_and_validate_query(
         metric_names=("bookings_join_to_time_spine",),
-        group_by_names=("metric_time__martian_day",),
+        group_by_names=("metric_time__alien_day",),
     ).query_spec
 
     render_and_check(
@@ -571,9 +571,9 @@ def test_join_to_timespine_metric_with_custom_granularity_filter(  # noqa: D103
 ) -> None:
     query_spec = query_parser.parse_and_validate_query(
         metric_names=("bookings_join_to_time_spine",),
-        group_by_names=("metric_time__martian_day",),
+        group_by_names=("metric_time__alien_day",),
         where_constraints=[
-            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'martian_day') }} = '2020-01-01'"))
+            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'alien_day') }} = '2020-01-01'"))
         ],
     ).query_spec
 
@@ -600,7 +600,7 @@ def test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by
         metric_names=("bookings_join_to_time_spine",),
         group_by_names=("metric_time__day",),
         where_constraints=[
-            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'martian_day') }} = '2020-01-01'"))
+            PydanticWhereFilter(where_sql_template=("{{ TimeDimension('metric_time', 'alien_day') }} = '2020-01-01'"))
         ],
     ).query_spec
 
@@ -624,7 +624,7 @@ def test_custom_offset_window(  # noqa: D103
     query_parser: MetricFlowQueryParser,
 ) -> None:
     query_spec = query_parser.parse_and_validate_query(
-        metric_names=("bookings_offset_one_martian_day",),
+        metric_names=("bookings_offset_one_alien_day",),
         group_by_names=("metric_time__day",),
     ).query_spec
 
@@ -648,11 +648,11 @@ def test_custom_offset_window_with_granularity_and_date_part(  # noqa: D103
     query_parser: MetricFlowQueryParser,
 ) -> None:
     query_spec = query_parser.parse_and_validate_query(
-        metric_names=("bookings_offset_one_martian_day",),
+        metric_names=("bookings_offset_one_alien_day",),
         group_by=(
             TimeDimensionParameter(name="booking__ds", grain=TimeGranularity.MONTH.name),
             TimeDimensionParameter(name="metric_time", date_part=DatePart.YEAR),
-            TimeDimensionParameter(name="metric_time", grain="martian_day"),
+            TimeDimensionParameter(name="metric_time", grain="alien_day"),
         ),
     ).query_spec
 
@@ -676,8 +676,8 @@ def test_custom_offset_window_with_only_window_grain(  # noqa: D103
     query_parser: MetricFlowQueryParser,
 ) -> None:
     query_spec = query_parser.parse_and_validate_query(
-        metric_names=("bookings_offset_one_martian_day",),
-        group_by_names=("metric_time__martian_day", "booking__ds__martian_day"),
+        metric_names=("bookings_offset_one_alien_day",),
+        group_by_names=("metric_time__alien_day", "booking__ds__alien_day"),
     ).query_spec
 
     render_and_check(
@@ -706,7 +706,7 @@ def test_multiple_time_spines_in_query_for_join_to_time_spine_metric(  # noqa: D
 ) -> None:
     query_spec = query_parser.parse_and_validate_query(
         metric_names=("subdaily_join_to_time_spine_metric",),
-        group_by_names=("metric_time__martian_day", "metric_time__hour"),
+        group_by_names=("metric_time__alien_day", "metric_time__hour"),
     ).query_spec
 
     render_and_check(
@@ -730,7 +730,7 @@ def test_multiple_time_spines_in_query_for_cumulative_metric(  # noqa: D103
 ) -> None:
     query_spec = query_parser.parse_and_validate_query(
         metric_names=("subdaily_cumulative_window_metric",),
-        group_by_names=("metric_time__martian_day", "metric_time__hour"),
+        group_by_names=("metric_time__alien_day", "metric_time__hour"),
     ).query_spec
 
     render_and_check(
@@ -753,7 +753,7 @@ def test_custom_offset_window_with_multiple_time_spines(  # noqa: D103
     query_parser: MetricFlowQueryParser,
 ) -> None:
     query_spec = query_parser.parse_and_validate_query(
-        metric_names=("archived_users_offset_1_martian_day",),
+        metric_names=("archived_users_offset_1_alien_day",),
         group_by_names=("metric_time__hour",),
     ).query_spec
 
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index c76674fbe9..3a14000031 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/BigQuery/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -37,7 +37,7 @@ FROM (
           , subq_4.ds__extract_day
           , subq_4.ds__extract_dow
           , subq_4.ds__extract_doy
-          , subq_4.ds__martian_day
+          , subq_4.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -52,7 +52,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_4
       ) subq_5
@@ -177,7 +177,7 @@ FROM (
           , subq_17.ds__extract_day
           , subq_17.ds__extract_dow
           , subq_17.ds__extract_doy
-          , subq_17.ds__martian_day
+          , subq_17.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -192,7 +192,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_17
       ) subq_18
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index 9c97dae1f2..eb86bbd636 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Databricks/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -37,7 +37,7 @@ FROM (
           , subq_4.ds__extract_day
           , subq_4.ds__extract_dow
           , subq_4.ds__extract_doy
-          , subq_4.ds__martian_day
+          , subq_4.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -52,7 +52,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_4
       ) subq_5
@@ -177,7 +177,7 @@ FROM (
           , subq_17.ds__extract_day
           , subq_17.ds__extract_dow
           , subq_17.ds__extract_doy
-          , subq_17.ds__martian_day
+          , subq_17.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -192,7 +192,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_17
       ) subq_18
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index 6a14596773..de3e81310d 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/DuckDB/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -37,7 +37,7 @@ FROM (
           , subq_4.ds__extract_day
           , subq_4.ds__extract_dow
           , subq_4.ds__extract_doy
-          , subq_4.ds__martian_day
+          , subq_4.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -52,7 +52,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_4
       ) subq_5
@@ -177,7 +177,7 @@ FROM (
           , subq_17.ds__extract_day
           , subq_17.ds__extract_dow
           , subq_17.ds__extract_doy
-          , subq_17.ds__martian_day
+          , subq_17.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -192,7 +192,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_17
       ) subq_18
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index 0fefa0c916..b82a3714d3 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Postgres/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -37,7 +37,7 @@ FROM (
           , subq_4.ds__extract_day
           , subq_4.ds__extract_dow
           , subq_4.ds__extract_doy
-          , subq_4.ds__martian_day
+          , subq_4.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -52,7 +52,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_4
       ) subq_5
@@ -177,7 +177,7 @@ FROM (
           , subq_17.ds__extract_day
           , subq_17.ds__extract_dow
           , subq_17.ds__extract_doy
-          , subq_17.ds__martian_day
+          , subq_17.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -192,7 +192,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_17
       ) subq_18
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index 6efa30a4f5..2233bcee5d 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Redshift/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -37,7 +37,7 @@ FROM (
           , subq_4.ds__extract_day
           , subq_4.ds__extract_dow
           , subq_4.ds__extract_doy
-          , subq_4.ds__martian_day
+          , subq_4.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -52,7 +52,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_4
       ) subq_5
@@ -177,7 +177,7 @@ FROM (
           , subq_17.ds__extract_day
           , subq_17.ds__extract_dow
           , subq_17.ds__extract_doy
-          , subq_17.ds__martian_day
+          , subq_17.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -192,7 +192,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_17
       ) subq_18
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index ebe036c4f2..4cca4f71b9 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Snowflake/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -37,7 +37,7 @@ FROM (
           , subq_4.ds__extract_day
           , subq_4.ds__extract_dow
           , subq_4.ds__extract_doy
-          , subq_4.ds__martian_day
+          , subq_4.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -52,7 +52,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_4
       ) subq_5
@@ -177,7 +177,7 @@ FROM (
           , subq_17.ds__extract_day
           , subq_17.ds__extract_dow
           , subq_17.ds__extract_doy
-          , subq_17.ds__martian_day
+          , subq_17.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -192,7 +192,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_17
       ) subq_18
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
index 12a2776f5f..8b813091c0 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/Trino/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.sql
@@ -37,7 +37,7 @@ FROM (
           , subq_4.ds__extract_day
           , subq_4.ds__extract_dow
           , subq_4.ds__extract_doy
-          , subq_4.ds__martian_day
+          , subq_4.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -52,7 +52,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_4
       ) subq_5
@@ -177,7 +177,7 @@ FROM (
           , subq_17.ds__extract_day
           , subq_17.ds__extract_dow
           , subq_17.ds__extract_doy
-          , subq_17.ds__martian_day
+          , subq_17.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -192,7 +192,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_17
       ) subq_18
diff --git a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml
index d284e3b298..21c388fef0 100644
--- a/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml
+++ b/tests_metricflow/snapshots/test_conversion_metrics_to_sql.py/SqlPlan/test_conversion_metric_join_to_timespine_and_fill_nulls_with_0__plan0.xml
@@ -128,7 +128,7 @@ docstring:
                         <!-- col11 =                                               -->
                         <!--   SqlSelectColumn(                                    -->
                         <!--     expr=SqlColumnReferenceExpression(node_id=cr_56), -->
-                        <!--     column_alias='ds__martian_day',                   -->
+                        <!--     column_alias='ds__alien_day',                   -->
                         <!--   )                                                   -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_116) -->
                         <!-- where = None -->
@@ -188,7 +188,7 @@ docstring:
                             <!-- col11 =                                                  -->
                             <!--   SqlSelectColumn(                                       -->
                             <!--     expr=SqlColumnReferenceExpression(node_id=cr_28131), -->
-                            <!--     column_alias='ds__martian_day',                      -->
+                            <!--     column_alias='ds__alien_day',                      -->
                             <!--   )                                                      -->
                             <!-- from_source = SqlTableNode(node_id=tfc_28018) -->
                             <!-- where = None -->
@@ -688,7 +688,7 @@ docstring:
                         <!-- col11 =                                                -->
                         <!--   SqlSelectColumn(                                     -->
                         <!--     expr=SqlColumnReferenceExpression(node_id=cr_210), -->
-                        <!--     column_alias='ds__martian_day',                    -->
+                        <!--     column_alias='ds__alien_day',                    -->
                         <!--   )                                                    -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_139) -->
                         <!-- where = None -->
@@ -748,7 +748,7 @@ docstring:
                             <!-- col11 =                                                  -->
                             <!--   SqlSelectColumn(                                       -->
                             <!--     expr=SqlColumnReferenceExpression(node_id=cr_28131), -->
-                            <!--     column_alias='ds__martian_day',                      -->
+                            <!--     column_alias='ds__alien_day',                      -->
                             <!--   )                                                      -->
                             <!-- from_source = SqlTableNode(node_id=tfc_28018) -->
                             <!-- where = None -->
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql
index b80296ef87..0d08f5b251 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql
@@ -57,7 +57,7 @@ FROM (
             , subq_7.ds__extract_day
             , subq_7.ds__extract_dow
             , subq_7.ds__extract_doy
-            , subq_7.ds__martian_day
+            , subq_7.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -72,7 +72,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
               , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_7
         ) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql
index 14e7619fbc..969744beff 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Databricks/test_window_metric_with_non_default_grains__plan0.sql
@@ -57,7 +57,7 @@ FROM (
             , subq_7.ds__extract_day
             , subq_7.ds__extract_dow
             , subq_7.ds__extract_doy
-            , subq_7.ds__martian_day
+            , subq_7.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -72,7 +72,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_7
         ) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql
index 9d55e9c268..2d3e30dd54 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/DuckDB/test_window_metric_with_non_default_grains__plan0.sql
@@ -57,7 +57,7 @@ FROM (
             , subq_7.ds__extract_day
             , subq_7.ds__extract_dow
             , subq_7.ds__extract_doy
-            , subq_7.ds__martian_day
+            , subq_7.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -72,7 +72,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_7
         ) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql
index 37bd232b10..3c1117829c 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Postgres/test_window_metric_with_non_default_grains__plan0.sql
@@ -57,7 +57,7 @@ FROM (
             , subq_7.ds__extract_day
             , subq_7.ds__extract_dow
             , subq_7.ds__extract_doy
-            , subq_7.ds__martian_day
+            , subq_7.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -72,7 +72,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_7
         ) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql
index c55d61cf46..58d09907eb 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Redshift/test_window_metric_with_non_default_grains__plan0.sql
@@ -57,7 +57,7 @@ FROM (
             , subq_7.ds__extract_day
             , subq_7.ds__extract_dow
             , subq_7.ds__extract_doy
-            , subq_7.ds__martian_day
+            , subq_7.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -72,7 +72,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_7
         ) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql
index 2160300141..29d7ad0f47 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Snowflake/test_window_metric_with_non_default_grains__plan0.sql
@@ -57,7 +57,7 @@ FROM (
             , subq_7.ds__extract_day
             , subq_7.ds__extract_dow
             , subq_7.ds__extract_doy
-            , subq_7.ds__martian_day
+            , subq_7.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -72,7 +72,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_7
         ) subq_8
diff --git a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql
index 683266f1a4..ffdaf101b4 100644
--- a/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql
+++ b/tests_metricflow/snapshots/test_cumulative_metric_rendering.py/SqlPlan/Trino/test_window_metric_with_non_default_grains__plan0.sql
@@ -57,7 +57,7 @@ FROM (
             , subq_7.ds__extract_day
             , subq_7.ds__extract_dow
             , subq_7.ds__extract_doy
-            , subq_7.ds__martian_day
+            , subq_7.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -72,7 +72,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_7
         ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql
index 7ee0648064..790ee40cfc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_15.metric_time__martian_day
+  subq_15.metric_time__alien_day
   , CAST(subq_15.buys AS FLOAT64) / CAST(NULLIF(subq_15.visits, 0) AS FLOAT64) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_4.visits) AS visits
     , MAX(subq_14.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.visits
       FROM (
         -- Metric Time Dimension 'ds'
@@ -67,7 +67,7 @@ FROM (
           , subq_0.visit__referrer_id AS visit__referrer_id
           , subq_0.visits AS visits
           , subq_0.visitors AS visitors
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'visits_source'
           SELECT
@@ -110,22 +110,22 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_4
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
       , SUM(subq_13.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_12.metric_time__martian_day
+        subq_12.metric_time__alien_day
         , subq_12.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_11.metric_time__martian_day
+          subq_11.metric_time__alien_day
           , subq_11.metric_time__day
           , subq_11.user
           , subq_11.buys
@@ -141,14 +141,14 @@ FROM (
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_7.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_7.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_10.user
                 , subq_10.metric_time__day
                 , subq_10.mf_internal_uuid
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_7.metric_time__day) OVER (
               PARTITION BY
                 subq_10.user
@@ -168,9 +168,9 @@ FROM (
             , subq_10.mf_internal_uuid AS mf_internal_uuid
             , subq_10.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_6.metric_time__martian_day
+              subq_6.metric_time__alien_day
               , subq_6.metric_time__day
               , subq_6.user
               , subq_6.visits
@@ -219,7 +219,7 @@ FROM (
                 , subq_0.visit__referrer_id AS visit__referrer_id
                 , subq_0.visits AS visits
                 , subq_0.visitors AS visitors
-                , subq_5.martian_day AS metric_time__martian_day
+                , subq_5.alien_day AS metric_time__alien_day
               FROM (
                 -- Read Elements From Semantic Model 'visits_source'
                 SELECT
@@ -432,10 +432,10 @@ FROM (
       ) subq_12
     ) subq_13
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_14
   ON
-    subq_4.metric_time__martian_day = subq_14.metric_time__martian_day
+    subq_4.metric_time__alien_day = subq_14.metric_time__alien_day
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index af47e52d56..6d7c959a60 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -14,21 +14,21 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS FLOAT64) / CAST(NULLIF(visits, 0) AS FLOAT64) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_20.visits) AS visits
     , MAX(subq_30.buys) AS buys
   FROM (
     -- Read From CTE For node_id=sma_28019
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      subq_17.martian_day AS metric_time__martian_day
+      subq_17.alien_day AS metric_time__alien_day
       , SUM(sma_28019_cte.visits) AS visits
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
@@ -36,14 +36,14 @@ FROM (
     ON
       sma_28019_cte.metric_time__day = subq_17.ds
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_20
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -56,14 +56,14 @@ FROM (
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_23.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_23.metric_time__alien_day) OVER (
           PARTITION BY
             subq_26.user
             , subq_26.metric_time__day
             , subq_26.mf_internal_uuid
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_23.metric_time__day) OVER (
           PARTITION BY
             subq_26.user
@@ -85,9 +85,9 @@ FROM (
       FROM (
         -- Read From CTE For node_id=sma_28019
         -- Join to Custom Granularity Dataset
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          subq_21.martian_day AS metric_time__martian_day
+          subq_21.alien_day AS metric_time__alien_day
           , sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
@@ -120,10 +120,10 @@ FROM (
         )
     ) subq_27
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_30
   ON
-    subq_20.metric_time__martian_day = subq_30.metric_time__martian_day
+    subq_20.metric_time__alien_day = subq_30.metric_time__alien_day
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_31
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index 20bec2dc14..43c5226c59 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_17.metric_time__martian_day
+  subq_17.metric_time__alien_day
   , CAST(subq_17.buys AS FLOAT64) / CAST(NULLIF(subq_17.visits, 0) AS FLOAT64) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_5.visits) AS visits
     , MAX(subq_16.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.visits
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -112,7 +112,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -153,26 +153,26 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_5
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
       , SUM(subq_15.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_14.metric_time__martian_day
+        subq_14.metric_time__alien_day
         , subq_14.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -188,14 +188,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -215,16 +215,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -311,7 +311,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -352,7 +352,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
@@ -526,10 +526,10 @@ FROM (
       ) subq_14
     ) subq_15
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_16
   ON
-    subq_5.metric_time__martian_day = subq_16.metric_time__martian_day
+    subq_5.metric_time__alien_day = subq_16.metric_time__alien_day
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index abd2e67886..dd082087bb 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -14,43 +14,43 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS FLOAT64) / CAST(NULLIF(visits, 0) AS FLOAT64) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_23.visits) AS visits
     , MAX(subq_34.buys) AS buys
   FROM (
     -- Constrain Output with WHERE
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(visits) AS visits
     FROM (
       -- Read From CTE For node_id=sma_28019
       -- Join to Custom Granularity Dataset
       SELECT
         sma_28019_cte.visits AS visits
-        , subq_19.martian_day AS metric_time__martian_day
+        , subq_19.alien_day AS metric_time__alien_day
       FROM sma_28019_cte sma_28019_cte
       LEFT OUTER JOIN
         ***************************.mf_time_spine subq_19
       ON
         sma_28019_cte.metric_time__day = subq_19.ds
     ) subq_20
-    WHERE metric_time__martian_day = '2020-01-01'
+    WHERE metric_time__alien_day = '2020-01-01'
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_23
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -63,14 +63,14 @@ FROM (
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
           PARTITION BY
             subq_30.user
             , subq_30.metric_time__day
             , subq_30.mf_internal_uuid
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_27.metric_time__day) OVER (
           PARTITION BY
             subq_30.user
@@ -91,9 +91,9 @@ FROM (
         , subq_30.buys AS buys
       FROM (
         -- Constrain Output with WHERE
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          metric_time__martian_day
+          metric_time__alien_day
           , metric_time__day
           , subq_25.user
           , visits
@@ -104,14 +104,14 @@ FROM (
             sma_28019_cte.metric_time__day AS metric_time__day
             , sma_28019_cte.user AS user
             , sma_28019_cte.visits AS visits
-            , subq_24.martian_day AS metric_time__martian_day
+            , subq_24.alien_day AS metric_time__alien_day
           FROM sma_28019_cte sma_28019_cte
           LEFT OUTER JOIN
             ***************************.mf_time_spine subq_24
           ON
             sma_28019_cte.metric_time__day = subq_24.ds
         ) subq_25
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_27
       INNER JOIN (
         -- Read Elements From Semantic Model 'buys_source'
@@ -136,10 +136,10 @@ FROM (
         )
     ) subq_31
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_34
   ON
-    subq_23.metric_time__martian_day = subq_34.metric_time__martian_day
+    subq_23.metric_time__alien_day = subq_34.metric_time__alien_day
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_35
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index ac646563e1..be6d2342ff 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -108,7 +108,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -149,7 +149,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
   ) subq_5
@@ -164,7 +164,7 @@ FROM (
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -180,14 +180,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -207,16 +207,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -303,7 +303,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -344,7 +344,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index a709f32db5..edcca266af 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -27,14 +27,14 @@ FROM (
     -- Join to Custom Granularity Dataset
     SELECT
       sma_28019_cte.visits AS visits
-      , subq_19.martian_day AS metric_time__martian_day
+      , subq_19.alien_day AS metric_time__alien_day
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_19
     ON
       sma_28019_cte.metric_time__day = subq_19.ds
   ) subq_20
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_23
 CROSS JOIN (
   -- Find conversions for user within the range of 7 day
@@ -53,14 +53,14 @@ CROSS JOIN (
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS visits
-      , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+      , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
         PARTITION BY
           subq_30.user
           , subq_30.metric_time__day
           , subq_30.mf_internal_uuid
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-      ) AS metric_time__martian_day
+      ) AS metric_time__alien_day
       , FIRST_VALUE(subq_27.metric_time__day) OVER (
         PARTITION BY
           subq_30.user
@@ -81,9 +81,9 @@ CROSS JOIN (
       , subq_30.buys AS buys
     FROM (
       -- Constrain Output with WHERE
-      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
       SELECT
-        metric_time__martian_day
+        metric_time__alien_day
         , metric_time__day
         , subq_25.user
         , visits
@@ -94,14 +94,14 @@ CROSS JOIN (
           sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
-          , subq_24.martian_day AS metric_time__martian_day
+          , subq_24.alien_day AS metric_time__alien_day
         FROM sma_28019_cte sma_28019_cte
         LEFT OUTER JOIN
           ***************************.mf_time_spine subq_24
         ON
           sma_28019_cte.metric_time__day = subq_24.ds
       ) subq_25
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_27
     INNER JOIN (
       -- Read Elements From Semantic Model 'buys_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql
index 45b925692c..4b8b3ed147 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -4,29 +4,29 @@ sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
 FROM (
   -- Window Function for Metric Re-aggregation
   SELECT
-    subq_8.metric_time__martian_day
-    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__martian_day) AS trailing_2_months_revenue
+    subq_8.metric_time__alien_day
+    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__day
       , subq_7.txn_revenue AS trailing_2_months_revenue
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
         , SUM(subq_6.txn_revenue) AS txn_revenue
       FROM (
-        -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+        -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
         SELECT
-          subq_5.metric_time__martian_day
+          subq_5.metric_time__alien_day
           , subq_5.metric_time__day
           , subq_5.txn_revenue
         FROM (
@@ -69,7 +69,7 @@ FROM (
             , subq_1.user AS user
             , subq_1.revenue_instance__user AS revenue_instance__user
             , subq_1.txn_revenue AS txn_revenue
-            , subq_4.martian_day AS metric_time__martian_day
+            , subq_4.alien_day AS metric_time__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -159,11 +159,11 @@ FROM (
         ) subq_5
       ) subq_6
       GROUP BY
-        metric_time__martian_day
+        metric_time__alien_day
         , metric_time__day
     ) subq_7
   ) subq_8
 ) subq_9
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index cfdb2c0b18..78ea325963 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,21 +4,21 @@ sql_engine: BigQuery
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
 FROM (
   -- Compute Metrics via Expressions
   -- Window Function for Metric Re-aggregation
   SELECT
-    metric_time__martian_day
-    , AVG(txn_revenue) OVER (PARTITION BY metric_time__martian_day) AS trailing_2_months_revenue
+    metric_time__alien_day
+    , AVG(txn_revenue) OVER (PARTITION BY metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Join Self Over Time Range
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+    -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
     -- Aggregate Measures
     SELECT
-      subq_14.martian_day AS metric_time__martian_day
+      subq_14.alien_day AS metric_time__alien_day
       , subq_13.ds AS metric_time__day
       , SUM(revenue_src_28000.revenue) AS txn_revenue
     FROM ***************************.mf_time_spine subq_13
@@ -35,10 +35,10 @@ FROM (
     ON
       subq_13.ds = subq_14.ds
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
       , metric_time__day
   ) subq_17
 ) subq_19
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0.sql
index 74fb4a1843..4257f8fe1a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: BigQuery
 -- Compute Metrics via Expressions
 SELECT
   subq_15.metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -138,19 +138,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -167,7 +167,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                     , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -183,24 +183,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    ds__martian_day
+                    ds__alien_day
                     , ds__day__first_value
                     , ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0_optimized.sql
index eaf09e433b..a10970f972 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: BigQuery
 -- Compute Metrics via Expressions
 SELECT
   metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['bookings', 'metric_time__day']
@@ -21,19 +21,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -50,24 +50,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_23
     ) subq_24
     ON
-      cte_6.ds__martian_day = subq_24.ds__martian_day
+      cte_6.ds__alien_day = subq_24.ds__alien_day
   ) subq_25
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
index 77936e0048..7224be9c49 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day
+  subq_16.metric_time__alien_day
   , subq_16.booking__ds__month
   , subq_16.metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.metric_time__martian_day
+    subq_15.metric_time__alien_day
     , subq_15.booking__ds__month
     , subq_15.metric_time__extract_year
     , subq_15.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
       , SUM(subq_14.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
       SELECT
-        subq_13.metric_time__martian_day
+        subq_13.metric_time__alien_day
         , subq_13.booking__ds__month
         , subq_13.metric_time__extract_year
         , subq_13.bookings
@@ -131,7 +131,7 @@ FROM (
           , subq_5.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_5.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_5.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_12.martian_day AS metric_time__martian_day
+          , subq_12.alien_day AS metric_time__alien_day
         FROM (
           -- Pass Only Elements: ['ds__day', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__day']
           SELECT
@@ -152,19 +152,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -181,7 +181,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                     , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -197,24 +197,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    ds__martian_day
+                    ds__alien_day
                     , ds__day__first_value
                     , ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
@@ -422,7 +422,7 @@ FROM (
       ) subq_13
     ) subq_14
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
       , booking__ds__month
       , metric_time__extract_year
   ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
index a986972c14..5d50cfee31 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
@@ -4,18 +4,18 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , booking__ds__month
   , metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_29.martian_day AS metric_time__martian_day
+    subq_29.alien_day AS metric_time__alien_day
     , DATETIME_TRUNC(subq_26.ds__day__lead, month) AS booking__ds__month
     , EXTRACT(year FROM subq_26.ds__day__lead) AS metric_time__extract_year
     , SUM(subq_22.bookings) AS bookings
@@ -26,19 +26,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -55,24 +55,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_24
     ) subq_25
     ON
-      cte_6.ds__martian_day = subq_25.ds__martian_day
+      cte_6.ds__alien_day = subq_25.ds__alien_day
   ) subq_26
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -89,7 +89,7 @@ FROM (
   ON
     subq_26.ds__day__lead = subq_29.ds
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
     , booking__ds__month
     , metric_time__extract_year
 ) subq_33
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_multiple_time_spines__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_multiple_time_spines__plan0.sql
index 965b934695..6eb52a6bcf 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_multiple_time_spines__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_multiple_time_spines__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: BigQuery
 -- Compute Metrics via Expressions
 SELECT
   subq_17.metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -230,19 +230,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_8.ts__hour AS ts__hour
-                  , subq_7.ds__martian_day AS ds__martian_day
+                  , subq_7.ds__alien_day AS ds__alien_day
                   , FIRST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__first_value
                   , LAST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                   ) AS ts__hour__row_number
                 FROM (
@@ -259,7 +259,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                     , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
                 INNER JOIN (
@@ -294,24 +294,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_9.ds__martian_day
-                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__first_value__lead
-                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__last_value__lead
+                  subq_9.ds__alien_day
+                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__first_value__lead
+                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    ds__martian_day
+                    ds__alien_day
                     , ts__hour__first_value
                     , ts__hour__last_value
                 ) subq_9
               ) subq_10
               ON
-                cte_2.ds__martian_day = subq_10.ds__martian_day
+                cte_2.ds__alien_day = subq_10.ds__alien_day
             ) subq_11
           ) subq_12
         ) subq_13
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
index cfba00928d..e1e873bfec 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: BigQuery
 -- Compute Metrics via Expressions
 SELECT
   metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['archived_users', 'metric_time__hour']
@@ -20,19 +20,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         time_spine_src_28005.ts AS ts__hour
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
         , FIRST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__first_value
         , LAST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
         ) AS ts__hour__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -53,24 +53,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__first_value__lead
-        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__last_value__lead
+        ds__alien_day
+        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__first_value__lead
+        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
       ) subq_27
     ) subq_28
     ON
-      cte_6.ds__martian_day = subq_28.ds__martian_day
+      cte_6.ds__alien_day = subq_28.ds__alien_day
   ) subq_29
   INNER JOIN (
     -- Read Elements From Semantic Model 'users_ds_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_only_window_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_only_window_grain__plan0.sql
index b8dc71a602..6994a3e7dc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_only_window_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_only_window_grain__plan0.sql
@@ -4,33 +4,33 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
-  , subq_9.metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  subq_9.booking__ds__alien_day
+  , subq_9.metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
-    , subq_8.metric_time__martian_day
+    subq_8.booking__ds__alien_day
+    , subq_8.metric_time__alien_day
     , subq_8.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
-        , subq_6.metric_time__martian_day
+        subq_6.booking__ds__alien_day
+        , subq_6.metric_time__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
         SELECT
           subq_5.metric_time__day AS metric_time__day
-          , subq_5.booking__ds__martian_day AS booking__ds__martian_day
-          , subq_5.metric_time__martian_day AS metric_time__martian_day
+          , subq_5.booking__ds__alien_day AS booking__ds__alien_day
+          , subq_5.metric_time__alien_day AS metric_time__alien_day
           , subq_2.ds__day AS ds__day
           , subq_2.ds__week AS ds__week
           , subq_2.ds__month AS ds__month
@@ -129,12 +129,12 @@ FROM (
           , subq_2.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_2.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
         FROM (
-          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__martian_day', 'metric_time__martian_day']
+          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__alien_day', 'metric_time__alien_day']
           SELECT
             subq_4.ds__day
             , subq_4.metric_time__day
-            , subq_4.booking__ds__martian_day
-            , subq_4.metric_time__martian_day
+            , subq_4.booking__ds__alien_day
+            , subq_4.metric_time__alien_day
           FROM (
             -- Join Offset Custom Granularity to Base Granularity
             WITH cte_2 AS (
@@ -151,27 +151,27 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                 , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             )
 
             SELECT
               cte_2.ds__day AS ds__day
-              , subq_3.ds__martian_day__lead AS metric_time__day
-              , subq_3.ds__martian_day__lead AS booking__ds__martian_day
-              , subq_3.ds__martian_day__lead AS metric_time__martian_day
+              , subq_3.ds__alien_day__lead AS metric_time__day
+              , subq_3.ds__alien_day__lead AS booking__ds__alien_day
+              , subq_3.ds__alien_day__lead AS metric_time__alien_day
             FROM cte_2 cte_2
             INNER JOIN (
               -- Offset Custom Granularity
               SELECT
-                cte_2.ds__martian_day
-                , LEAD(cte_2.ds__martian_day, 1) OVER (ORDER BY cte_2.ds__martian_day) AS ds__martian_day__lead
+                cte_2.ds__alien_day
+                , LEAD(cte_2.ds__alien_day, 1) OVER (ORDER BY cte_2.ds__alien_day) AS ds__alien_day__lead
               FROM cte_2 cte_2
               GROUP BY
-                ds__martian_day
+                ds__alien_day
             ) subq_3
             ON
-              cte_2.ds__martian_day = subq_3.ds__martian_day
+              cte_2.ds__alien_day = subq_3.ds__alien_day
           ) subq_4
         ) subq_5
         INNER JOIN (
@@ -374,7 +374,7 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      booking__ds__martian_day
-      , metric_time__martian_day
+      booking__ds__alien_day
+      , metric_time__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
index a5bd6aef91..137a005403 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
-  , metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  booking__ds__alien_day
+  , metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_14.booking__ds__martian_day AS booking__ds__martian_day
-    , subq_14.metric_time__martian_day AS metric_time__martian_day
+    subq_14.booking__ds__alien_day AS booking__ds__alien_day
+    , subq_14.metric_time__alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Join Offset Custom Granularity to Base Granularity
@@ -22,26 +22,26 @@ FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     )
 
     SELECT
       cte_6.ds__day AS ds__day
-      , subq_13.ds__martian_day__lead AS booking__ds__martian_day
-      , subq_13.ds__martian_day__lead AS metric_time__martian_day
+      , subq_13.ds__alien_day__lead AS booking__ds__alien_day
+      , subq_13.ds__alien_day__lead AS metric_time__alien_day
     FROM cte_6 cte_6
     INNER JOIN (
       -- Offset Custom Granularity
       SELECT
-        ds__martian_day
-        , LEAD(ds__martian_day, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__lead
+        ds__alien_day
+        , LEAD(ds__alien_day, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__lead
       FROM cte_6 cte_6
       GROUP BY
-        ds__martian_day
+        ds__alien_day
     ) subq_13
     ON
-      cte_6.ds__martian_day = subq_13.ds__martian_day
+      cte_6.ds__alien_day = subq_13.ds__alien_day
   ) subq_14
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -54,6 +54,6 @@ FROM (
   ON
     subq_14.ds__day = subq_12.metric_time__day
   GROUP BY
-    booking__ds__martian_day
-    , metric_time__martian_day
+    booking__ds__alien_day
+    , metric_time__alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql
index 45eb00a30b..686ca601e4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_11.booking__ds__martian_day
+  subq_11.booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day) AS booking__ds__martian_day
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day) AS booking__ds__alien_day
     , MAX(subq_5.booking_value) AS booking_value
     , MAX(subq_10.bookers) AS bookers
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_4.booking__ds__martian_day
+      subq_4.booking__ds__alien_day
       , subq_4.booking_value
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
         , SUM(subq_3.booking_value) AS booking_value
       FROM (
-        -- Pass Only Elements: ['booking_value', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['booking_value', 'booking__ds__alien_day']
         SELECT
-          subq_2.booking__ds__martian_day
+          subq_2.booking__ds__alien_day
           , subq_2.booking_value
         FROM (
           -- Metric Time Dimension 'ds'
@@ -129,7 +129,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS booking__ds__martian_day
+            , subq_1.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -230,23 +230,23 @@ FROM (
         ) subq_2
       ) subq_3
       GROUP BY
-        booking__ds__martian_day
+        booking__ds__alien_day
     ) subq_4
   ) subq_5
   FULL OUTER JOIN (
     -- Compute Metrics via Expressions
     SELECT
-      subq_9.booking__ds__martian_day
+      subq_9.booking__ds__alien_day
       , subq_9.bookers
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
         , COUNT(DISTINCT subq_8.bookers) AS bookers
       FROM (
-        -- Pass Only Elements: ['bookers', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['bookers', 'booking__ds__alien_day']
         SELECT
-          subq_7.booking__ds__martian_day
+          subq_7.booking__ds__alien_day
           , subq_7.bookers
         FROM (
           -- Metric Time Dimension 'ds'
@@ -350,7 +350,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_6.martian_day AS booking__ds__martian_day
+            , subq_6.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -451,11 +451,11 @@ FROM (
         ) subq_7
       ) subq_8
       GROUP BY
-        booking__ds__martian_day
+        booking__ds__alien_day
     ) subq_9
   ) subq_10
   ON
-    subq_5.booking__ds__martian_day = subq_10.booking__ds__martian_day
+    subq_5.booking__ds__alien_day = subq_10.booking__ds__alien_day
   GROUP BY
-    booking__ds__martian_day
+    booking__ds__alien_day
 ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index e11a364aee..695d8db5a5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS booking__ds__martian_day
+    subq_13.alien_day AS booking__ds__alien_day
     , SUM(bookings_source_src_28000.booking_value) AS booking_value
     , COUNT(DISTINCT bookings_source_src_28000.guest_id) AS bookers
   FROM ***************************.fct_bookings bookings_source_src_28000
@@ -22,5 +22,5 @@ FROM (
   ON
     DATETIME_TRUNC(bookings_source_src_28000.ds, day) = subq_13.ds
   GROUP BY
-    booking__ds__martian_day
+    booking__ds__alien_day
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index c748bd0165..1310816a84 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.metric_time__martian_day
+  subq_8.metric_time__alien_day
   , subq_8.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_7.metric_time__martian_day AS metric_time__martian_day
+    subq_7.metric_time__alien_day AS metric_time__alien_day
     , subq_4.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
     FROM (
       -- Change Column Aliases
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day AS metric_time__martian_day
+        , subq_5.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,22 +44,22 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
           , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_7
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -163,7 +163,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -264,8 +264,8 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_4
   ON
-    subq_7.metric_time__martian_day = subq_4.metric_time__martian_day
+    subq_7.metric_time__alien_day = subq_4.metric_time__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index aec1f58f68..aafc278b03 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -5,25 +5,25 @@ sql_engine: BigQuery
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day AS metric_time__martian_day
+  subq_16.metric_time__alien_day AS metric_time__alien_day
   , subq_13.bookings AS bookings_join_to_time_spine
 FROM (
   -- Read From Time Spine 'mf_time_spine'
   -- Change Column Aliases
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    martian_day AS metric_time__martian_day
+    alien_day AS metric_time__alien_day
   FROM ***************************.mf_time_spine time_spine_src_28006
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_16
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    subq_10.martian_day AS metric_time__martian_day
+    subq_10.alien_day AS metric_time__alien_day
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ LEFT OUTER JOIN (
   ON
     subq_9.ds__day = subq_10.ds
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_13
 ON
-  subq_16.metric_time__martian_day = subq_13.metric_time__martian_day
+  subq_16.metric_time__alien_day = subq_13.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
index 640c0030c0..7bef752fdd 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.metric_time__martian_day
+  subq_10.metric_time__alien_day
   , subq_10.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_9.metric_time__martian_day AS metric_time__martian_day
+    subq_9.metric_time__alien_day AS metric_time__alien_day
     , subq_5.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
     FROM (
       -- Constrain Output with WHERE
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,29 +59,29 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_9
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.bookings
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -282,7 +282,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -381,12 +381,12 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_5
   ON
-    subq_9.metric_time__martian_day = subq_5.metric_time__martian_day
+    subq_9.metric_time__alien_day = subq_5.metric_time__alien_day
 ) subq_10
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
index 688a8a4cc3..295d637f52 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -5,37 +5,37 @@ sql_engine: BigQuery
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_20.metric_time__martian_day AS metric_time__martian_day
+  subq_20.metric_time__alien_day AS metric_time__alien_day
   , subq_16.bookings AS bookings_join_to_time_spine
 FROM (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     -- Change Column Aliases
     SELECT
-      martian_day AS metric_time__martian_day
+      alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
     , SUM(bookings) AS bookings
   FROM (
     -- Metric Time Dimension 'ds'
     -- Join to Custom Granularity Dataset
     SELECT
       subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,9 +48,9 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_16
 ON
-  subq_20.metric_time__martian_day = subq_16.metric_time__martian_day
+  subq_20.metric_time__alien_day = subq_16.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index b140eb6b2e..5e5fc183e1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,11 +59,11 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
   ) subq_9
   LEFT OUTER JOIN (
@@ -79,7 +79,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -280,7 +280,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -379,7 +379,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 46e6d3d400..875a506042 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -17,10 +17,10 @@ FROM (
     -- Change Column Aliases
     SELECT
       ds AS metric_time__day
-      , martian_day AS metric_time__martian_day
+      , alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
@@ -35,7 +35,7 @@ LEFT OUTER JOIN (
     SELECT
       subq_11.ds__day AS metric_time__day
       , subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,7 +48,7 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_16
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 4637ac3bf0..c9414705ae 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.metric_time__martian_day
+  subq_4.metric_time__alien_day
   , subq_4.listing__ds__month
   , subq_4.listings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
     , SUM(subq_3.listings) AS listings
   FROM (
-    -- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+    -- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
     SELECT
-      subq_2.metric_time__martian_day
+      subq_2.metric_time__alien_day
       , subq_2.listing__ds__month
       , subq_2.listings
     FROM (
@@ -90,7 +90,7 @@ FROM (
         , subq_0.listings AS listings
         , subq_0.largest_listing AS largest_listing
         , subq_0.smallest_listing AS smallest_listing
-        , subq_1.martian_day AS metric_time__martian_day
+        , subq_1.alien_day AS metric_time__alien_day
       FROM (
         -- Read Elements From Semantic Model 'listings_latest'
         SELECT
@@ -159,6 +159,6 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
     , listing__ds__month
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index c0ebc93adc..c9c2341ec2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: BigQuery
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+-- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS metric_time__martian_day
+  subq_6.alien_day AS metric_time__alien_day
   , subq_5.listing__ds__month AS listing__ds__month
   , SUM(subq_5.listings) AS listings
 FROM (
@@ -24,5 +24,5 @@ LEFT OUTER JOIN
 ON
   subq_5.ds__day = subq_6.ds
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
   , listing__ds__month
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql
index 3617e3fb4c..fe3007ace7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_5.bookings) AS bookings
   , MAX(subq_11.listings) AS listings
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , subq_4.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -124,7 +124,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -225,23 +225,23 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_4
 ) subq_5
 FULL OUTER JOIN (
   -- Compute Metrics via Expressions
   SELECT
-    subq_10.metric_time__martian_day
+    subq_10.metric_time__alien_day
     , subq_10.listings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
       , SUM(subq_9.listings) AS listings
     FROM (
-      -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['listings', 'metric_time__alien_day']
       SELECT
-        subq_8.metric_time__martian_day
+        subq_8.metric_time__alien_day
         , subq_8.listings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -314,7 +314,7 @@ FULL OUTER JOIN (
           , subq_6.listings AS listings
           , subq_6.largest_listing AS largest_listing
           , subq_6.smallest_listing AS smallest_listing
-          , subq_7.martian_day AS metric_time__martian_day
+          , subq_7.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'listings_latest'
           SELECT
@@ -383,10 +383,10 @@ FULL OUTER JOIN (
       ) subq_8
     ) subq_9
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_10
 ) subq_11
 ON
-  subq_5.metric_time__martian_day = subq_11.metric_time__martian_day
+  subq_5.metric_time__alien_day = subq_11.metric_time__alien_day
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index ec57d54bfb..508e198fc3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: BigQuery
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_17.bookings) AS bookings
   , MAX(subq_23.listings) AS listings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS metric_time__martian_day
+    subq_13.alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -28,16 +28,16 @@ FROM (
   ON
     subq_12.ds__day = subq_13.ds
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_17
 FULL OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['listings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_19.martian_day AS metric_time__martian_day
+    subq_19.alien_day AS metric_time__alien_day
     , SUM(subq_18.listings) AS listings
   FROM (
     -- Read Elements From Semantic Model 'listings_latest'
@@ -51,9 +51,9 @@ FULL OUTER JOIN (
   ON
     subq_18.ds__day = subq_19.ds
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_23
 ON
-  subq_17.metric_time__martian_day = subq_23.metric_time__martian_day
+  subq_17.metric_time__alien_day = subq_23.metric_time__alien_day
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
index eb06275ecb..c0db99a516 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_7.metric_time__martian_day
+  subq_7.metric_time__alien_day
   , subq_7.metric_time__hour
   , subq_7.archived_users AS subdaily_cumulative_window_metric
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
     , SUM(subq_6.archived_users) AS archived_users
   FROM (
-    -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_5.metric_time__martian_day
+      subq_5.metric_time__alien_day
       , subq_5.metric_time__hour
       , subq_5.archived_users
     FROM (
@@ -213,7 +213,7 @@ FROM (
         , subq_1.home_state AS home_state
         , subq_1.user__home_state AS user__home_state
         , subq_1.archived_users AS archived_users
-        , subq_4.martian_day AS metric_time__martian_day
+        , subq_4.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -612,6 +612,6 @@ FROM (
     ) subq_5
   ) subq_6
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
     , metric_time__hour
 ) subq_7
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
index 2e1b95efe4..083b34fc92 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: BigQuery
 ---
 -- Join Self Over Time Range
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+-- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_12.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS metric_time__alien_day
   , subq_11.ts AS metric_time__hour
   , SUM(subq_9.archived_users) AS subdaily_cumulative_window_metric
 FROM ***************************.mf_time_spine_hour subq_11
@@ -31,5 +31,5 @@ LEFT OUTER JOIN
 ON
   DATETIME_TRUNC(subq_11.ts, day) = subq_12.ds
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
   , metric_time__hour
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
index 5b863a5fb0..499c6e19ab 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.metric_time__hour
   , subq_9.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_8.metric_time__martian_day AS metric_time__martian_day
+    subq_8.metric_time__alien_day AS metric_time__alien_day
     , subq_8.metric_time__hour AS metric_time__hour
     , subq_4.archived_users AS archived_users
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__hour
     FROM (
       -- Change Column Aliases
@@ -34,7 +34,7 @@ FROM (
         , subq_5.ts__extract_day AS ts__extract_day
         , subq_5.ts__extract_dow AS ts__extract_dow
         , subq_5.ts__extract_doy AS ts__extract_doy
-        , subq_6.martian_day AS metric_time__martian_day
+        , subq_6.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -61,13 +61,13 @@ FROM (
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
       , SUM(subq_3.archived_users) AS archived_users
     FROM (
-      -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+      -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.metric_time__hour
         , subq_2.archived_users
       FROM (
@@ -264,7 +264,7 @@ FROM (
           , subq_0.home_state AS home_state
           , subq_0.user__home_state AS user__home_state
           , subq_0.archived_users AS archived_users
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'users_ds_source'
           SELECT
@@ -456,7 +456,7 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
       , metric_time__hour
   ) subq_4
   ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
index b31f8b3cc4..12d70d70d5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
@@ -5,15 +5,15 @@ sql_engine: BigQuery
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_18.metric_time__martian_day AS metric_time__martian_day
+  subq_18.metric_time__alien_day AS metric_time__alien_day
   , subq_18.metric_time__hour AS metric_time__hour
   , subq_14.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Change Column Aliases
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
   SELECT
-    subq_16.martian_day AS metric_time__martian_day
+    subq_16.alien_day AS metric_time__alien_day
     , time_spine_src_28005.ts AS metric_time__hour
   FROM ***************************.mf_time_spine_hour time_spine_src_28005
   LEFT OUTER JOIN
@@ -24,10 +24,10 @@ FROM (
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'archived_at'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
   -- Aggregate Measures
   SELECT
-    subq_11.martian_day AS metric_time__martian_day
+    subq_11.alien_day AS metric_time__alien_day
     , subq_10.archived_at__hour AS metric_time__hour
     , SUM(subq_10.archived_users) AS archived_users
   FROM (
@@ -43,7 +43,7 @@ LEFT OUTER JOIN (
   ON
     subq_10.archived_at__day = subq_11.ds
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
     , metric_time__hour
 ) subq_14
 ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 0462e6897f..47eb7e8b49 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -2,10 +2,10 @@ test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
 sql_engine: BigQuery
 ---
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
 FROM (
@@ -193,8 +193,8 @@ FROM (
     , subq_0.user__home_state AS user__home_state
     , subq_0.new_users AS new_users
     , subq_0.archived_users AS archived_users
-    , subq_4.martian_day AS metric_time__martian_day
-    , subq_5.martian_day AS user__bio_added_ts__martian_day
+    , subq_4.alien_day AS metric_time__alien_day
+    , subq_5.alien_day AS user__bio_added_ts__alien_day
   FROM (
     -- Read Elements From Semantic Model 'users_ds_source'
     SELECT
@@ -397,7 +397,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -409,7 +409,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -424,7 +424,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
           , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
@@ -439,7 +439,7 @@ FROM (
     subq_0.user__bio_added_ts__day = subq_5.ds
 ) subq_6
 GROUP BY
-  user__bio_added_ts__martian_day
-  , metric_time__martian_day
+  user__bio_added_ts__alien_day
+  , metric_time__alien_day
   , user__bio_added_ts__month
   , metric_time__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index f9299a4fc6..98ed198a6f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -5,10 +5,10 @@ sql_engine: BigQuery
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_12.martian_day AS user__bio_added_ts__martian_day
-  , subq_11.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS user__bio_added_ts__alien_day
+  , subq_11.alien_day AS metric_time__alien_day
   , DATETIME_TRUNC(users_ds_source_src_28000.bio_added_ts, month) AS user__bio_added_ts__month
   , time_spine_src_28006.ds AS metric_time__day
 FROM ***************************.dim_users users_ds_source_src_28000
@@ -23,7 +23,7 @@ LEFT OUTER JOIN
 ON
   DATETIME_TRUNC(users_ds_source_src_28000.bio_added_ts, day) = subq_12.ds
 GROUP BY
-  user__bio_added_ts__martian_day
-  , metric_time__martian_day
+  user__bio_added_ts__alien_day
+  , metric_time__alien_day
   , user__bio_added_ts__month
   , metric_time__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql
index b1ef40cf6d..d95405108d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: BigQuery
 ---
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
@@ -20,7 +20,7 @@ FROM (
     , subq_0.ds__extract_day AS ds__extract_day
     , subq_0.ds__extract_dow AS ds__extract_dow
     , subq_0.ds__extract_doy AS ds__extract_doy
-    , subq_0.ds__martian_day AS ds__martian_day
+    , subq_0.ds__alien_day AS ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -32,8 +32,8 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
-    , subq_1.martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
+    , subq_1.alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
       , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
   LEFT OUTER JOIN
@@ -57,4 +57,4 @@ FROM (
     subq_0.ds__day = subq_1.ds
 ) subq_2
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index d0ad89a1c0..70f2eaa394 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: BigQuery
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_4.martian_day AS metric_time__martian_day
+  subq_4.alien_day AS metric_time__alien_day
 FROM ***************************.mf_time_spine time_spine_src_28006
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_4
 ON
   time_spine_src_28006.ds = subq_4.ds
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index 3ab38adabe..0a863a1eb7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: BigQuery
 ---
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Join to Custom Granularity Dataset
@@ -97,7 +97,7 @@ FROM (
     , bookings_source_src_28000.listing_id AS booking__listing
     , bookings_source_src_28000.guest_id AS booking__guest
     , bookings_source_src_28000.host_id AS booking__host
-    , subq_0.martian_day AS booking__ds__martian_day
+    , subq_0.alien_day AS booking__ds__alien_day
   FROM ***************************.fct_bookings bookings_source_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_0
@@ -105,4 +105,4 @@ FROM (
     DATETIME_TRUNC(bookings_source_src_28000.ds, day) = subq_0.ds
 ) subq_1
 GROUP BY
-  booking__ds__martian_day
+  booking__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index 57462f569f..768749c086 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: BigQuery
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_2.martian_day AS booking__ds__martian_day
+  subq_2.alien_day AS booking__ds__alien_day
 FROM ***************************.fct_bookings bookings_source_src_28000
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_2
 ON
   DATETIME_TRUNC(bookings_source_src_28000.ds, day) = subq_2.ds
 GROUP BY
-  booking__ds__martian_day
+  booking__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql
index 3cb0bbb6bd..08bfbf912f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -10,7 +10,7 @@ SELECT
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATETIME_TRUNC(listings_latest_src_28000.created_at, day) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
   listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 60e82e71ff..93bf2a7c35 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -13,13 +13,13 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     DATETIME_TRUNC(listings_latest_src_28000.created_at, day) AS listing__ds__day
-    , subq_3.martian_day AS listing__ds__martian_day
+    , subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATETIME_TRUNC(listings_latest_src_28000.created_at, day) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
   listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index f336caa0a5..56148a447d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -4,13 +4,13 @@ docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
 sql_engine: BigQuery
 ---
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATETIME_TRUNC(listings_latest_src_28000.created_at, day) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
-  listing__ds__martian_day
+  listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index cc7117855d..bbf4b80fc8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,20 +5,20 @@ docstring:
 sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  listing__ds__martian_day
+  listing__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Join to Custom Granularity Dataset
   SELECT
-    subq_3.martian_day AS listing__ds__martian_day
+    subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATETIME_TRUNC(listings_latest_src_28000.created_at, day) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
-  listing__ds__martian_day
+  listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql
index 145586e07d..293031e0f9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0.sql
@@ -4,22 +4,22 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
+  subq_9.booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
+    subq_8.booking__ds__alien_day
     , subq_8.bookings AS bookings_5_days_ago
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
+        subq_6.booking__ds__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
@@ -123,7 +123,7 @@ FROM (
           , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_5.martian_day AS booking__ds__martian_day
+          , subq_5.alien_day AS booking__ds__alien_day
         FROM (
           -- Pass Only Elements: ['booking__ds__day',]
           SELECT
@@ -142,7 +142,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -157,7 +157,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                 , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
@@ -366,6 +366,6 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      booking__ds__martian_day
+      booking__ds__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index 56fd02c5dc..8dbe928567 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.martian_day AS booking__ds__martian_day
+    subq_15.alien_day AS booking__ds__alien_day
     , SUM(subq_11.bookings) AS bookings_5_days_ago
   FROM ***************************.mf_time_spine time_spine_src_28006
   INNER JOIN (
@@ -31,5 +31,5 @@ FROM (
   ON
     time_spine_src_28006.ds = subq_15.ds
   GROUP BY
-    booking__ds__martian_day
+    booking__ds__alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index a261768561..10dcb76cc3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -24,7 +24,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_6.metric_time__martian_day
+          subq_6.metric_time__alien_day
           , subq_6.ds__day
           , subq_6.ds__week
           , subq_6.ds__month
@@ -225,7 +225,7 @@ FROM (
             , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_5.martian_day AS metric_time__martian_day
+            , subq_5.alien_day AS metric_time__alien_day
           FROM (
             -- Pass Only Elements: ['metric_time__day',]
             SELECT
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -466,7 +466,7 @@ FROM (
           ON
             subq_4.metric_time__day = subq_5.ds
         ) subq_6
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_7
     ) subq_8
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index c2d381e942..bf0ad5b248 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -20,7 +20,7 @@ FROM (
     SELECT
       time_spine_src_28006.ds AS metric_time__day
       , subq_12.bookings AS bookings
-      , subq_16.martian_day AS metric_time__martian_day
+      , subq_16.alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
     INNER JOIN (
       -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ FROM (
     ON
       time_spine_src_28006.ds = subq_16.ds
   ) subq_17
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_21
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql
index 53f0bd34ad..ba8668dada 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.booking__ds__martian_day
+  subq_4.booking__ds__alien_day
   , subq_4.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
     , SUM(subq_3.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
     SELECT
-      subq_2.booking__ds__martian_day
+      subq_2.booking__ds__alien_day
       , subq_2.bookings
     FROM (
       -- Metric Time Dimension 'ds'
@@ -118,7 +118,7 @@ FROM (
         , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_1.martian_day AS booking__ds__martian_day
+        , subq_1.alien_day AS booking__ds__alien_day
       FROM (
         -- Read Elements From Semantic Model 'bookings_source'
         SELECT
@@ -219,5 +219,5 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    booking__ds__martian_day
+    booking__ds__alien_day
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index b8fcf6f3c7..92b7442073 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: BigQuery
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS booking__ds__martian_day
+  subq_6.alien_day AS booking__ds__alien_day
   , SUM(subq_5.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -22,4 +22,4 @@ LEFT OUTER JOIN
 ON
   subq_5.booking__ds__day = subq_6.ds
 GROUP BY
-  booking__ds__martian_day
+  booking__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index 47fed26d3a..63c2c3dd5c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.listing__ds__martian_day
+  subq_8.listing__ds__alien_day
   , subq_8.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
     , SUM(subq_7.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
     SELECT
-      subq_6.listing__ds__martian_day
+      subq_6.listing__ds__alien_day
       , subq_6.bookings
     FROM (
       -- Join Standard Outputs
@@ -119,7 +119,7 @@ FROM (
         , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_5.martian_day AS listing__ds__martian_day
+        , subq_5.alien_day AS listing__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -462,5 +462,5 @@ FROM (
     ) subq_6
   ) subq_7
   GROUP BY
-    listing__ds__martian_day
+    listing__ds__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index d38b813c2d..b9da5f2adb 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_14.martian_day AS listing__ds__martian_day
+  subq_14.alien_day AS listing__ds__alien_day
   , SUM(subq_10.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -27,4 +27,4 @@ LEFT OUTER JOIN
 ON
   DATETIME_TRUNC(listings_latest_src_28000.created_at, day) = subq_14.ds
 GROUP BY
-  listing__ds__martian_day
+  listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql
index eae5c5cf19..2e2c46e0a4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -18,7 +18,7 @@ FROM (
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -219,7 +219,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -318,7 +318,7 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index f1c6265743..5fcb4f2980 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -15,7 +15,7 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -28,4 +28,4 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 7d8909b7a8..1eb0da8eb3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -6,22 +6,22 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_5.metric_time__martian_day
+  subq_5.metric_time__alien_day
   , subq_5.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , SUM(subq_4.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+    -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -222,7 +222,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -321,9 +321,9 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index 5f5f4307a3..223170ac1f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,18 +5,18 @@ docstring:
 sql_engine: BigQuery
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+-- Pass Only Elements: ['bookings', 'metric_time__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , SUM(bookings) AS bookings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -29,6 +29,6 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index 9f2549563e..9533040bcd 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -6,17 +6,17 @@ sql_engine: BigQuery
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_36.listing__user__ds__martian_day
+  subq_36.listing__user__ds__alien_day
   , subq_36.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
     , SUM(subq_35.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
     SELECT
-      subq_34.listing__user__ds__martian_day
+      subq_34.listing__user__ds__alien_day
       , subq_34.bookings
     FROM (
       -- Join Standard Outputs
@@ -122,7 +122,7 @@ FROM (
         , subq_25.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_25.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_25.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_33.martian_day AS listing__user__ds__martian_day
+        , subq_33.alien_day AS listing__user__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -1400,5 +1400,5 @@ FROM (
     ) subq_34
   ) subq_35
   GROUP BY
-    listing__user__ds__martian_day
+    listing__user__ds__alien_day
 ) subq_36
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index 64386acb64..087a965181 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -6,11 +6,11 @@ sql_engine: BigQuery
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_46.martian_day AS listing__user__ds__martian_day
+  subq_46.alien_day AS listing__user__ds__alien_day
   , SUM(subq_38.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -45,4 +45,4 @@ LEFT OUTER JOIN
 ON
   subq_45.user__ds__day = subq_46.ds
 GROUP BY
-  listing__user__ds__martian_day
+  listing__user__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql
index e437380e2c..4d7acf7bb6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_15.metric_time__martian_day
+  subq_15.metric_time__alien_day
   , CAST(subq_15.buys AS DOUBLE) / CAST(NULLIF(subq_15.visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_4.visits) AS visits
     , MAX(subq_14.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.visits
       FROM (
         -- Metric Time Dimension 'ds'
@@ -67,7 +67,7 @@ FROM (
           , subq_0.visit__referrer_id AS visit__referrer_id
           , subq_0.visits AS visits
           , subq_0.visitors AS visitors
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'visits_source'
           SELECT
@@ -110,22 +110,22 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
       , SUM(subq_13.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_12.metric_time__martian_day
+        subq_12.metric_time__alien_day
         , subq_12.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_11.metric_time__martian_day
+          subq_11.metric_time__alien_day
           , subq_11.metric_time__day
           , subq_11.user
           , subq_11.buys
@@ -141,14 +141,14 @@ FROM (
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_7.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_7.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_10.user
                 , subq_10.metric_time__day
                 , subq_10.mf_internal_uuid
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_7.metric_time__day) OVER (
               PARTITION BY
                 subq_10.user
@@ -168,9 +168,9 @@ FROM (
             , subq_10.mf_internal_uuid AS mf_internal_uuid
             , subq_10.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_6.metric_time__martian_day
+              subq_6.metric_time__alien_day
               , subq_6.metric_time__day
               , subq_6.user
               , subq_6.visits
@@ -219,7 +219,7 @@ FROM (
                 , subq_0.visit__referrer_id AS visit__referrer_id
                 , subq_0.visits AS visits
                 , subq_0.visitors AS visitors
-                , subq_5.martian_day AS metric_time__martian_day
+                , subq_5.alien_day AS metric_time__alien_day
               FROM (
                 -- Read Elements From Semantic Model 'visits_source'
                 SELECT
@@ -432,10 +432,10 @@ FROM (
       ) subq_12
     ) subq_13
     GROUP BY
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
   ) subq_14
   ON
-    subq_4.metric_time__martian_day = subq_14.metric_time__martian_day
+    subq_4.metric_time__alien_day = subq_14.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day)
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day)
 ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index 41b9d33e7d..d49e34e8c5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -14,21 +14,21 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE) / CAST(NULLIF(visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_20.visits) AS visits
     , MAX(subq_30.buys) AS buys
   FROM (
     -- Read From CTE For node_id=sma_28019
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      subq_17.martian_day AS metric_time__martian_day
+      subq_17.alien_day AS metric_time__alien_day
       , SUM(sma_28019_cte.visits) AS visits
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
@@ -36,14 +36,14 @@ FROM (
     ON
       sma_28019_cte.metric_time__day = subq_17.ds
     GROUP BY
-      subq_17.martian_day
+      subq_17.alien_day
   ) subq_20
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -56,14 +56,14 @@ FROM (
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_23.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_23.metric_time__alien_day) OVER (
           PARTITION BY
             subq_26.user
             , subq_26.metric_time__day
             , subq_26.mf_internal_uuid
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_23.metric_time__day) OVER (
           PARTITION BY
             subq_26.user
@@ -85,9 +85,9 @@ FROM (
       FROM (
         -- Read From CTE For node_id=sma_28019
         -- Join to Custom Granularity Dataset
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          subq_21.martian_day AS metric_time__martian_day
+          subq_21.alien_day AS metric_time__alien_day
           , sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
@@ -120,10 +120,10 @@ FROM (
         )
     ) subq_27
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_30
   ON
-    subq_20.metric_time__martian_day = subq_30.metric_time__martian_day
+    subq_20.metric_time__alien_day = subq_30.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day)
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day)
 ) subq_31
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index 0061544a89..55ca31cb6e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_17.metric_time__martian_day
+  subq_17.metric_time__alien_day
   , CAST(subq_17.buys AS DOUBLE) / CAST(NULLIF(subq_17.visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_5.visits) AS visits
     , MAX(subq_16.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.visits
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -112,7 +112,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -153,26 +153,26 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
       , SUM(subq_15.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_14.metric_time__martian_day
+        subq_14.metric_time__alien_day
         , subq_14.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -188,14 +188,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -215,16 +215,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -311,7 +311,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -352,7 +352,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
@@ -526,10 +526,10 @@ FROM (
       ) subq_14
     ) subq_15
     GROUP BY
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
   ) subq_16
   ON
-    subq_5.metric_time__martian_day = subq_16.metric_time__martian_day
+    subq_5.metric_time__alien_day = subq_16.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day)
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day)
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index 2b917c0dd7..66e8898b9f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -14,43 +14,43 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE) / CAST(NULLIF(visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_23.visits) AS visits
     , MAX(subq_34.buys) AS buys
   FROM (
     -- Constrain Output with WHERE
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(visits) AS visits
     FROM (
       -- Read From CTE For node_id=sma_28019
       -- Join to Custom Granularity Dataset
       SELECT
         sma_28019_cte.visits AS visits
-        , subq_19.martian_day AS metric_time__martian_day
+        , subq_19.alien_day AS metric_time__alien_day
       FROM sma_28019_cte sma_28019_cte
       LEFT OUTER JOIN
         ***************************.mf_time_spine subq_19
       ON
         sma_28019_cte.metric_time__day = subq_19.ds
     ) subq_20
-    WHERE metric_time__martian_day = '2020-01-01'
+    WHERE metric_time__alien_day = '2020-01-01'
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_23
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -63,14 +63,14 @@ FROM (
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
           PARTITION BY
             subq_30.user
             , subq_30.metric_time__day
             , subq_30.mf_internal_uuid
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_27.metric_time__day) OVER (
           PARTITION BY
             subq_30.user
@@ -91,9 +91,9 @@ FROM (
         , subq_30.buys AS buys
       FROM (
         -- Constrain Output with WHERE
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          metric_time__martian_day
+          metric_time__alien_day
           , metric_time__day
           , subq_25.user
           , visits
@@ -104,14 +104,14 @@ FROM (
             sma_28019_cte.metric_time__day AS metric_time__day
             , sma_28019_cte.user AS user
             , sma_28019_cte.visits AS visits
-            , subq_24.martian_day AS metric_time__martian_day
+            , subq_24.alien_day AS metric_time__alien_day
           FROM sma_28019_cte sma_28019_cte
           LEFT OUTER JOIN
             ***************************.mf_time_spine subq_24
           ON
             sma_28019_cte.metric_time__day = subq_24.ds
         ) subq_25
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_27
       INNER JOIN (
         -- Read Elements From Semantic Model 'buys_source'
@@ -136,10 +136,10 @@ FROM (
         )
     ) subq_31
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_34
   ON
-    subq_23.metric_time__martian_day = subq_34.metric_time__martian_day
+    subq_23.metric_time__alien_day = subq_34.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day)
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day)
 ) subq_35
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 1e742b3756..3a6cd16075 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -108,7 +108,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -149,7 +149,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
   ) subq_5
@@ -164,7 +164,7 @@ FROM (
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -180,14 +180,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -207,16 +207,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -303,7 +303,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -344,7 +344,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 3b8d52363c..2647b39a77 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -27,14 +27,14 @@ FROM (
     -- Join to Custom Granularity Dataset
     SELECT
       sma_28019_cte.visits AS visits
-      , subq_19.martian_day AS metric_time__martian_day
+      , subq_19.alien_day AS metric_time__alien_day
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_19
     ON
       sma_28019_cte.metric_time__day = subq_19.ds
   ) subq_20
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_23
 CROSS JOIN (
   -- Find conversions for user within the range of 7 day
@@ -53,14 +53,14 @@ CROSS JOIN (
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS visits
-      , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+      , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
         PARTITION BY
           subq_30.user
           , subq_30.metric_time__day
           , subq_30.mf_internal_uuid
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-      ) AS metric_time__martian_day
+      ) AS metric_time__alien_day
       , FIRST_VALUE(subq_27.metric_time__day) OVER (
         PARTITION BY
           subq_30.user
@@ -81,9 +81,9 @@ CROSS JOIN (
       , subq_30.buys AS buys
     FROM (
       -- Constrain Output with WHERE
-      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
       SELECT
-        metric_time__martian_day
+        metric_time__alien_day
         , metric_time__day
         , subq_25.user
         , visits
@@ -94,14 +94,14 @@ CROSS JOIN (
           sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
-          , subq_24.martian_day AS metric_time__martian_day
+          , subq_24.alien_day AS metric_time__alien_day
         FROM sma_28019_cte sma_28019_cte
         LEFT OUTER JOIN
           ***************************.mf_time_spine subq_24
         ON
           sma_28019_cte.metric_time__day = subq_24.ds
       ) subq_25
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_27
     INNER JOIN (
       -- Read Elements From Semantic Model 'buys_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql
index cbdf142a74..8dd978b39a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -4,29 +4,29 @@ sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
 FROM (
   -- Window Function for Metric Re-aggregation
   SELECT
-    subq_8.metric_time__martian_day
-    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__martian_day) AS trailing_2_months_revenue
+    subq_8.metric_time__alien_day
+    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__day
       , subq_7.txn_revenue AS trailing_2_months_revenue
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
         , SUM(subq_6.txn_revenue) AS txn_revenue
       FROM (
-        -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+        -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
         SELECT
-          subq_5.metric_time__martian_day
+          subq_5.metric_time__alien_day
           , subq_5.metric_time__day
           , subq_5.txn_revenue
         FROM (
@@ -69,7 +69,7 @@ FROM (
             , subq_1.user AS user
             , subq_1.revenue_instance__user AS revenue_instance__user
             , subq_1.txn_revenue AS txn_revenue
-            , subq_4.martian_day AS metric_time__martian_day
+            , subq_4.alien_day AS metric_time__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -159,11 +159,11 @@ FROM (
         ) subq_5
       ) subq_6
       GROUP BY
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
     ) subq_7
   ) subq_8
 ) subq_9
 GROUP BY
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index 87f0e4ab6c..9e6b42c306 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,21 +4,21 @@ sql_engine: Databricks
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
 FROM (
   -- Compute Metrics via Expressions
   -- Window Function for Metric Re-aggregation
   SELECT
-    metric_time__martian_day
-    , AVG(txn_revenue) OVER (PARTITION BY metric_time__martian_day) AS trailing_2_months_revenue
+    metric_time__alien_day
+    , AVG(txn_revenue) OVER (PARTITION BY metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Join Self Over Time Range
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+    -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
     -- Aggregate Measures
     SELECT
-      subq_14.martian_day AS metric_time__martian_day
+      subq_14.alien_day AS metric_time__alien_day
       , subq_13.ds AS metric_time__day
       , SUM(revenue_src_28000.revenue) AS txn_revenue
     FROM ***************************.mf_time_spine subq_13
@@ -35,10 +35,10 @@ FROM (
     ON
       subq_13.ds = subq_14.ds
     GROUP BY
-      subq_14.martian_day
+      subq_14.alien_day
       , subq_13.ds
   ) subq_17
 ) subq_19
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0.sql
index 75d7fa61bf..64f4d387c3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: Databricks
 -- Compute Metrics via Expressions
 SELECT
   subq_15.metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -138,19 +138,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -167,7 +167,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -183,24 +183,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0_optimized.sql
index 1fd88ad018..29935197db 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: Databricks
 -- Compute Metrics via Expressions
 SELECT
   metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['bookings', 'metric_time__day']
@@ -21,19 +21,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -50,24 +50,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_23
     ) subq_24
     ON
-      cte_6.ds__martian_day = subq_24.ds__martian_day
+      cte_6.ds__alien_day = subq_24.ds__alien_day
   ) subq_25
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
index 9024b5864d..00dd7fffe9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day
+  subq_16.metric_time__alien_day
   , subq_16.booking__ds__month
   , subq_16.metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.metric_time__martian_day
+    subq_15.metric_time__alien_day
     , subq_15.booking__ds__month
     , subq_15.metric_time__extract_year
     , subq_15.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
       , SUM(subq_14.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
       SELECT
-        subq_13.metric_time__martian_day
+        subq_13.metric_time__alien_day
         , subq_13.booking__ds__month
         , subq_13.metric_time__extract_year
         , subq_13.bookings
@@ -131,7 +131,7 @@ FROM (
           , subq_5.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_5.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_5.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_12.martian_day AS metric_time__martian_day
+          , subq_12.alien_day AS metric_time__alien_day
         FROM (
           -- Pass Only Elements: ['ds__day', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__day']
           SELECT
@@ -152,19 +152,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -181,7 +181,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -197,24 +197,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
@@ -422,7 +422,7 @@ FROM (
       ) subq_13
     ) subq_14
     GROUP BY
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
   ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
index 062fdbaa5d..9fd14131a3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
@@ -4,18 +4,18 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , booking__ds__month
   , metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_29.martian_day AS metric_time__martian_day
+    subq_29.alien_day AS metric_time__alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead) AS booking__ds__month
     , EXTRACT(year FROM subq_26.ds__day__lead) AS metric_time__extract_year
     , SUM(subq_22.bookings) AS bookings
@@ -26,19 +26,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -55,24 +55,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_24
     ) subq_25
     ON
-      cte_6.ds__martian_day = subq_25.ds__martian_day
+      cte_6.ds__alien_day = subq_25.ds__alien_day
   ) subq_26
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -89,7 +89,7 @@ FROM (
   ON
     subq_26.ds__day__lead = subq_29.ds
   GROUP BY
-    subq_29.martian_day
+    subq_29.alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead)
     , EXTRACT(year FROM subq_26.ds__day__lead)
 ) subq_33
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_multiple_time_spines__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_multiple_time_spines__plan0.sql
index f9a7eb3cfb..a3b068fca0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_multiple_time_spines__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_multiple_time_spines__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: Databricks
 -- Compute Metrics via Expressions
 SELECT
   subq_17.metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -230,19 +230,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_8.ts__hour AS ts__hour
-                  , subq_7.ds__martian_day AS ds__martian_day
+                  , subq_7.ds__alien_day AS ds__alien_day
                   , FIRST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__first_value
                   , LAST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                   ) AS ts__hour__row_number
                 FROM (
@@ -259,7 +259,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
                 INNER JOIN (
@@ -294,24 +294,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_9.ds__martian_day
-                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__first_value__lead
-                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__last_value__lead
+                  subq_9.ds__alien_day
+                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__first_value__lead
+                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                 ) subq_9
               ) subq_10
               ON
-                cte_2.ds__martian_day = subq_10.ds__martian_day
+                cte_2.ds__alien_day = subq_10.ds__alien_day
             ) subq_11
           ) subq_12
         ) subq_13
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
index c79047f831..ea89b02d0c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: Databricks
 -- Compute Metrics via Expressions
 SELECT
   metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['archived_users', 'metric_time__hour']
@@ -20,19 +20,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         time_spine_src_28005.ts AS ts__hour
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
         , FIRST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__first_value
         , LAST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
         ) AS ts__hour__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -53,24 +53,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__first_value__lead
-        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__last_value__lead
+        ds__alien_day
+        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__first_value__lead
+        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
       ) subq_27
     ) subq_28
     ON
-      cte_6.ds__martian_day = subq_28.ds__martian_day
+      cte_6.ds__alien_day = subq_28.ds__alien_day
   ) subq_29
   INNER JOIN (
     -- Read Elements From Semantic Model 'users_ds_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_only_window_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_only_window_grain__plan0.sql
index d26678069b..883d14aa7c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_only_window_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_only_window_grain__plan0.sql
@@ -4,33 +4,33 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
-  , subq_9.metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  subq_9.booking__ds__alien_day
+  , subq_9.metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
-    , subq_8.metric_time__martian_day
+    subq_8.booking__ds__alien_day
+    , subq_8.metric_time__alien_day
     , subq_8.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
-        , subq_6.metric_time__martian_day
+        subq_6.booking__ds__alien_day
+        , subq_6.metric_time__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
         SELECT
           subq_5.metric_time__day AS metric_time__day
-          , subq_5.booking__ds__martian_day AS booking__ds__martian_day
-          , subq_5.metric_time__martian_day AS metric_time__martian_day
+          , subq_5.booking__ds__alien_day AS booking__ds__alien_day
+          , subq_5.metric_time__alien_day AS metric_time__alien_day
           , subq_2.ds__day AS ds__day
           , subq_2.ds__week AS ds__week
           , subq_2.ds__month AS ds__month
@@ -129,12 +129,12 @@ FROM (
           , subq_2.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_2.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
         FROM (
-          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__martian_day', 'metric_time__martian_day']
+          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__alien_day', 'metric_time__alien_day']
           SELECT
             subq_4.ds__day
             , subq_4.metric_time__day
-            , subq_4.booking__ds__martian_day
-            , subq_4.metric_time__martian_day
+            , subq_4.booking__ds__alien_day
+            , subq_4.metric_time__alien_day
           FROM (
             -- Join Offset Custom Granularity to Base Granularity
             WITH cte_2 AS (
@@ -151,27 +151,27 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             )
 
             SELECT
               cte_2.ds__day AS ds__day
-              , subq_3.ds__martian_day__lead AS metric_time__day
-              , subq_3.ds__martian_day__lead AS booking__ds__martian_day
-              , subq_3.ds__martian_day__lead AS metric_time__martian_day
+              , subq_3.ds__alien_day__lead AS metric_time__day
+              , subq_3.ds__alien_day__lead AS booking__ds__alien_day
+              , subq_3.ds__alien_day__lead AS metric_time__alien_day
             FROM cte_2 cte_2
             INNER JOIN (
               -- Offset Custom Granularity
               SELECT
-                cte_2.ds__martian_day
-                , LEAD(cte_2.ds__martian_day, 1) OVER (ORDER BY cte_2.ds__martian_day) AS ds__martian_day__lead
+                cte_2.ds__alien_day
+                , LEAD(cte_2.ds__alien_day, 1) OVER (ORDER BY cte_2.ds__alien_day) AS ds__alien_day__lead
               FROM cte_2 cte_2
               GROUP BY
-                cte_2.ds__martian_day
+                cte_2.ds__alien_day
             ) subq_3
             ON
-              cte_2.ds__martian_day = subq_3.ds__martian_day
+              cte_2.ds__alien_day = subq_3.ds__alien_day
           ) subq_4
         ) subq_5
         INNER JOIN (
@@ -374,7 +374,7 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
index 0e46f26e2b..a33247d3b2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
-  , metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  booking__ds__alien_day
+  , metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_14.booking__ds__martian_day AS booking__ds__martian_day
-    , subq_14.metric_time__martian_day AS metric_time__martian_day
+    subq_14.booking__ds__alien_day AS booking__ds__alien_day
+    , subq_14.metric_time__alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Join Offset Custom Granularity to Base Granularity
@@ -22,26 +22,26 @@ FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     )
 
     SELECT
       cte_6.ds__day AS ds__day
-      , subq_13.ds__martian_day__lead AS booking__ds__martian_day
-      , subq_13.ds__martian_day__lead AS metric_time__martian_day
+      , subq_13.ds__alien_day__lead AS booking__ds__alien_day
+      , subq_13.ds__alien_day__lead AS metric_time__alien_day
     FROM cte_6 cte_6
     INNER JOIN (
       -- Offset Custom Granularity
       SELECT
-        ds__martian_day
-        , LEAD(ds__martian_day, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__lead
+        ds__alien_day
+        , LEAD(ds__alien_day, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__lead
       FROM cte_6 cte_6
       GROUP BY
-        ds__martian_day
+        ds__alien_day
     ) subq_13
     ON
-      cte_6.ds__martian_day = subq_13.ds__martian_day
+      cte_6.ds__alien_day = subq_13.ds__alien_day
   ) subq_14
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -54,6 +54,6 @@ FROM (
   ON
     subq_14.ds__day = subq_12.metric_time__day
   GROUP BY
-    subq_14.booking__ds__martian_day
-    , subq_14.metric_time__martian_day
+    subq_14.booking__ds__alien_day
+    , subq_14.metric_time__alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql
index 4de955b36a..0f8d1bd608 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_11.booking__ds__martian_day
+  subq_11.booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day) AS booking__ds__martian_day
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day) AS booking__ds__alien_day
     , MAX(subq_5.booking_value) AS booking_value
     , MAX(subq_10.bookers) AS bookers
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_4.booking__ds__martian_day
+      subq_4.booking__ds__alien_day
       , subq_4.booking_value
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
         , SUM(subq_3.booking_value) AS booking_value
       FROM (
-        -- Pass Only Elements: ['booking_value', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['booking_value', 'booking__ds__alien_day']
         SELECT
-          subq_2.booking__ds__martian_day
+          subq_2.booking__ds__alien_day
           , subq_2.booking_value
         FROM (
           -- Metric Time Dimension 'ds'
@@ -129,7 +129,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS booking__ds__martian_day
+            , subq_1.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -230,23 +230,23 @@ FROM (
         ) subq_2
       ) subq_3
       GROUP BY
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
     ) subq_4
   ) subq_5
   FULL OUTER JOIN (
     -- Compute Metrics via Expressions
     SELECT
-      subq_9.booking__ds__martian_day
+      subq_9.booking__ds__alien_day
       , subq_9.bookers
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
         , COUNT(DISTINCT subq_8.bookers) AS bookers
       FROM (
-        -- Pass Only Elements: ['bookers', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['bookers', 'booking__ds__alien_day']
         SELECT
-          subq_7.booking__ds__martian_day
+          subq_7.booking__ds__alien_day
           , subq_7.bookers
         FROM (
           -- Metric Time Dimension 'ds'
@@ -350,7 +350,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_6.martian_day AS booking__ds__martian_day
+            , subq_6.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -451,11 +451,11 @@ FROM (
         ) subq_7
       ) subq_8
       GROUP BY
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
     ) subq_9
   ) subq_10
   ON
-    subq_5.booking__ds__martian_day = subq_10.booking__ds__martian_day
+    subq_5.booking__ds__alien_day = subq_10.booking__ds__alien_day
   GROUP BY
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day)
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day)
 ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index df198b605b..7ba7efeb73 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS booking__ds__martian_day
+    subq_13.alien_day AS booking__ds__alien_day
     , SUM(bookings_source_src_28000.booking_value) AS booking_value
     , COUNT(DISTINCT bookings_source_src_28000.guest_id) AS bookers
   FROM ***************************.fct_bookings bookings_source_src_28000
@@ -22,5 +22,5 @@ FROM (
   ON
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index 46760e9d0b..df88cf2f89 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.metric_time__martian_day
+  subq_8.metric_time__alien_day
   , subq_8.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_7.metric_time__martian_day AS metric_time__martian_day
+    subq_7.metric_time__alien_day AS metric_time__alien_day
     , subq_4.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
     FROM (
       -- Change Column Aliases
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day AS metric_time__martian_day
+        , subq_5.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,22 +44,22 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
     GROUP BY
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
   ) subq_7
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -163,7 +163,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -264,8 +264,8 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   ON
-    subq_7.metric_time__martian_day = subq_4.metric_time__martian_day
+    subq_7.metric_time__alien_day = subq_4.metric_time__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index 662007d156..e435a06b98 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -5,25 +5,25 @@ sql_engine: Databricks
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day AS metric_time__martian_day
+  subq_16.metric_time__alien_day AS metric_time__alien_day
   , subq_13.bookings AS bookings_join_to_time_spine
 FROM (
   -- Read From Time Spine 'mf_time_spine'
   -- Change Column Aliases
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    martian_day AS metric_time__martian_day
+    alien_day AS metric_time__alien_day
   FROM ***************************.mf_time_spine time_spine_src_28006
   GROUP BY
-    martian_day
+    alien_day
 ) subq_16
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    subq_10.martian_day AS metric_time__martian_day
+    subq_10.alien_day AS metric_time__alien_day
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ LEFT OUTER JOIN (
   ON
     subq_9.ds__day = subq_10.ds
   GROUP BY
-    subq_10.martian_day
+    subq_10.alien_day
 ) subq_13
 ON
-  subq_16.metric_time__martian_day = subq_13.metric_time__martian_day
+  subq_16.metric_time__alien_day = subq_13.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
index dd1ec53a05..e4a6caeb0f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.metric_time__martian_day
+  subq_10.metric_time__alien_day
   , subq_10.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_9.metric_time__martian_day AS metric_time__martian_day
+    subq_9.metric_time__alien_day AS metric_time__alien_day
     , subq_5.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
     FROM (
       -- Constrain Output with WHERE
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,29 +59,29 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
     GROUP BY
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
   ) subq_9
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.bookings
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -282,7 +282,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -381,12 +381,12 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   ON
-    subq_9.metric_time__martian_day = subq_5.metric_time__martian_day
+    subq_9.metric_time__alien_day = subq_5.metric_time__alien_day
 ) subq_10
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
index 59a7a6280c..2cf60b4952 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -5,37 +5,37 @@ sql_engine: Databricks
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_20.metric_time__martian_day AS metric_time__martian_day
+  subq_20.metric_time__alien_day AS metric_time__alien_day
   , subq_16.bookings AS bookings_join_to_time_spine
 FROM (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     -- Change Column Aliases
     SELECT
-      martian_day AS metric_time__martian_day
+      alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
     , SUM(bookings) AS bookings
   FROM (
     -- Metric Time Dimension 'ds'
     -- Join to Custom Granularity Dataset
     SELECT
       subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,9 +48,9 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_16
 ON
-  subq_20.metric_time__martian_day = subq_16.metric_time__martian_day
+  subq_20.metric_time__alien_day = subq_16.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 00cf119558..502a5cf2ff 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,11 +59,11 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
   ) subq_9
   LEFT OUTER JOIN (
@@ -79,7 +79,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -280,7 +280,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -379,7 +379,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index e165d41366..025dcd859d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -17,10 +17,10 @@ FROM (
     -- Change Column Aliases
     SELECT
       ds AS metric_time__day
-      , martian_day AS metric_time__martian_day
+      , alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
@@ -35,7 +35,7 @@ LEFT OUTER JOIN (
     SELECT
       subq_11.ds__day AS metric_time__day
       , subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,7 +48,7 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_16
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 3a8cce1f67..85baf43523 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.metric_time__martian_day
+  subq_4.metric_time__alien_day
   , subq_4.listing__ds__month
   , subq_4.listings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
     , SUM(subq_3.listings) AS listings
   FROM (
-    -- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+    -- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
     SELECT
-      subq_2.metric_time__martian_day
+      subq_2.metric_time__alien_day
       , subq_2.listing__ds__month
       , subq_2.listings
     FROM (
@@ -90,7 +90,7 @@ FROM (
         , subq_0.listings AS listings
         , subq_0.largest_listing AS largest_listing
         , subq_0.smallest_listing AS smallest_listing
-        , subq_1.martian_day AS metric_time__martian_day
+        , subq_1.alien_day AS metric_time__alien_day
       FROM (
         -- Read Elements From Semantic Model 'listings_latest'
         SELECT
@@ -159,6 +159,6 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index d3bf024cc6..139c200de1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Databricks
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+-- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS metric_time__martian_day
+  subq_6.alien_day AS metric_time__alien_day
   , subq_5.listing__ds__month AS listing__ds__month
   , SUM(subq_5.listings) AS listings
 FROM (
@@ -24,5 +24,5 @@ LEFT OUTER JOIN
 ON
   subq_5.ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
   , subq_5.listing__ds__month
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql
index 3ef9569c67..8f78e169ba 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_5.bookings) AS bookings
   , MAX(subq_11.listings) AS listings
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , subq_4.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -124,7 +124,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -225,23 +225,23 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
 ) subq_5
 FULL OUTER JOIN (
   -- Compute Metrics via Expressions
   SELECT
-    subq_10.metric_time__martian_day
+    subq_10.metric_time__alien_day
     , subq_10.listings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
       , SUM(subq_9.listings) AS listings
     FROM (
-      -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['listings', 'metric_time__alien_day']
       SELECT
-        subq_8.metric_time__martian_day
+        subq_8.metric_time__alien_day
         , subq_8.listings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -314,7 +314,7 @@ FULL OUTER JOIN (
           , subq_6.listings AS listings
           , subq_6.largest_listing AS largest_listing
           , subq_6.smallest_listing AS smallest_listing
-          , subq_7.martian_day AS metric_time__martian_day
+          , subq_7.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'listings_latest'
           SELECT
@@ -383,10 +383,10 @@ FULL OUTER JOIN (
       ) subq_8
     ) subq_9
     GROUP BY
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
   ) subq_10
 ) subq_11
 ON
-  subq_5.metric_time__martian_day = subq_11.metric_time__martian_day
+  subq_5.metric_time__alien_day = subq_11.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day)
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index 38f2bc7489..82216d86da 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: Databricks
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_17.bookings) AS bookings
   , MAX(subq_23.listings) AS listings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS metric_time__martian_day
+    subq_13.alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -28,16 +28,16 @@ FROM (
   ON
     subq_12.ds__day = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
 FULL OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['listings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_19.martian_day AS metric_time__martian_day
+    subq_19.alien_day AS metric_time__alien_day
     , SUM(subq_18.listings) AS listings
   FROM (
     -- Read Elements From Semantic Model 'listings_latest'
@@ -51,9 +51,9 @@ FULL OUTER JOIN (
   ON
     subq_18.ds__day = subq_19.ds
   GROUP BY
-    subq_19.martian_day
+    subq_19.alien_day
 ) subq_23
 ON
-  subq_17.metric_time__martian_day = subq_23.metric_time__martian_day
+  subq_17.metric_time__alien_day = subq_23.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day)
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
index 0d27e5866c..baa8628890 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_7.metric_time__martian_day
+  subq_7.metric_time__alien_day
   , subq_7.metric_time__hour
   , subq_7.archived_users AS subdaily_cumulative_window_metric
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
     , SUM(subq_6.archived_users) AS archived_users
   FROM (
-    -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_5.metric_time__martian_day
+      subq_5.metric_time__alien_day
       , subq_5.metric_time__hour
       , subq_5.archived_users
     FROM (
@@ -213,7 +213,7 @@ FROM (
         , subq_1.home_state AS home_state
         , subq_1.user__home_state AS user__home_state
         , subq_1.archived_users AS archived_users
-        , subq_4.martian_day AS metric_time__martian_day
+        , subq_4.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -612,6 +612,6 @@ FROM (
     ) subq_5
   ) subq_6
   GROUP BY
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
 ) subq_7
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
index c4ddccd802..4ab1fad5e7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Databricks
 ---
 -- Join Self Over Time Range
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+-- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_12.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS metric_time__alien_day
   , subq_11.ts AS metric_time__hour
   , SUM(subq_9.archived_users) AS subdaily_cumulative_window_metric
 FROM ***************************.mf_time_spine_hour subq_11
@@ -31,5 +31,5 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', subq_11.ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
+  subq_12.alien_day
   , subq_11.ts
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
index 110fb23173..f48e289c9e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.metric_time__hour
   , subq_9.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_8.metric_time__martian_day AS metric_time__martian_day
+    subq_8.metric_time__alien_day AS metric_time__alien_day
     , subq_8.metric_time__hour AS metric_time__hour
     , subq_4.archived_users AS archived_users
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__hour
     FROM (
       -- Change Column Aliases
@@ -34,7 +34,7 @@ FROM (
         , subq_5.ts__extract_day AS ts__extract_day
         , subq_5.ts__extract_dow AS ts__extract_dow
         , subq_5.ts__extract_doy AS ts__extract_doy
-        , subq_6.martian_day AS metric_time__martian_day
+        , subq_6.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -61,13 +61,13 @@ FROM (
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
       , SUM(subq_3.archived_users) AS archived_users
     FROM (
-      -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+      -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.metric_time__hour
         , subq_2.archived_users
       FROM (
@@ -264,7 +264,7 @@ FROM (
           , subq_0.home_state AS home_state
           , subq_0.user__home_state AS user__home_state
           , subq_0.archived_users AS archived_users
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'users_ds_source'
           SELECT
@@ -456,7 +456,7 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
   ) subq_4
   ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
index 3fe963895c..305b9b5a34 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
@@ -5,15 +5,15 @@ sql_engine: Databricks
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_18.metric_time__martian_day AS metric_time__martian_day
+  subq_18.metric_time__alien_day AS metric_time__alien_day
   , subq_18.metric_time__hour AS metric_time__hour
   , subq_14.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Change Column Aliases
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
   SELECT
-    subq_16.martian_day AS metric_time__martian_day
+    subq_16.alien_day AS metric_time__alien_day
     , time_spine_src_28005.ts AS metric_time__hour
   FROM ***************************.mf_time_spine_hour time_spine_src_28005
   LEFT OUTER JOIN
@@ -24,10 +24,10 @@ FROM (
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'archived_at'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
   -- Aggregate Measures
   SELECT
-    subq_11.martian_day AS metric_time__martian_day
+    subq_11.alien_day AS metric_time__alien_day
     , subq_10.archived_at__hour AS metric_time__hour
     , SUM(subq_10.archived_users) AS archived_users
   FROM (
@@ -43,7 +43,7 @@ LEFT OUTER JOIN (
   ON
     subq_10.archived_at__day = subq_11.ds
   GROUP BY
-    subq_11.martian_day
+    subq_11.alien_day
     , subq_10.archived_at__hour
 ) subq_14
 ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index ebd4ec9d5f..9cca76006a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -2,10 +2,10 @@ test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
 sql_engine: Databricks
 ---
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
 FROM (
@@ -193,8 +193,8 @@ FROM (
     , subq_0.user__home_state AS user__home_state
     , subq_0.new_users AS new_users
     , subq_0.archived_users AS archived_users
-    , subq_4.martian_day AS metric_time__martian_day
-    , subq_5.martian_day AS user__bio_added_ts__martian_day
+    , subq_4.alien_day AS metric_time__alien_day
+    , subq_5.alien_day AS user__bio_added_ts__alien_day
   FROM (
     -- Read Elements From Semantic Model 'users_ds_source'
     SELECT
@@ -397,7 +397,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -409,7 +409,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -424,7 +424,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
@@ -439,7 +439,7 @@ FROM (
     subq_0.user__bio_added_ts__day = subq_5.ds
 ) subq_6
 GROUP BY
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 5e6182ae61..c00af7a6a9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -5,10 +5,10 @@ sql_engine: Databricks
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_12.martian_day AS user__bio_added_ts__martian_day
-  , subq_11.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS user__bio_added_ts__alien_day
+  , subq_11.alien_day AS metric_time__alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__month
   , time_spine_src_28006.ds AS metric_time__day
 FROM ***************************.dim_users users_ds_source_src_28000
@@ -23,7 +23,7 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', users_ds_source_src_28000.bio_added_ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
-  , subq_11.martian_day
+  subq_12.alien_day
+  , subq_11.alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts)
   , time_spine_src_28006.ds
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql
index b058c8129c..fde495ad8d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: Databricks
 ---
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
@@ -20,7 +20,7 @@ FROM (
     , subq_0.ds__extract_day AS ds__extract_day
     , subq_0.ds__extract_dow AS ds__extract_dow
     , subq_0.ds__extract_doy AS ds__extract_doy
-    , subq_0.ds__martian_day AS ds__martian_day
+    , subq_0.ds__alien_day AS ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -32,8 +32,8 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
-    , subq_1.martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
+    , subq_1.alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
   LEFT OUTER JOIN
@@ -57,4 +57,4 @@ FROM (
     subq_0.ds__day = subq_1.ds
 ) subq_2
 GROUP BY
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 4b117f7c87..e069838909 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: Databricks
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_4.martian_day AS metric_time__martian_day
+  subq_4.alien_day AS metric_time__alien_day
 FROM ***************************.mf_time_spine time_spine_src_28006
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_4
 ON
   time_spine_src_28006.ds = subq_4.ds
 GROUP BY
-  subq_4.martian_day
+  subq_4.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index 6a59a90987..4bbcaa0e28 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: Databricks
 ---
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Join to Custom Granularity Dataset
@@ -97,7 +97,7 @@ FROM (
     , bookings_source_src_28000.listing_id AS booking__listing
     , bookings_source_src_28000.guest_id AS booking__guest
     , bookings_source_src_28000.host_id AS booking__host
-    , subq_0.martian_day AS booking__ds__martian_day
+    , subq_0.alien_day AS booking__ds__alien_day
   FROM ***************************.fct_bookings bookings_source_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_0
@@ -105,4 +105,4 @@ FROM (
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_0.ds
 ) subq_1
 GROUP BY
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index 389d077a25..8cec8916d0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: Databricks
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_2.martian_day AS booking__ds__martian_day
+  subq_2.alien_day AS booking__ds__alien_day
 FROM ***************************.fct_bookings bookings_source_src_28000
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_2
 ON
   DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_2.ds
 GROUP BY
-  subq_2.martian_day
+  subq_2.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql
index 053e40c052..4f3704782d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -10,7 +10,7 @@ SELECT
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
   subq_2.listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 77f73c3d08..ffca95a47d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -13,13 +13,13 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
-    , subq_3.martian_day AS listing__ds__martian_day
+    , subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
   listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 0d418144cd..6d4f4832fe 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -4,13 +4,13 @@ docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
 sql_engine: Databricks
 ---
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index d69e144802..e618bffc11 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,20 +5,20 @@ docstring:
 sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  listing__ds__martian_day
+  listing__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Join to Custom Granularity Dataset
   SELECT
-    subq_3.martian_day AS listing__ds__martian_day
+    subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
-  listing__ds__martian_day
+  listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql
index f64748e1d7..9641fa7491 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0.sql
@@ -4,22 +4,22 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
+  subq_9.booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
+    subq_8.booking__ds__alien_day
     , subq_8.bookings AS bookings_5_days_ago
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
+        subq_6.booking__ds__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
@@ -123,7 +123,7 @@ FROM (
           , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_5.martian_day AS booking__ds__martian_day
+          , subq_5.alien_day AS booking__ds__alien_day
         FROM (
           -- Pass Only Elements: ['booking__ds__day',]
           SELECT
@@ -142,7 +142,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -157,7 +157,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
@@ -366,6 +366,6 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index b083f7d8fd..c5bef09855 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.martian_day AS booking__ds__martian_day
+    subq_15.alien_day AS booking__ds__alien_day
     , SUM(subq_11.bookings) AS bookings_5_days_ago
   FROM ***************************.mf_time_spine time_spine_src_28006
   INNER JOIN (
@@ -31,5 +31,5 @@ FROM (
   ON
     time_spine_src_28006.ds = subq_15.ds
   GROUP BY
-    subq_15.martian_day
+    subq_15.alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 948fdc78fa..1a9a2775cb 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -24,7 +24,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_6.metric_time__martian_day
+          subq_6.metric_time__alien_day
           , subq_6.ds__day
           , subq_6.ds__week
           , subq_6.ds__month
@@ -225,7 +225,7 @@ FROM (
             , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_5.martian_day AS metric_time__martian_day
+            , subq_5.alien_day AS metric_time__alien_day
           FROM (
             -- Pass Only Elements: ['metric_time__day',]
             SELECT
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -466,7 +466,7 @@ FROM (
           ON
             subq_4.metric_time__day = subq_5.ds
         ) subq_6
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_7
     ) subq_8
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index f72023cccd..bc8e0bcacd 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -20,7 +20,7 @@ FROM (
     SELECT
       time_spine_src_28006.ds AS metric_time__day
       , subq_12.bookings AS bookings
-      , subq_16.martian_day AS metric_time__martian_day
+      , subq_16.alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
     INNER JOIN (
       -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ FROM (
     ON
       time_spine_src_28006.ds = subq_16.ds
   ) subq_17
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_21
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql
index 77b3c357dd..0ac92a3b48 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.booking__ds__martian_day
+  subq_4.booking__ds__alien_day
   , subq_4.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
     , SUM(subq_3.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
     SELECT
-      subq_2.booking__ds__martian_day
+      subq_2.booking__ds__alien_day
       , subq_2.bookings
     FROM (
       -- Metric Time Dimension 'ds'
@@ -118,7 +118,7 @@ FROM (
         , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_1.martian_day AS booking__ds__martian_day
+        , subq_1.alien_day AS booking__ds__alien_day
       FROM (
         -- Read Elements From Semantic Model 'bookings_source'
         SELECT
@@ -219,5 +219,5 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index 6e4c1a5219..8023e34b05 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Databricks
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS booking__ds__martian_day
+  subq_6.alien_day AS booking__ds__alien_day
   , SUM(subq_5.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -22,4 +22,4 @@ LEFT OUTER JOIN
 ON
   subq_5.booking__ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index 9292b214b6..cd710d99b9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.listing__ds__martian_day
+  subq_8.listing__ds__alien_day
   , subq_8.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
     , SUM(subq_7.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
     SELECT
-      subq_6.listing__ds__martian_day
+      subq_6.listing__ds__alien_day
       , subq_6.bookings
     FROM (
       -- Join Standard Outputs
@@ -119,7 +119,7 @@ FROM (
         , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_5.martian_day AS listing__ds__martian_day
+        , subq_5.alien_day AS listing__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -462,5 +462,5 @@ FROM (
     ) subq_6
   ) subq_7
   GROUP BY
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index cef16d9bac..8aaa162646 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_14.martian_day AS listing__ds__martian_day
+  subq_14.alien_day AS listing__ds__alien_day
   , SUM(subq_10.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -27,4 +27,4 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_14.ds
 GROUP BY
-  subq_14.martian_day
+  subq_14.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql
index 745f7c0645..a2fbaef886 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -18,7 +18,7 @@ FROM (
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -219,7 +219,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -318,7 +318,7 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 2e5704b20e..a56b28d3d4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -15,7 +15,7 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -28,4 +28,4 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index eb10d51d0b..1b9350180e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -6,22 +6,22 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_5.metric_time__martian_day
+  subq_5.metric_time__alien_day
   , subq_5.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , SUM(subq_4.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+    -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -222,7 +222,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -321,9 +321,9 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
   GROUP BY
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index 11c9940066..3afe5dac7b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,18 +5,18 @@ docstring:
 sql_engine: Databricks
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+-- Pass Only Elements: ['bookings', 'metric_time__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , SUM(bookings) AS bookings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -29,6 +29,6 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index 242895d33b..cdd2250bac 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -6,17 +6,17 @@ sql_engine: Databricks
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_36.listing__user__ds__martian_day
+  subq_36.listing__user__ds__alien_day
   , subq_36.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
     , SUM(subq_35.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
     SELECT
-      subq_34.listing__user__ds__martian_day
+      subq_34.listing__user__ds__alien_day
       , subq_34.bookings
     FROM (
       -- Join Standard Outputs
@@ -122,7 +122,7 @@ FROM (
         , subq_25.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_25.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_25.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_33.martian_day AS listing__user__ds__martian_day
+        , subq_33.alien_day AS listing__user__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -1400,5 +1400,5 @@ FROM (
     ) subq_34
   ) subq_35
   GROUP BY
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
 ) subq_36
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index 223f9c9c1d..e2ba690395 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -6,11 +6,11 @@ sql_engine: Databricks
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_46.martian_day AS listing__user__ds__martian_day
+  subq_46.alien_day AS listing__user__ds__alien_day
   , SUM(subq_38.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -45,4 +45,4 @@ LEFT OUTER JOIN
 ON
   subq_45.user__ds__day = subq_46.ds
 GROUP BY
-  subq_46.martian_day
+  subq_46.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql
index bcab7c7c12..a6c56560ea 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_15.metric_time__martian_day
+  subq_15.metric_time__alien_day
   , CAST(subq_15.buys AS DOUBLE) / CAST(NULLIF(subq_15.visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_4.visits) AS visits
     , MAX(subq_14.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.visits
       FROM (
         -- Metric Time Dimension 'ds'
@@ -67,7 +67,7 @@ FROM (
           , subq_0.visit__referrer_id AS visit__referrer_id
           , subq_0.visits AS visits
           , subq_0.visitors AS visitors
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'visits_source'
           SELECT
@@ -110,22 +110,22 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
       , SUM(subq_13.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_12.metric_time__martian_day
+        subq_12.metric_time__alien_day
         , subq_12.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_11.metric_time__martian_day
+          subq_11.metric_time__alien_day
           , subq_11.metric_time__day
           , subq_11.user
           , subq_11.buys
@@ -141,14 +141,14 @@ FROM (
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_7.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_7.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_10.user
                 , subq_10.metric_time__day
                 , subq_10.mf_internal_uuid
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_7.metric_time__day) OVER (
               PARTITION BY
                 subq_10.user
@@ -168,9 +168,9 @@ FROM (
             , subq_10.mf_internal_uuid AS mf_internal_uuid
             , subq_10.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_6.metric_time__martian_day
+              subq_6.metric_time__alien_day
               , subq_6.metric_time__day
               , subq_6.user
               , subq_6.visits
@@ -219,7 +219,7 @@ FROM (
                 , subq_0.visit__referrer_id AS visit__referrer_id
                 , subq_0.visits AS visits
                 , subq_0.visitors AS visitors
-                , subq_5.martian_day AS metric_time__martian_day
+                , subq_5.alien_day AS metric_time__alien_day
               FROM (
                 -- Read Elements From Semantic Model 'visits_source'
                 SELECT
@@ -432,10 +432,10 @@ FROM (
       ) subq_12
     ) subq_13
     GROUP BY
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
   ) subq_14
   ON
-    subq_4.metric_time__martian_day = subq_14.metric_time__martian_day
+    subq_4.metric_time__alien_day = subq_14.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day)
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day)
 ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index 8cc7e5e079..1ed5340d91 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -14,21 +14,21 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE) / CAST(NULLIF(visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_20.visits) AS visits
     , MAX(subq_30.buys) AS buys
   FROM (
     -- Read From CTE For node_id=sma_28019
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      subq_17.martian_day AS metric_time__martian_day
+      subq_17.alien_day AS metric_time__alien_day
       , SUM(sma_28019_cte.visits) AS visits
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
@@ -36,14 +36,14 @@ FROM (
     ON
       sma_28019_cte.metric_time__day = subq_17.ds
     GROUP BY
-      subq_17.martian_day
+      subq_17.alien_day
   ) subq_20
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -56,14 +56,14 @@ FROM (
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_23.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_23.metric_time__alien_day) OVER (
           PARTITION BY
             subq_26.user
             , subq_26.metric_time__day
             , subq_26.mf_internal_uuid
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_23.metric_time__day) OVER (
           PARTITION BY
             subq_26.user
@@ -85,9 +85,9 @@ FROM (
       FROM (
         -- Read From CTE For node_id=sma_28019
         -- Join to Custom Granularity Dataset
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          subq_21.martian_day AS metric_time__martian_day
+          subq_21.alien_day AS metric_time__alien_day
           , sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
@@ -120,10 +120,10 @@ FROM (
         )
     ) subq_27
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_30
   ON
-    subq_20.metric_time__martian_day = subq_30.metric_time__martian_day
+    subq_20.metric_time__alien_day = subq_30.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day)
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day)
 ) subq_31
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index aa232a090b..ba5872b166 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_17.metric_time__martian_day
+  subq_17.metric_time__alien_day
   , CAST(subq_17.buys AS DOUBLE) / CAST(NULLIF(subq_17.visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_5.visits) AS visits
     , MAX(subq_16.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.visits
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -112,7 +112,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -153,26 +153,26 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
       , SUM(subq_15.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_14.metric_time__martian_day
+        subq_14.metric_time__alien_day
         , subq_14.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -188,14 +188,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -215,16 +215,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -311,7 +311,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -352,7 +352,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
@@ -526,10 +526,10 @@ FROM (
       ) subq_14
     ) subq_15
     GROUP BY
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
   ) subq_16
   ON
-    subq_5.metric_time__martian_day = subq_16.metric_time__martian_day
+    subq_5.metric_time__alien_day = subq_16.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day)
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day)
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index 2aea7a1ccd..a92b827591 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -14,43 +14,43 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE) / CAST(NULLIF(visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_23.visits) AS visits
     , MAX(subq_34.buys) AS buys
   FROM (
     -- Constrain Output with WHERE
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(visits) AS visits
     FROM (
       -- Read From CTE For node_id=sma_28019
       -- Join to Custom Granularity Dataset
       SELECT
         sma_28019_cte.visits AS visits
-        , subq_19.martian_day AS metric_time__martian_day
+        , subq_19.alien_day AS metric_time__alien_day
       FROM sma_28019_cte sma_28019_cte
       LEFT OUTER JOIN
         ***************************.mf_time_spine subq_19
       ON
         sma_28019_cte.metric_time__day = subq_19.ds
     ) subq_20
-    WHERE metric_time__martian_day = '2020-01-01'
+    WHERE metric_time__alien_day = '2020-01-01'
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_23
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -63,14 +63,14 @@ FROM (
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
           PARTITION BY
             subq_30.user
             , subq_30.metric_time__day
             , subq_30.mf_internal_uuid
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_27.metric_time__day) OVER (
           PARTITION BY
             subq_30.user
@@ -91,9 +91,9 @@ FROM (
         , subq_30.buys AS buys
       FROM (
         -- Constrain Output with WHERE
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          metric_time__martian_day
+          metric_time__alien_day
           , metric_time__day
           , subq_25.user
           , visits
@@ -104,14 +104,14 @@ FROM (
             sma_28019_cte.metric_time__day AS metric_time__day
             , sma_28019_cte.user AS user
             , sma_28019_cte.visits AS visits
-            , subq_24.martian_day AS metric_time__martian_day
+            , subq_24.alien_day AS metric_time__alien_day
           FROM sma_28019_cte sma_28019_cte
           LEFT OUTER JOIN
             ***************************.mf_time_spine subq_24
           ON
             sma_28019_cte.metric_time__day = subq_24.ds
         ) subq_25
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_27
       INNER JOIN (
         -- Read Elements From Semantic Model 'buys_source'
@@ -136,10 +136,10 @@ FROM (
         )
     ) subq_31
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_34
   ON
-    subq_23.metric_time__martian_day = subq_34.metric_time__martian_day
+    subq_23.metric_time__alien_day = subq_34.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day)
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day)
 ) subq_35
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index c3f277248c..68d2a06dec 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -108,7 +108,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -149,7 +149,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
   ) subq_5
@@ -164,7 +164,7 @@ FROM (
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -180,14 +180,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -207,16 +207,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -303,7 +303,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -344,7 +344,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 01085ca8c9..525ff86a58 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -27,14 +27,14 @@ FROM (
     -- Join to Custom Granularity Dataset
     SELECT
       sma_28019_cte.visits AS visits
-      , subq_19.martian_day AS metric_time__martian_day
+      , subq_19.alien_day AS metric_time__alien_day
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_19
     ON
       sma_28019_cte.metric_time__day = subq_19.ds
   ) subq_20
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_23
 CROSS JOIN (
   -- Find conversions for user within the range of 7 day
@@ -53,14 +53,14 @@ CROSS JOIN (
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS visits
-      , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+      , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
         PARTITION BY
           subq_30.user
           , subq_30.metric_time__day
           , subq_30.mf_internal_uuid
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-      ) AS metric_time__martian_day
+      ) AS metric_time__alien_day
       , FIRST_VALUE(subq_27.metric_time__day) OVER (
         PARTITION BY
           subq_30.user
@@ -81,9 +81,9 @@ CROSS JOIN (
       , subq_30.buys AS buys
     FROM (
       -- Constrain Output with WHERE
-      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
       SELECT
-        metric_time__martian_day
+        metric_time__alien_day
         , metric_time__day
         , subq_25.user
         , visits
@@ -94,14 +94,14 @@ CROSS JOIN (
           sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
-          , subq_24.martian_day AS metric_time__martian_day
+          , subq_24.alien_day AS metric_time__alien_day
         FROM sma_28019_cte sma_28019_cte
         LEFT OUTER JOIN
           ***************************.mf_time_spine subq_24
         ON
           sma_28019_cte.metric_time__day = subq_24.ds
       ) subq_25
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_27
     INNER JOIN (
       -- Read Elements From Semantic Model 'buys_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql
index 3bf14b71eb..0d89b81224 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -4,29 +4,29 @@ sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
 FROM (
   -- Window Function for Metric Re-aggregation
   SELECT
-    subq_8.metric_time__martian_day
-    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__martian_day) AS trailing_2_months_revenue
+    subq_8.metric_time__alien_day
+    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__day
       , subq_7.txn_revenue AS trailing_2_months_revenue
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
         , SUM(subq_6.txn_revenue) AS txn_revenue
       FROM (
-        -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+        -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
         SELECT
-          subq_5.metric_time__martian_day
+          subq_5.metric_time__alien_day
           , subq_5.metric_time__day
           , subq_5.txn_revenue
         FROM (
@@ -69,7 +69,7 @@ FROM (
             , subq_1.user AS user
             , subq_1.revenue_instance__user AS revenue_instance__user
             , subq_1.txn_revenue AS txn_revenue
-            , subq_4.martian_day AS metric_time__martian_day
+            , subq_4.alien_day AS metric_time__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -159,11 +159,11 @@ FROM (
         ) subq_5
       ) subq_6
       GROUP BY
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
     ) subq_7
   ) subq_8
 ) subq_9
 GROUP BY
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index b6d3d325f4..dd72416c74 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,21 +4,21 @@ sql_engine: DuckDB
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
 FROM (
   -- Compute Metrics via Expressions
   -- Window Function for Metric Re-aggregation
   SELECT
-    metric_time__martian_day
-    , AVG(txn_revenue) OVER (PARTITION BY metric_time__martian_day) AS trailing_2_months_revenue
+    metric_time__alien_day
+    , AVG(txn_revenue) OVER (PARTITION BY metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Join Self Over Time Range
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+    -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
     -- Aggregate Measures
     SELECT
-      subq_14.martian_day AS metric_time__martian_day
+      subq_14.alien_day AS metric_time__alien_day
       , subq_13.ds AS metric_time__day
       , SUM(revenue_src_28000.revenue) AS txn_revenue
     FROM ***************************.mf_time_spine subq_13
@@ -35,10 +35,10 @@ FROM (
     ON
       subq_13.ds = subq_14.ds
     GROUP BY
-      subq_14.martian_day
+      subq_14.alien_day
       , subq_13.ds
   ) subq_17
 ) subq_19
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window__plan0.sql
index feaa0930b8..881aea6304 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: DuckDB
 -- Compute Metrics via Expressions
 SELECT
   subq_15.metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -138,19 +138,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -167,7 +167,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -183,24 +183,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window__plan0_optimized.sql
index 9a70daeb57..a528ba7bda 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: DuckDB
 -- Compute Metrics via Expressions
 SELECT
   metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['bookings', 'metric_time__day']
@@ -21,19 +21,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -50,24 +50,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_23
     ) subq_24
     ON
-      cte_6.ds__martian_day = subq_24.ds__martian_day
+      cte_6.ds__alien_day = subq_24.ds__alien_day
   ) subq_25
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
index d88a37300a..f8a137b692 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day
+  subq_16.metric_time__alien_day
   , subq_16.booking__ds__month
   , subq_16.metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.metric_time__martian_day
+    subq_15.metric_time__alien_day
     , subq_15.booking__ds__month
     , subq_15.metric_time__extract_year
     , subq_15.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
       , SUM(subq_14.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
       SELECT
-        subq_13.metric_time__martian_day
+        subq_13.metric_time__alien_day
         , subq_13.booking__ds__month
         , subq_13.metric_time__extract_year
         , subq_13.bookings
@@ -131,7 +131,7 @@ FROM (
           , subq_5.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_5.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_5.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_12.martian_day AS metric_time__martian_day
+          , subq_12.alien_day AS metric_time__alien_day
         FROM (
           -- Pass Only Elements: ['ds__day', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__day']
           SELECT
@@ -152,19 +152,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -181,7 +181,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -197,24 +197,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
@@ -422,7 +422,7 @@ FROM (
       ) subq_13
     ) subq_14
     GROUP BY
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
   ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
index b220db88be..05df653d8d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
@@ -4,18 +4,18 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , booking__ds__month
   , metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_29.martian_day AS metric_time__martian_day
+    subq_29.alien_day AS metric_time__alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead) AS booking__ds__month
     , EXTRACT(year FROM subq_26.ds__day__lead) AS metric_time__extract_year
     , SUM(subq_22.bookings) AS bookings
@@ -26,19 +26,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -55,24 +55,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_24
     ) subq_25
     ON
-      cte_6.ds__martian_day = subq_25.ds__martian_day
+      cte_6.ds__alien_day = subq_25.ds__alien_day
   ) subq_26
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -89,7 +89,7 @@ FROM (
   ON
     subq_26.ds__day__lead = subq_29.ds
   GROUP BY
-    subq_29.martian_day
+    subq_29.alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead)
     , EXTRACT(year FROM subq_26.ds__day__lead)
 ) subq_33
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_multiple_time_spines__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_multiple_time_spines__plan0.sql
index 5173f7af03..561a96469b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_multiple_time_spines__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_multiple_time_spines__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: DuckDB
 -- Compute Metrics via Expressions
 SELECT
   subq_17.metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -230,19 +230,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_8.ts__hour AS ts__hour
-                  , subq_7.ds__martian_day AS ds__martian_day
+                  , subq_7.ds__alien_day AS ds__alien_day
                   , FIRST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__first_value
                   , LAST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                   ) AS ts__hour__row_number
                 FROM (
@@ -259,7 +259,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
                 INNER JOIN (
@@ -294,24 +294,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_9.ds__martian_day
-                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__first_value__lead
-                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__last_value__lead
+                  subq_9.ds__alien_day
+                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__first_value__lead
+                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                 ) subq_9
               ) subq_10
               ON
-                cte_2.ds__martian_day = subq_10.ds__martian_day
+                cte_2.ds__alien_day = subq_10.ds__alien_day
             ) subq_11
           ) subq_12
         ) subq_13
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
index 2732570fcc..d8a0a3af6f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: DuckDB
 -- Compute Metrics via Expressions
 SELECT
   metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['archived_users', 'metric_time__hour']
@@ -20,19 +20,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         time_spine_src_28005.ts AS ts__hour
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
         , FIRST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__first_value
         , LAST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
         ) AS ts__hour__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -53,24 +53,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__first_value__lead
-        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__last_value__lead
+        ds__alien_day
+        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__first_value__lead
+        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
       ) subq_27
     ) subq_28
     ON
-      cte_6.ds__martian_day = subq_28.ds__martian_day
+      cte_6.ds__alien_day = subq_28.ds__alien_day
   ) subq_29
   INNER JOIN (
     -- Read Elements From Semantic Model 'users_ds_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_only_window_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_only_window_grain__plan0.sql
index 4ec47e7996..00f6bf6932 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_only_window_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_only_window_grain__plan0.sql
@@ -4,33 +4,33 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
-  , subq_9.metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  subq_9.booking__ds__alien_day
+  , subq_9.metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
-    , subq_8.metric_time__martian_day
+    subq_8.booking__ds__alien_day
+    , subq_8.metric_time__alien_day
     , subq_8.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
-        , subq_6.metric_time__martian_day
+        subq_6.booking__ds__alien_day
+        , subq_6.metric_time__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
         SELECT
           subq_5.metric_time__day AS metric_time__day
-          , subq_5.booking__ds__martian_day AS booking__ds__martian_day
-          , subq_5.metric_time__martian_day AS metric_time__martian_day
+          , subq_5.booking__ds__alien_day AS booking__ds__alien_day
+          , subq_5.metric_time__alien_day AS metric_time__alien_day
           , subq_2.ds__day AS ds__day
           , subq_2.ds__week AS ds__week
           , subq_2.ds__month AS ds__month
@@ -129,12 +129,12 @@ FROM (
           , subq_2.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_2.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
         FROM (
-          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__martian_day', 'metric_time__martian_day']
+          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__alien_day', 'metric_time__alien_day']
           SELECT
             subq_4.ds__day
             , subq_4.metric_time__day
-            , subq_4.booking__ds__martian_day
-            , subq_4.metric_time__martian_day
+            , subq_4.booking__ds__alien_day
+            , subq_4.metric_time__alien_day
           FROM (
             -- Join Offset Custom Granularity to Base Granularity
             WITH cte_2 AS (
@@ -151,27 +151,27 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             )
 
             SELECT
               cte_2.ds__day AS ds__day
-              , subq_3.ds__martian_day__lead AS metric_time__day
-              , subq_3.ds__martian_day__lead AS booking__ds__martian_day
-              , subq_3.ds__martian_day__lead AS metric_time__martian_day
+              , subq_3.ds__alien_day__lead AS metric_time__day
+              , subq_3.ds__alien_day__lead AS booking__ds__alien_day
+              , subq_3.ds__alien_day__lead AS metric_time__alien_day
             FROM cte_2 cte_2
             INNER JOIN (
               -- Offset Custom Granularity
               SELECT
-                cte_2.ds__martian_day
-                , LEAD(cte_2.ds__martian_day, 1) OVER (ORDER BY cte_2.ds__martian_day) AS ds__martian_day__lead
+                cte_2.ds__alien_day
+                , LEAD(cte_2.ds__alien_day, 1) OVER (ORDER BY cte_2.ds__alien_day) AS ds__alien_day__lead
               FROM cte_2 cte_2
               GROUP BY
-                cte_2.ds__martian_day
+                cte_2.ds__alien_day
             ) subq_3
             ON
-              cte_2.ds__martian_day = subq_3.ds__martian_day
+              cte_2.ds__alien_day = subq_3.ds__alien_day
           ) subq_4
         ) subq_5
         INNER JOIN (
@@ -374,7 +374,7 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
index f0767b339c..b7adf8ed71 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
-  , metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  booking__ds__alien_day
+  , metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_14.booking__ds__martian_day AS booking__ds__martian_day
-    , subq_14.metric_time__martian_day AS metric_time__martian_day
+    subq_14.booking__ds__alien_day AS booking__ds__alien_day
+    , subq_14.metric_time__alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Join Offset Custom Granularity to Base Granularity
@@ -22,26 +22,26 @@ FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     )
 
     SELECT
       cte_6.ds__day AS ds__day
-      , subq_13.ds__martian_day__lead AS booking__ds__martian_day
-      , subq_13.ds__martian_day__lead AS metric_time__martian_day
+      , subq_13.ds__alien_day__lead AS booking__ds__alien_day
+      , subq_13.ds__alien_day__lead AS metric_time__alien_day
     FROM cte_6 cte_6
     INNER JOIN (
       -- Offset Custom Granularity
       SELECT
-        ds__martian_day
-        , LEAD(ds__martian_day, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__lead
+        ds__alien_day
+        , LEAD(ds__alien_day, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__lead
       FROM cte_6 cte_6
       GROUP BY
-        ds__martian_day
+        ds__alien_day
     ) subq_13
     ON
-      cte_6.ds__martian_day = subq_13.ds__martian_day
+      cte_6.ds__alien_day = subq_13.ds__alien_day
   ) subq_14
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -54,6 +54,6 @@ FROM (
   ON
     subq_14.ds__day = subq_12.metric_time__day
   GROUP BY
-    subq_14.booking__ds__martian_day
-    , subq_14.metric_time__martian_day
+    subq_14.booking__ds__alien_day
+    , subq_14.metric_time__alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql
index 6c33a0f003..4c993f15b9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_11.booking__ds__martian_day
+  subq_11.booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day) AS booking__ds__martian_day
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day) AS booking__ds__alien_day
     , MAX(subq_5.booking_value) AS booking_value
     , MAX(subq_10.bookers) AS bookers
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_4.booking__ds__martian_day
+      subq_4.booking__ds__alien_day
       , subq_4.booking_value
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
         , SUM(subq_3.booking_value) AS booking_value
       FROM (
-        -- Pass Only Elements: ['booking_value', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['booking_value', 'booking__ds__alien_day']
         SELECT
-          subq_2.booking__ds__martian_day
+          subq_2.booking__ds__alien_day
           , subq_2.booking_value
         FROM (
           -- Metric Time Dimension 'ds'
@@ -129,7 +129,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS booking__ds__martian_day
+            , subq_1.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -230,23 +230,23 @@ FROM (
         ) subq_2
       ) subq_3
       GROUP BY
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
     ) subq_4
   ) subq_5
   FULL OUTER JOIN (
     -- Compute Metrics via Expressions
     SELECT
-      subq_9.booking__ds__martian_day
+      subq_9.booking__ds__alien_day
       , subq_9.bookers
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
         , COUNT(DISTINCT subq_8.bookers) AS bookers
       FROM (
-        -- Pass Only Elements: ['bookers', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['bookers', 'booking__ds__alien_day']
         SELECT
-          subq_7.booking__ds__martian_day
+          subq_7.booking__ds__alien_day
           , subq_7.bookers
         FROM (
           -- Metric Time Dimension 'ds'
@@ -350,7 +350,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_6.martian_day AS booking__ds__martian_day
+            , subq_6.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -451,11 +451,11 @@ FROM (
         ) subq_7
       ) subq_8
       GROUP BY
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
     ) subq_9
   ) subq_10
   ON
-    subq_5.booking__ds__martian_day = subq_10.booking__ds__martian_day
+    subq_5.booking__ds__alien_day = subq_10.booking__ds__alien_day
   GROUP BY
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day)
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day)
 ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index 4390109145..e3dc359a24 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS booking__ds__martian_day
+    subq_13.alien_day AS booking__ds__alien_day
     , SUM(bookings_source_src_28000.booking_value) AS booking_value
     , COUNT(DISTINCT bookings_source_src_28000.guest_id) AS bookers
   FROM ***************************.fct_bookings bookings_source_src_28000
@@ -22,5 +22,5 @@ FROM (
   ON
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index 4656af2c6a..d8a8921a4f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.metric_time__martian_day
+  subq_8.metric_time__alien_day
   , subq_8.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_7.metric_time__martian_day AS metric_time__martian_day
+    subq_7.metric_time__alien_day AS metric_time__alien_day
     , subq_4.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
     FROM (
       -- Change Column Aliases
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day AS metric_time__martian_day
+        , subq_5.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,22 +44,22 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
     GROUP BY
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
   ) subq_7
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -163,7 +163,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -264,8 +264,8 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   ON
-    subq_7.metric_time__martian_day = subq_4.metric_time__martian_day
+    subq_7.metric_time__alien_day = subq_4.metric_time__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index cdcc9a1e05..c5ed7a638c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -5,25 +5,25 @@ sql_engine: DuckDB
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day AS metric_time__martian_day
+  subq_16.metric_time__alien_day AS metric_time__alien_day
   , subq_13.bookings AS bookings_join_to_time_spine
 FROM (
   -- Read From Time Spine 'mf_time_spine'
   -- Change Column Aliases
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    martian_day AS metric_time__martian_day
+    alien_day AS metric_time__alien_day
   FROM ***************************.mf_time_spine time_spine_src_28006
   GROUP BY
-    martian_day
+    alien_day
 ) subq_16
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    subq_10.martian_day AS metric_time__martian_day
+    subq_10.alien_day AS metric_time__alien_day
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ LEFT OUTER JOIN (
   ON
     subq_9.ds__day = subq_10.ds
   GROUP BY
-    subq_10.martian_day
+    subq_10.alien_day
 ) subq_13
 ON
-  subq_16.metric_time__martian_day = subq_13.metric_time__martian_day
+  subq_16.metric_time__alien_day = subq_13.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
index 93fcbec6c1..554c9a623a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.metric_time__martian_day
+  subq_10.metric_time__alien_day
   , subq_10.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_9.metric_time__martian_day AS metric_time__martian_day
+    subq_9.metric_time__alien_day AS metric_time__alien_day
     , subq_5.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
     FROM (
       -- Constrain Output with WHERE
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,29 +59,29 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
     GROUP BY
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
   ) subq_9
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.bookings
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -282,7 +282,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -381,12 +381,12 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   ON
-    subq_9.metric_time__martian_day = subq_5.metric_time__martian_day
+    subq_9.metric_time__alien_day = subq_5.metric_time__alien_day
 ) subq_10
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
index 9e8d06b1ec..6885ee182f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -5,37 +5,37 @@ sql_engine: DuckDB
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_20.metric_time__martian_day AS metric_time__martian_day
+  subq_20.metric_time__alien_day AS metric_time__alien_day
   , subq_16.bookings AS bookings_join_to_time_spine
 FROM (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     -- Change Column Aliases
     SELECT
-      martian_day AS metric_time__martian_day
+      alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
     , SUM(bookings) AS bookings
   FROM (
     -- Metric Time Dimension 'ds'
     -- Join to Custom Granularity Dataset
     SELECT
       subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,9 +48,9 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_16
 ON
-  subq_20.metric_time__martian_day = subq_16.metric_time__martian_day
+  subq_20.metric_time__alien_day = subq_16.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index f60a3d48e1..f6c4af26f7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,11 +59,11 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
   ) subq_9
   LEFT OUTER JOIN (
@@ -79,7 +79,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -280,7 +280,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -379,7 +379,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 633027ce0b..e5df95ce79 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -17,10 +17,10 @@ FROM (
     -- Change Column Aliases
     SELECT
       ds AS metric_time__day
-      , martian_day AS metric_time__martian_day
+      , alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
@@ -35,7 +35,7 @@ LEFT OUTER JOIN (
     SELECT
       subq_11.ds__day AS metric_time__day
       , subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,7 +48,7 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_16
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index cbb2a4303e..0249a4c015 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.metric_time__martian_day
+  subq_4.metric_time__alien_day
   , subq_4.listing__ds__month
   , subq_4.listings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
     , SUM(subq_3.listings) AS listings
   FROM (
-    -- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+    -- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
     SELECT
-      subq_2.metric_time__martian_day
+      subq_2.metric_time__alien_day
       , subq_2.listing__ds__month
       , subq_2.listings
     FROM (
@@ -90,7 +90,7 @@ FROM (
         , subq_0.listings AS listings
         , subq_0.largest_listing AS largest_listing
         , subq_0.smallest_listing AS smallest_listing
-        , subq_1.martian_day AS metric_time__martian_day
+        , subq_1.alien_day AS metric_time__alien_day
       FROM (
         -- Read Elements From Semantic Model 'listings_latest'
         SELECT
@@ -159,6 +159,6 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index cefe78b9c6..cd703749a5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: DuckDB
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+-- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS metric_time__martian_day
+  subq_6.alien_day AS metric_time__alien_day
   , subq_5.listing__ds__month AS listing__ds__month
   , SUM(subq_5.listings) AS listings
 FROM (
@@ -24,5 +24,5 @@ LEFT OUTER JOIN
 ON
   subq_5.ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
   , subq_5.listing__ds__month
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql
index f736fcd0b3..587b5ab635 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_5.bookings) AS bookings
   , MAX(subq_11.listings) AS listings
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , subq_4.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -124,7 +124,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -225,23 +225,23 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
 ) subq_5
 FULL OUTER JOIN (
   -- Compute Metrics via Expressions
   SELECT
-    subq_10.metric_time__martian_day
+    subq_10.metric_time__alien_day
     , subq_10.listings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
       , SUM(subq_9.listings) AS listings
     FROM (
-      -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['listings', 'metric_time__alien_day']
       SELECT
-        subq_8.metric_time__martian_day
+        subq_8.metric_time__alien_day
         , subq_8.listings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -314,7 +314,7 @@ FULL OUTER JOIN (
           , subq_6.listings AS listings
           , subq_6.largest_listing AS largest_listing
           , subq_6.smallest_listing AS smallest_listing
-          , subq_7.martian_day AS metric_time__martian_day
+          , subq_7.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'listings_latest'
           SELECT
@@ -383,10 +383,10 @@ FULL OUTER JOIN (
       ) subq_8
     ) subq_9
     GROUP BY
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
   ) subq_10
 ) subq_11
 ON
-  subq_5.metric_time__martian_day = subq_11.metric_time__martian_day
+  subq_5.metric_time__alien_day = subq_11.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day)
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index 21cbf2586c..12f86daaff 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: DuckDB
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_17.bookings) AS bookings
   , MAX(subq_23.listings) AS listings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS metric_time__martian_day
+    subq_13.alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -28,16 +28,16 @@ FROM (
   ON
     subq_12.ds__day = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
 FULL OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['listings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_19.martian_day AS metric_time__martian_day
+    subq_19.alien_day AS metric_time__alien_day
     , SUM(subq_18.listings) AS listings
   FROM (
     -- Read Elements From Semantic Model 'listings_latest'
@@ -51,9 +51,9 @@ FULL OUTER JOIN (
   ON
     subq_18.ds__day = subq_19.ds
   GROUP BY
-    subq_19.martian_day
+    subq_19.alien_day
 ) subq_23
 ON
-  subq_17.metric_time__martian_day = subq_23.metric_time__martian_day
+  subq_17.metric_time__alien_day = subq_23.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day)
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
index be8507f11c..8b75eb23d3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_7.metric_time__martian_day
+  subq_7.metric_time__alien_day
   , subq_7.metric_time__hour
   , subq_7.archived_users AS subdaily_cumulative_window_metric
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
     , SUM(subq_6.archived_users) AS archived_users
   FROM (
-    -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_5.metric_time__martian_day
+      subq_5.metric_time__alien_day
       , subq_5.metric_time__hour
       , subq_5.archived_users
     FROM (
@@ -213,7 +213,7 @@ FROM (
         , subq_1.home_state AS home_state
         , subq_1.user__home_state AS user__home_state
         , subq_1.archived_users AS archived_users
-        , subq_4.martian_day AS metric_time__martian_day
+        , subq_4.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -612,6 +612,6 @@ FROM (
     ) subq_5
   ) subq_6
   GROUP BY
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
 ) subq_7
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
index f665121b72..69d1232a47 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: DuckDB
 ---
 -- Join Self Over Time Range
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+-- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_12.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS metric_time__alien_day
   , subq_11.ts AS metric_time__hour
   , SUM(subq_9.archived_users) AS subdaily_cumulative_window_metric
 FROM ***************************.mf_time_spine_hour subq_11
@@ -31,5 +31,5 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', subq_11.ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
+  subq_12.alien_day
   , subq_11.ts
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
index 48e5118a42..aaceb31ec4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.metric_time__hour
   , subq_9.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_8.metric_time__martian_day AS metric_time__martian_day
+    subq_8.metric_time__alien_day AS metric_time__alien_day
     , subq_8.metric_time__hour AS metric_time__hour
     , subq_4.archived_users AS archived_users
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__hour
     FROM (
       -- Change Column Aliases
@@ -34,7 +34,7 @@ FROM (
         , subq_5.ts__extract_day AS ts__extract_day
         , subq_5.ts__extract_dow AS ts__extract_dow
         , subq_5.ts__extract_doy AS ts__extract_doy
-        , subq_6.martian_day AS metric_time__martian_day
+        , subq_6.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -61,13 +61,13 @@ FROM (
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
       , SUM(subq_3.archived_users) AS archived_users
     FROM (
-      -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+      -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.metric_time__hour
         , subq_2.archived_users
       FROM (
@@ -264,7 +264,7 @@ FROM (
           , subq_0.home_state AS home_state
           , subq_0.user__home_state AS user__home_state
           , subq_0.archived_users AS archived_users
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'users_ds_source'
           SELECT
@@ -456,7 +456,7 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
   ) subq_4
   ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
index 12e73f147c..3420fe0259 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
@@ -5,15 +5,15 @@ sql_engine: DuckDB
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_18.metric_time__martian_day AS metric_time__martian_day
+  subq_18.metric_time__alien_day AS metric_time__alien_day
   , subq_18.metric_time__hour AS metric_time__hour
   , subq_14.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Change Column Aliases
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
   SELECT
-    subq_16.martian_day AS metric_time__martian_day
+    subq_16.alien_day AS metric_time__alien_day
     , time_spine_src_28005.ts AS metric_time__hour
   FROM ***************************.mf_time_spine_hour time_spine_src_28005
   LEFT OUTER JOIN
@@ -24,10 +24,10 @@ FROM (
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'archived_at'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
   -- Aggregate Measures
   SELECT
-    subq_11.martian_day AS metric_time__martian_day
+    subq_11.alien_day AS metric_time__alien_day
     , subq_10.archived_at__hour AS metric_time__hour
     , SUM(subq_10.archived_users) AS archived_users
   FROM (
@@ -43,7 +43,7 @@ LEFT OUTER JOIN (
   ON
     subq_10.archived_at__day = subq_11.ds
   GROUP BY
-    subq_11.martian_day
+    subq_11.alien_day
     , subq_10.archived_at__hour
 ) subq_14
 ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 1caf91d65d..b318f38285 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -2,10 +2,10 @@ test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
 sql_engine: DuckDB
 ---
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
 FROM (
@@ -193,8 +193,8 @@ FROM (
     , subq_0.user__home_state AS user__home_state
     , subq_0.new_users AS new_users
     , subq_0.archived_users AS archived_users
-    , subq_4.martian_day AS metric_time__martian_day
-    , subq_5.martian_day AS user__bio_added_ts__martian_day
+    , subq_4.alien_day AS metric_time__alien_day
+    , subq_5.alien_day AS user__bio_added_ts__alien_day
   FROM (
     -- Read Elements From Semantic Model 'users_ds_source'
     SELECT
@@ -397,7 +397,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -409,7 +409,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -424,7 +424,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
@@ -439,7 +439,7 @@ FROM (
     subq_0.user__bio_added_ts__day = subq_5.ds
 ) subq_6
 GROUP BY
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 6d72678d02..03d04e6728 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -5,10 +5,10 @@ sql_engine: DuckDB
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_12.martian_day AS user__bio_added_ts__martian_day
-  , subq_11.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS user__bio_added_ts__alien_day
+  , subq_11.alien_day AS metric_time__alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__month
   , time_spine_src_28006.ds AS metric_time__day
 FROM ***************************.dim_users users_ds_source_src_28000
@@ -23,7 +23,7 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', users_ds_source_src_28000.bio_added_ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
-  , subq_11.martian_day
+  subq_12.alien_day
+  , subq_11.alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts)
   , time_spine_src_28006.ds
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql
index ce794260af..34e6340383 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: DuckDB
 ---
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
@@ -20,7 +20,7 @@ FROM (
     , subq_0.ds__extract_day AS ds__extract_day
     , subq_0.ds__extract_dow AS ds__extract_dow
     , subq_0.ds__extract_doy AS ds__extract_doy
-    , subq_0.ds__martian_day AS ds__martian_day
+    , subq_0.ds__alien_day AS ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -32,8 +32,8 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
-    , subq_1.martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
+    , subq_1.alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
   LEFT OUTER JOIN
@@ -57,4 +57,4 @@ FROM (
     subq_0.ds__day = subq_1.ds
 ) subq_2
 GROUP BY
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 8bc925e0fc..7c37d07c0d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: DuckDB
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_4.martian_day AS metric_time__martian_day
+  subq_4.alien_day AS metric_time__alien_day
 FROM ***************************.mf_time_spine time_spine_src_28006
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_4
 ON
   time_spine_src_28006.ds = subq_4.ds
 GROUP BY
-  subq_4.martian_day
+  subq_4.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index e6c062e75b..87f34d1560 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: DuckDB
 ---
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Join to Custom Granularity Dataset
@@ -97,7 +97,7 @@ FROM (
     , bookings_source_src_28000.listing_id AS booking__listing
     , bookings_source_src_28000.guest_id AS booking__guest
     , bookings_source_src_28000.host_id AS booking__host
-    , subq_0.martian_day AS booking__ds__martian_day
+    , subq_0.alien_day AS booking__ds__alien_day
   FROM ***************************.fct_bookings bookings_source_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_0
@@ -105,4 +105,4 @@ FROM (
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_0.ds
 ) subq_1
 GROUP BY
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index fceb97373a..01e5ebf9ae 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: DuckDB
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_2.martian_day AS booking__ds__martian_day
+  subq_2.alien_day AS booking__ds__alien_day
 FROM ***************************.fct_bookings bookings_source_src_28000
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_2
 ON
   DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_2.ds
 GROUP BY
-  subq_2.martian_day
+  subq_2.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql
index 0b27f8714c..3a23e70bf3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -10,7 +10,7 @@ SELECT
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
   subq_2.listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 36cabda1d0..4572d14232 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -13,13 +13,13 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
-    , subq_3.martian_day AS listing__ds__martian_day
+    , subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
   listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 499fa8cb05..ed3953de62 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -4,13 +4,13 @@ docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
 sql_engine: DuckDB
 ---
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index 9640f1d518..1c4a8f375f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,20 +5,20 @@ docstring:
 sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  listing__ds__martian_day
+  listing__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Join to Custom Granularity Dataset
   SELECT
-    subq_3.martian_day AS listing__ds__martian_day
+    subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
-  listing__ds__martian_day
+  listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql
index 9bb6394dab..8dd8a710f9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0.sql
@@ -4,22 +4,22 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
+  subq_9.booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
+    subq_8.booking__ds__alien_day
     , subq_8.bookings AS bookings_5_days_ago
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
+        subq_6.booking__ds__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
@@ -123,7 +123,7 @@ FROM (
           , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_5.martian_day AS booking__ds__martian_day
+          , subq_5.alien_day AS booking__ds__alien_day
         FROM (
           -- Pass Only Elements: ['booking__ds__day',]
           SELECT
@@ -142,7 +142,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -157,7 +157,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
@@ -366,6 +366,6 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index 7de34b0ee2..945d94b216 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.martian_day AS booking__ds__martian_day
+    subq_15.alien_day AS booking__ds__alien_day
     , SUM(subq_11.bookings) AS bookings_5_days_ago
   FROM ***************************.mf_time_spine time_spine_src_28006
   INNER JOIN (
@@ -31,5 +31,5 @@ FROM (
   ON
     time_spine_src_28006.ds = subq_15.ds
   GROUP BY
-    subq_15.martian_day
+    subq_15.alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 0da0eb1c62..8ad3f67148 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -24,7 +24,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_6.metric_time__martian_day
+          subq_6.metric_time__alien_day
           , subq_6.ds__day
           , subq_6.ds__week
           , subq_6.ds__month
@@ -225,7 +225,7 @@ FROM (
             , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_5.martian_day AS metric_time__martian_day
+            , subq_5.alien_day AS metric_time__alien_day
           FROM (
             -- Pass Only Elements: ['metric_time__day',]
             SELECT
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -466,7 +466,7 @@ FROM (
           ON
             subq_4.metric_time__day = subq_5.ds
         ) subq_6
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_7
     ) subq_8
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 139cbfa160..01650333fc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -20,7 +20,7 @@ FROM (
     SELECT
       time_spine_src_28006.ds AS metric_time__day
       , subq_12.bookings AS bookings
-      , subq_16.martian_day AS metric_time__martian_day
+      , subq_16.alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
     INNER JOIN (
       -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ FROM (
     ON
       time_spine_src_28006.ds = subq_16.ds
   ) subq_17
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_21
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql
index bbe0d8f70e..3044da5e71 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.booking__ds__martian_day
+  subq_4.booking__ds__alien_day
   , subq_4.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
     , SUM(subq_3.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
     SELECT
-      subq_2.booking__ds__martian_day
+      subq_2.booking__ds__alien_day
       , subq_2.bookings
     FROM (
       -- Metric Time Dimension 'ds'
@@ -118,7 +118,7 @@ FROM (
         , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_1.martian_day AS booking__ds__martian_day
+        , subq_1.alien_day AS booking__ds__alien_day
       FROM (
         -- Read Elements From Semantic Model 'bookings_source'
         SELECT
@@ -219,5 +219,5 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index ef0649aa20..7a5e3ff575 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: DuckDB
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS booking__ds__martian_day
+  subq_6.alien_day AS booking__ds__alien_day
   , SUM(subq_5.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -22,4 +22,4 @@ LEFT OUTER JOIN
 ON
   subq_5.booking__ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index 1de44cb958..99c14cf17c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.listing__ds__martian_day
+  subq_8.listing__ds__alien_day
   , subq_8.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
     , SUM(subq_7.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
     SELECT
-      subq_6.listing__ds__martian_day
+      subq_6.listing__ds__alien_day
       , subq_6.bookings
     FROM (
       -- Join Standard Outputs
@@ -119,7 +119,7 @@ FROM (
         , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_5.martian_day AS listing__ds__martian_day
+        , subq_5.alien_day AS listing__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -462,5 +462,5 @@ FROM (
     ) subq_6
   ) subq_7
   GROUP BY
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index ff8a72e792..3ad7166c98 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_14.martian_day AS listing__ds__martian_day
+  subq_14.alien_day AS listing__ds__alien_day
   , SUM(subq_10.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -27,4 +27,4 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_14.ds
 GROUP BY
-  subq_14.martian_day
+  subq_14.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql
index 99803ca490..766b3acc96 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -18,7 +18,7 @@ FROM (
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -219,7 +219,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -318,7 +318,7 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 831db32cb8..c2a51a1956 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -15,7 +15,7 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -28,4 +28,4 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 6fc64e76d3..c8167c5d41 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -6,22 +6,22 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_5.metric_time__martian_day
+  subq_5.metric_time__alien_day
   , subq_5.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , SUM(subq_4.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+    -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -222,7 +222,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -321,9 +321,9 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
   GROUP BY
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index 8f24de69d8..6848ee967d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,18 +5,18 @@ docstring:
 sql_engine: DuckDB
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+-- Pass Only Elements: ['bookings', 'metric_time__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , SUM(bookings) AS bookings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -29,6 +29,6 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index 8d26c89e41..b1c0631846 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -6,17 +6,17 @@ sql_engine: DuckDB
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_36.listing__user__ds__martian_day
+  subq_36.listing__user__ds__alien_day
   , subq_36.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
     , SUM(subq_35.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
     SELECT
-      subq_34.listing__user__ds__martian_day
+      subq_34.listing__user__ds__alien_day
       , subq_34.bookings
     FROM (
       -- Join Standard Outputs
@@ -122,7 +122,7 @@ FROM (
         , subq_25.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_25.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_25.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_33.martian_day AS listing__user__ds__martian_day
+        , subq_33.alien_day AS listing__user__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -1400,5 +1400,5 @@ FROM (
     ) subq_34
   ) subq_35
   GROUP BY
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
 ) subq_36
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index a163eb4d0a..6f07af62e0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/DuckDB/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -6,11 +6,11 @@ sql_engine: DuckDB
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_46.martian_day AS listing__user__ds__martian_day
+  subq_46.alien_day AS listing__user__ds__alien_day
   , SUM(subq_38.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -45,4 +45,4 @@ LEFT OUTER JOIN
 ON
   subq_45.user__ds__day = subq_46.ds
 GROUP BY
-  subq_46.martian_day
+  subq_46.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql
index bfcebabc3b..3bbbb4c5f7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_15.metric_time__martian_day
+  subq_15.metric_time__alien_day
   , CAST(subq_15.buys AS DOUBLE PRECISION) / CAST(NULLIF(subq_15.visits, 0) AS DOUBLE PRECISION) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_4.visits) AS visits
     , MAX(subq_14.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.visits
       FROM (
         -- Metric Time Dimension 'ds'
@@ -67,7 +67,7 @@ FROM (
           , subq_0.visit__referrer_id AS visit__referrer_id
           , subq_0.visits AS visits
           , subq_0.visitors AS visitors
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'visits_source'
           SELECT
@@ -110,22 +110,22 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
       , SUM(subq_13.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_12.metric_time__martian_day
+        subq_12.metric_time__alien_day
         , subq_12.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_11.metric_time__martian_day
+          subq_11.metric_time__alien_day
           , subq_11.metric_time__day
           , subq_11.user
           , subq_11.buys
@@ -141,14 +141,14 @@ FROM (
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_7.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_7.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_10.user
                 , subq_10.metric_time__day
                 , subq_10.mf_internal_uuid
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_7.metric_time__day) OVER (
               PARTITION BY
                 subq_10.user
@@ -168,9 +168,9 @@ FROM (
             , subq_10.mf_internal_uuid AS mf_internal_uuid
             , subq_10.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_6.metric_time__martian_day
+              subq_6.metric_time__alien_day
               , subq_6.metric_time__day
               , subq_6.user
               , subq_6.visits
@@ -219,7 +219,7 @@ FROM (
                 , subq_0.visit__referrer_id AS visit__referrer_id
                 , subq_0.visits AS visits
                 , subq_0.visitors AS visitors
-                , subq_5.martian_day AS metric_time__martian_day
+                , subq_5.alien_day AS metric_time__alien_day
               FROM (
                 -- Read Elements From Semantic Model 'visits_source'
                 SELECT
@@ -432,10 +432,10 @@ FROM (
       ) subq_12
     ) subq_13
     GROUP BY
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
   ) subq_14
   ON
-    subq_4.metric_time__martian_day = subq_14.metric_time__martian_day
+    subq_4.metric_time__alien_day = subq_14.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day)
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day)
 ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index 02a47d5975..aa845eb5c5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -14,21 +14,21 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE PRECISION) / CAST(NULLIF(visits, 0) AS DOUBLE PRECISION) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_20.visits) AS visits
     , MAX(subq_30.buys) AS buys
   FROM (
     -- Read From CTE For node_id=sma_28019
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      subq_17.martian_day AS metric_time__martian_day
+      subq_17.alien_day AS metric_time__alien_day
       , SUM(sma_28019_cte.visits) AS visits
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
@@ -36,14 +36,14 @@ FROM (
     ON
       sma_28019_cte.metric_time__day = subq_17.ds
     GROUP BY
-      subq_17.martian_day
+      subq_17.alien_day
   ) subq_20
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -56,14 +56,14 @@ FROM (
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_23.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_23.metric_time__alien_day) OVER (
           PARTITION BY
             subq_26.user
             , subq_26.metric_time__day
             , subq_26.mf_internal_uuid
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_23.metric_time__day) OVER (
           PARTITION BY
             subq_26.user
@@ -85,9 +85,9 @@ FROM (
       FROM (
         -- Read From CTE For node_id=sma_28019
         -- Join to Custom Granularity Dataset
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          subq_21.martian_day AS metric_time__martian_day
+          subq_21.alien_day AS metric_time__alien_day
           , sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
@@ -120,10 +120,10 @@ FROM (
         )
     ) subq_27
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_30
   ON
-    subq_20.metric_time__martian_day = subq_30.metric_time__martian_day
+    subq_20.metric_time__alien_day = subq_30.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day)
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day)
 ) subq_31
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index 884788bd76..bf10024942 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_17.metric_time__martian_day
+  subq_17.metric_time__alien_day
   , CAST(subq_17.buys AS DOUBLE PRECISION) / CAST(NULLIF(subq_17.visits, 0) AS DOUBLE PRECISION) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_5.visits) AS visits
     , MAX(subq_16.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.visits
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -112,7 +112,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -153,26 +153,26 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
       , SUM(subq_15.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_14.metric_time__martian_day
+        subq_14.metric_time__alien_day
         , subq_14.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -188,14 +188,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -215,16 +215,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -311,7 +311,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -352,7 +352,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
@@ -526,10 +526,10 @@ FROM (
       ) subq_14
     ) subq_15
     GROUP BY
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
   ) subq_16
   ON
-    subq_5.metric_time__martian_day = subq_16.metric_time__martian_day
+    subq_5.metric_time__alien_day = subq_16.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day)
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day)
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index 6cf8489226..63a7026d73 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -14,43 +14,43 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE PRECISION) / CAST(NULLIF(visits, 0) AS DOUBLE PRECISION) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_23.visits) AS visits
     , MAX(subq_34.buys) AS buys
   FROM (
     -- Constrain Output with WHERE
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(visits) AS visits
     FROM (
       -- Read From CTE For node_id=sma_28019
       -- Join to Custom Granularity Dataset
       SELECT
         sma_28019_cte.visits AS visits
-        , subq_19.martian_day AS metric_time__martian_day
+        , subq_19.alien_day AS metric_time__alien_day
       FROM sma_28019_cte sma_28019_cte
       LEFT OUTER JOIN
         ***************************.mf_time_spine subq_19
       ON
         sma_28019_cte.metric_time__day = subq_19.ds
     ) subq_20
-    WHERE metric_time__martian_day = '2020-01-01'
+    WHERE metric_time__alien_day = '2020-01-01'
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_23
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -63,14 +63,14 @@ FROM (
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
           PARTITION BY
             subq_30.user
             , subq_30.metric_time__day
             , subq_30.mf_internal_uuid
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_27.metric_time__day) OVER (
           PARTITION BY
             subq_30.user
@@ -91,9 +91,9 @@ FROM (
         , subq_30.buys AS buys
       FROM (
         -- Constrain Output with WHERE
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          metric_time__martian_day
+          metric_time__alien_day
           , metric_time__day
           , subq_25.user
           , visits
@@ -104,14 +104,14 @@ FROM (
             sma_28019_cte.metric_time__day AS metric_time__day
             , sma_28019_cte.user AS user
             , sma_28019_cte.visits AS visits
-            , subq_24.martian_day AS metric_time__martian_day
+            , subq_24.alien_day AS metric_time__alien_day
           FROM sma_28019_cte sma_28019_cte
           LEFT OUTER JOIN
             ***************************.mf_time_spine subq_24
           ON
             sma_28019_cte.metric_time__day = subq_24.ds
         ) subq_25
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_27
       INNER JOIN (
         -- Read Elements From Semantic Model 'buys_source'
@@ -136,10 +136,10 @@ FROM (
         )
     ) subq_31
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_34
   ON
-    subq_23.metric_time__martian_day = subq_34.metric_time__martian_day
+    subq_23.metric_time__alien_day = subq_34.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day)
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day)
 ) subq_35
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 91b0070ee7..00f20bd8d6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -108,7 +108,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -149,7 +149,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
   ) subq_5
@@ -164,7 +164,7 @@ FROM (
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -180,14 +180,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -207,16 +207,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -303,7 +303,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -344,7 +344,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 2c68b70500..4382b7e44c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -27,14 +27,14 @@ FROM (
     -- Join to Custom Granularity Dataset
     SELECT
       sma_28019_cte.visits AS visits
-      , subq_19.martian_day AS metric_time__martian_day
+      , subq_19.alien_day AS metric_time__alien_day
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_19
     ON
       sma_28019_cte.metric_time__day = subq_19.ds
   ) subq_20
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_23
 CROSS JOIN (
   -- Find conversions for user within the range of 7 day
@@ -53,14 +53,14 @@ CROSS JOIN (
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS visits
-      , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+      , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
         PARTITION BY
           subq_30.user
           , subq_30.metric_time__day
           , subq_30.mf_internal_uuid
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-      ) AS metric_time__martian_day
+      ) AS metric_time__alien_day
       , FIRST_VALUE(subq_27.metric_time__day) OVER (
         PARTITION BY
           subq_30.user
@@ -81,9 +81,9 @@ CROSS JOIN (
       , subq_30.buys AS buys
     FROM (
       -- Constrain Output with WHERE
-      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
       SELECT
-        metric_time__martian_day
+        metric_time__alien_day
         , metric_time__day
         , subq_25.user
         , visits
@@ -94,14 +94,14 @@ CROSS JOIN (
           sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
-          , subq_24.martian_day AS metric_time__martian_day
+          , subq_24.alien_day AS metric_time__alien_day
         FROM sma_28019_cte sma_28019_cte
         LEFT OUTER JOIN
           ***************************.mf_time_spine subq_24
         ON
           sma_28019_cte.metric_time__day = subq_24.ds
       ) subq_25
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_27
     INNER JOIN (
       -- Read Elements From Semantic Model 'buys_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql
index c859dbd66f..d80c208254 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -4,29 +4,29 @@ sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
 FROM (
   -- Window Function for Metric Re-aggregation
   SELECT
-    subq_8.metric_time__martian_day
-    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__martian_day) AS trailing_2_months_revenue
+    subq_8.metric_time__alien_day
+    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__day
       , subq_7.txn_revenue AS trailing_2_months_revenue
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
         , SUM(subq_6.txn_revenue) AS txn_revenue
       FROM (
-        -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+        -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
         SELECT
-          subq_5.metric_time__martian_day
+          subq_5.metric_time__alien_day
           , subq_5.metric_time__day
           , subq_5.txn_revenue
         FROM (
@@ -69,7 +69,7 @@ FROM (
             , subq_1.user AS user
             , subq_1.revenue_instance__user AS revenue_instance__user
             , subq_1.txn_revenue AS txn_revenue
-            , subq_4.martian_day AS metric_time__martian_day
+            , subq_4.alien_day AS metric_time__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -159,11 +159,11 @@ FROM (
         ) subq_5
       ) subq_6
       GROUP BY
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
     ) subq_7
   ) subq_8
 ) subq_9
 GROUP BY
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index ed8ca3e0bf..b5d7e0ba65 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,21 +4,21 @@ sql_engine: Postgres
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
 FROM (
   -- Compute Metrics via Expressions
   -- Window Function for Metric Re-aggregation
   SELECT
-    metric_time__martian_day
-    , AVG(txn_revenue) OVER (PARTITION BY metric_time__martian_day) AS trailing_2_months_revenue
+    metric_time__alien_day
+    , AVG(txn_revenue) OVER (PARTITION BY metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Join Self Over Time Range
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+    -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
     -- Aggregate Measures
     SELECT
-      subq_14.martian_day AS metric_time__martian_day
+      subq_14.alien_day AS metric_time__alien_day
       , subq_13.ds AS metric_time__day
       , SUM(revenue_src_28000.revenue) AS txn_revenue
     FROM ***************************.mf_time_spine subq_13
@@ -35,10 +35,10 @@ FROM (
     ON
       subq_13.ds = subq_14.ds
     GROUP BY
-      subq_14.martian_day
+      subq_14.alien_day
       , subq_13.ds
   ) subq_17
 ) subq_19
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0.sql
index 4fc3999bc8..2c1438a38c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: Postgres
 -- Compute Metrics via Expressions
 SELECT
   subq_15.metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -138,19 +138,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -167,7 +167,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -183,24 +183,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0_optimized.sql
index 0c9e64d6e6..5c1efe848a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: Postgres
 -- Compute Metrics via Expressions
 SELECT
   metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['bookings', 'metric_time__day']
@@ -21,19 +21,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -50,24 +50,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_23
     ) subq_24
     ON
-      cte_6.ds__martian_day = subq_24.ds__martian_day
+      cte_6.ds__alien_day = subq_24.ds__alien_day
   ) subq_25
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
index f534b11318..f252e25335 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day
+  subq_16.metric_time__alien_day
   , subq_16.booking__ds__month
   , subq_16.metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.metric_time__martian_day
+    subq_15.metric_time__alien_day
     , subq_15.booking__ds__month
     , subq_15.metric_time__extract_year
     , subq_15.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
       , SUM(subq_14.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
       SELECT
-        subq_13.metric_time__martian_day
+        subq_13.metric_time__alien_day
         , subq_13.booking__ds__month
         , subq_13.metric_time__extract_year
         , subq_13.bookings
@@ -131,7 +131,7 @@ FROM (
           , subq_5.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_5.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_5.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_12.martian_day AS metric_time__martian_day
+          , subq_12.alien_day AS metric_time__alien_day
         FROM (
           -- Pass Only Elements: ['ds__day', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__day']
           SELECT
@@ -152,19 +152,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -181,7 +181,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -197,24 +197,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
@@ -422,7 +422,7 @@ FROM (
       ) subq_13
     ) subq_14
     GROUP BY
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
   ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
index 42a1e31578..c41dab1c84 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
@@ -4,18 +4,18 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , booking__ds__month
   , metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_29.martian_day AS metric_time__martian_day
+    subq_29.alien_day AS metric_time__alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead) AS booking__ds__month
     , EXTRACT(year FROM subq_26.ds__day__lead) AS metric_time__extract_year
     , SUM(subq_22.bookings) AS bookings
@@ -26,19 +26,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -55,24 +55,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_24
     ) subq_25
     ON
-      cte_6.ds__martian_day = subq_25.ds__martian_day
+      cte_6.ds__alien_day = subq_25.ds__alien_day
   ) subq_26
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -89,7 +89,7 @@ FROM (
   ON
     subq_26.ds__day__lead = subq_29.ds
   GROUP BY
-    subq_29.martian_day
+    subq_29.alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead)
     , EXTRACT(year FROM subq_26.ds__day__lead)
 ) subq_33
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_multiple_time_spines__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_multiple_time_spines__plan0.sql
index 9389df0545..9bb9d3c2a4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_multiple_time_spines__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_multiple_time_spines__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: Postgres
 -- Compute Metrics via Expressions
 SELECT
   subq_17.metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -230,19 +230,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_8.ts__hour AS ts__hour
-                  , subq_7.ds__martian_day AS ds__martian_day
+                  , subq_7.ds__alien_day AS ds__alien_day
                   , FIRST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__first_value
                   , LAST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                   ) AS ts__hour__row_number
                 FROM (
@@ -259,7 +259,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
                 INNER JOIN (
@@ -294,24 +294,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_9.ds__martian_day
-                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__first_value__lead
-                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__last_value__lead
+                  subq_9.ds__alien_day
+                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__first_value__lead
+                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                 ) subq_9
               ) subq_10
               ON
-                cte_2.ds__martian_day = subq_10.ds__martian_day
+                cte_2.ds__alien_day = subq_10.ds__alien_day
             ) subq_11
           ) subq_12
         ) subq_13
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
index ecc323705b..df099e4afb 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: Postgres
 -- Compute Metrics via Expressions
 SELECT
   metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['archived_users', 'metric_time__hour']
@@ -20,19 +20,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         time_spine_src_28005.ts AS ts__hour
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
         , FIRST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__first_value
         , LAST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
         ) AS ts__hour__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -53,24 +53,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__first_value__lead
-        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__last_value__lead
+        ds__alien_day
+        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__first_value__lead
+        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
       ) subq_27
     ) subq_28
     ON
-      cte_6.ds__martian_day = subq_28.ds__martian_day
+      cte_6.ds__alien_day = subq_28.ds__alien_day
   ) subq_29
   INNER JOIN (
     -- Read Elements From Semantic Model 'users_ds_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_only_window_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_only_window_grain__plan0.sql
index d6b4f49199..8bf920997d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_only_window_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_only_window_grain__plan0.sql
@@ -4,33 +4,33 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
-  , subq_9.metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  subq_9.booking__ds__alien_day
+  , subq_9.metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
-    , subq_8.metric_time__martian_day
+    subq_8.booking__ds__alien_day
+    , subq_8.metric_time__alien_day
     , subq_8.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
-        , subq_6.metric_time__martian_day
+        subq_6.booking__ds__alien_day
+        , subq_6.metric_time__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
         SELECT
           subq_5.metric_time__day AS metric_time__day
-          , subq_5.booking__ds__martian_day AS booking__ds__martian_day
-          , subq_5.metric_time__martian_day AS metric_time__martian_day
+          , subq_5.booking__ds__alien_day AS booking__ds__alien_day
+          , subq_5.metric_time__alien_day AS metric_time__alien_day
           , subq_2.ds__day AS ds__day
           , subq_2.ds__week AS ds__week
           , subq_2.ds__month AS ds__month
@@ -129,12 +129,12 @@ FROM (
           , subq_2.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_2.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
         FROM (
-          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__martian_day', 'metric_time__martian_day']
+          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__alien_day', 'metric_time__alien_day']
           SELECT
             subq_4.ds__day
             , subq_4.metric_time__day
-            , subq_4.booking__ds__martian_day
-            , subq_4.metric_time__martian_day
+            , subq_4.booking__ds__alien_day
+            , subq_4.metric_time__alien_day
           FROM (
             -- Join Offset Custom Granularity to Base Granularity
             WITH cte_2 AS (
@@ -151,27 +151,27 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             )
 
             SELECT
               cte_2.ds__day AS ds__day
-              , subq_3.ds__martian_day__lead AS metric_time__day
-              , subq_3.ds__martian_day__lead AS booking__ds__martian_day
-              , subq_3.ds__martian_day__lead AS metric_time__martian_day
+              , subq_3.ds__alien_day__lead AS metric_time__day
+              , subq_3.ds__alien_day__lead AS booking__ds__alien_day
+              , subq_3.ds__alien_day__lead AS metric_time__alien_day
             FROM cte_2 cte_2
             INNER JOIN (
               -- Offset Custom Granularity
               SELECT
-                cte_2.ds__martian_day
-                , LEAD(cte_2.ds__martian_day, 1) OVER (ORDER BY cte_2.ds__martian_day) AS ds__martian_day__lead
+                cte_2.ds__alien_day
+                , LEAD(cte_2.ds__alien_day, 1) OVER (ORDER BY cte_2.ds__alien_day) AS ds__alien_day__lead
               FROM cte_2 cte_2
               GROUP BY
-                cte_2.ds__martian_day
+                cte_2.ds__alien_day
             ) subq_3
             ON
-              cte_2.ds__martian_day = subq_3.ds__martian_day
+              cte_2.ds__alien_day = subq_3.ds__alien_day
           ) subq_4
         ) subq_5
         INNER JOIN (
@@ -374,7 +374,7 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
index c1d1c1d4b7..00c4939836 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
-  , metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  booking__ds__alien_day
+  , metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_14.booking__ds__martian_day AS booking__ds__martian_day
-    , subq_14.metric_time__martian_day AS metric_time__martian_day
+    subq_14.booking__ds__alien_day AS booking__ds__alien_day
+    , subq_14.metric_time__alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Join Offset Custom Granularity to Base Granularity
@@ -22,26 +22,26 @@ FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     )
 
     SELECT
       cte_6.ds__day AS ds__day
-      , subq_13.ds__martian_day__lead AS booking__ds__martian_day
-      , subq_13.ds__martian_day__lead AS metric_time__martian_day
+      , subq_13.ds__alien_day__lead AS booking__ds__alien_day
+      , subq_13.ds__alien_day__lead AS metric_time__alien_day
     FROM cte_6 cte_6
     INNER JOIN (
       -- Offset Custom Granularity
       SELECT
-        ds__martian_day
-        , LEAD(ds__martian_day, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__lead
+        ds__alien_day
+        , LEAD(ds__alien_day, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__lead
       FROM cte_6 cte_6
       GROUP BY
-        ds__martian_day
+        ds__alien_day
     ) subq_13
     ON
-      cte_6.ds__martian_day = subq_13.ds__martian_day
+      cte_6.ds__alien_day = subq_13.ds__alien_day
   ) subq_14
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -54,6 +54,6 @@ FROM (
   ON
     subq_14.ds__day = subq_12.metric_time__day
   GROUP BY
-    subq_14.booking__ds__martian_day
-    , subq_14.metric_time__martian_day
+    subq_14.booking__ds__alien_day
+    , subq_14.metric_time__alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql
index 70290ff532..3e592c6fa8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_11.booking__ds__martian_day
+  subq_11.booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day) AS booking__ds__martian_day
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day) AS booking__ds__alien_day
     , MAX(subq_5.booking_value) AS booking_value
     , MAX(subq_10.bookers) AS bookers
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_4.booking__ds__martian_day
+      subq_4.booking__ds__alien_day
       , subq_4.booking_value
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
         , SUM(subq_3.booking_value) AS booking_value
       FROM (
-        -- Pass Only Elements: ['booking_value', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['booking_value', 'booking__ds__alien_day']
         SELECT
-          subq_2.booking__ds__martian_day
+          subq_2.booking__ds__alien_day
           , subq_2.booking_value
         FROM (
           -- Metric Time Dimension 'ds'
@@ -129,7 +129,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS booking__ds__martian_day
+            , subq_1.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -230,23 +230,23 @@ FROM (
         ) subq_2
       ) subq_3
       GROUP BY
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
     ) subq_4
   ) subq_5
   FULL OUTER JOIN (
     -- Compute Metrics via Expressions
     SELECT
-      subq_9.booking__ds__martian_day
+      subq_9.booking__ds__alien_day
       , subq_9.bookers
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
         , COUNT(DISTINCT subq_8.bookers) AS bookers
       FROM (
-        -- Pass Only Elements: ['bookers', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['bookers', 'booking__ds__alien_day']
         SELECT
-          subq_7.booking__ds__martian_day
+          subq_7.booking__ds__alien_day
           , subq_7.bookers
         FROM (
           -- Metric Time Dimension 'ds'
@@ -350,7 +350,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_6.martian_day AS booking__ds__martian_day
+            , subq_6.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -451,11 +451,11 @@ FROM (
         ) subq_7
       ) subq_8
       GROUP BY
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
     ) subq_9
   ) subq_10
   ON
-    subq_5.booking__ds__martian_day = subq_10.booking__ds__martian_day
+    subq_5.booking__ds__alien_day = subq_10.booking__ds__alien_day
   GROUP BY
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day)
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day)
 ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index cda1b275ff..8f67f9df5f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS booking__ds__martian_day
+    subq_13.alien_day AS booking__ds__alien_day
     , SUM(bookings_source_src_28000.booking_value) AS booking_value
     , COUNT(DISTINCT bookings_source_src_28000.guest_id) AS bookers
   FROM ***************************.fct_bookings bookings_source_src_28000
@@ -22,5 +22,5 @@ FROM (
   ON
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index 0984eb6c71..529e430d0f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.metric_time__martian_day
+  subq_8.metric_time__alien_day
   , subq_8.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_7.metric_time__martian_day AS metric_time__martian_day
+    subq_7.metric_time__alien_day AS metric_time__alien_day
     , subq_4.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
     FROM (
       -- Change Column Aliases
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day AS metric_time__martian_day
+        , subq_5.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,22 +44,22 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
     GROUP BY
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
   ) subq_7
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -163,7 +163,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -264,8 +264,8 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   ON
-    subq_7.metric_time__martian_day = subq_4.metric_time__martian_day
+    subq_7.metric_time__alien_day = subq_4.metric_time__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index fdceb9cf8a..92605bec60 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -5,25 +5,25 @@ sql_engine: Postgres
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day AS metric_time__martian_day
+  subq_16.metric_time__alien_day AS metric_time__alien_day
   , subq_13.bookings AS bookings_join_to_time_spine
 FROM (
   -- Read From Time Spine 'mf_time_spine'
   -- Change Column Aliases
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    martian_day AS metric_time__martian_day
+    alien_day AS metric_time__alien_day
   FROM ***************************.mf_time_spine time_spine_src_28006
   GROUP BY
-    martian_day
+    alien_day
 ) subq_16
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    subq_10.martian_day AS metric_time__martian_day
+    subq_10.alien_day AS metric_time__alien_day
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ LEFT OUTER JOIN (
   ON
     subq_9.ds__day = subq_10.ds
   GROUP BY
-    subq_10.martian_day
+    subq_10.alien_day
 ) subq_13
 ON
-  subq_16.metric_time__martian_day = subq_13.metric_time__martian_day
+  subq_16.metric_time__alien_day = subq_13.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
index 6a95c1f901..76273b6798 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.metric_time__martian_day
+  subq_10.metric_time__alien_day
   , subq_10.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_9.metric_time__martian_day AS metric_time__martian_day
+    subq_9.metric_time__alien_day AS metric_time__alien_day
     , subq_5.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
     FROM (
       -- Constrain Output with WHERE
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,29 +59,29 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
     GROUP BY
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
   ) subq_9
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.bookings
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -282,7 +282,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -381,12 +381,12 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   ON
-    subq_9.metric_time__martian_day = subq_5.metric_time__martian_day
+    subq_9.metric_time__alien_day = subq_5.metric_time__alien_day
 ) subq_10
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
index 55a29e0c3a..61d1f236ad 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -5,37 +5,37 @@ sql_engine: Postgres
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_20.metric_time__martian_day AS metric_time__martian_day
+  subq_20.metric_time__alien_day AS metric_time__alien_day
   , subq_16.bookings AS bookings_join_to_time_spine
 FROM (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     -- Change Column Aliases
     SELECT
-      martian_day AS metric_time__martian_day
+      alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
     , SUM(bookings) AS bookings
   FROM (
     -- Metric Time Dimension 'ds'
     -- Join to Custom Granularity Dataset
     SELECT
       subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,9 +48,9 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_16
 ON
-  subq_20.metric_time__martian_day = subq_16.metric_time__martian_day
+  subq_20.metric_time__alien_day = subq_16.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 5b69d62c82..27e28f3bb7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,11 +59,11 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
   ) subq_9
   LEFT OUTER JOIN (
@@ -79,7 +79,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -280,7 +280,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -379,7 +379,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 4b80282fb4..ee4abb747e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -17,10 +17,10 @@ FROM (
     -- Change Column Aliases
     SELECT
       ds AS metric_time__day
-      , martian_day AS metric_time__martian_day
+      , alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
@@ -35,7 +35,7 @@ LEFT OUTER JOIN (
     SELECT
       subq_11.ds__day AS metric_time__day
       , subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,7 +48,7 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_16
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 4b7a758e93..8c6ac5c2ba 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.metric_time__martian_day
+  subq_4.metric_time__alien_day
   , subq_4.listing__ds__month
   , subq_4.listings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
     , SUM(subq_3.listings) AS listings
   FROM (
-    -- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+    -- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
     SELECT
-      subq_2.metric_time__martian_day
+      subq_2.metric_time__alien_day
       , subq_2.listing__ds__month
       , subq_2.listings
     FROM (
@@ -90,7 +90,7 @@ FROM (
         , subq_0.listings AS listings
         , subq_0.largest_listing AS largest_listing
         , subq_0.smallest_listing AS smallest_listing
-        , subq_1.martian_day AS metric_time__martian_day
+        , subq_1.alien_day AS metric_time__alien_day
       FROM (
         -- Read Elements From Semantic Model 'listings_latest'
         SELECT
@@ -159,6 +159,6 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index b3c67297a8..2db6feae8d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Postgres
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+-- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS metric_time__martian_day
+  subq_6.alien_day AS metric_time__alien_day
   , subq_5.listing__ds__month AS listing__ds__month
   , SUM(subq_5.listings) AS listings
 FROM (
@@ -24,5 +24,5 @@ LEFT OUTER JOIN
 ON
   subq_5.ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
   , subq_5.listing__ds__month
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql
index 90bad40cfb..dab3514036 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_5.bookings) AS bookings
   , MAX(subq_11.listings) AS listings
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , subq_4.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -124,7 +124,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -225,23 +225,23 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
 ) subq_5
 FULL OUTER JOIN (
   -- Compute Metrics via Expressions
   SELECT
-    subq_10.metric_time__martian_day
+    subq_10.metric_time__alien_day
     , subq_10.listings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
       , SUM(subq_9.listings) AS listings
     FROM (
-      -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['listings', 'metric_time__alien_day']
       SELECT
-        subq_8.metric_time__martian_day
+        subq_8.metric_time__alien_day
         , subq_8.listings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -314,7 +314,7 @@ FULL OUTER JOIN (
           , subq_6.listings AS listings
           , subq_6.largest_listing AS largest_listing
           , subq_6.smallest_listing AS smallest_listing
-          , subq_7.martian_day AS metric_time__martian_day
+          , subq_7.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'listings_latest'
           SELECT
@@ -383,10 +383,10 @@ FULL OUTER JOIN (
       ) subq_8
     ) subq_9
     GROUP BY
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
   ) subq_10
 ) subq_11
 ON
-  subq_5.metric_time__martian_day = subq_11.metric_time__martian_day
+  subq_5.metric_time__alien_day = subq_11.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day)
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index 88f0d5e65a..71f563427c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: Postgres
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_17.bookings) AS bookings
   , MAX(subq_23.listings) AS listings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS metric_time__martian_day
+    subq_13.alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -28,16 +28,16 @@ FROM (
   ON
     subq_12.ds__day = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
 FULL OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['listings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_19.martian_day AS metric_time__martian_day
+    subq_19.alien_day AS metric_time__alien_day
     , SUM(subq_18.listings) AS listings
   FROM (
     -- Read Elements From Semantic Model 'listings_latest'
@@ -51,9 +51,9 @@ FULL OUTER JOIN (
   ON
     subq_18.ds__day = subq_19.ds
   GROUP BY
-    subq_19.martian_day
+    subq_19.alien_day
 ) subq_23
 ON
-  subq_17.metric_time__martian_day = subq_23.metric_time__martian_day
+  subq_17.metric_time__alien_day = subq_23.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day)
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
index e8c4d5029c..edb2116bb5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_7.metric_time__martian_day
+  subq_7.metric_time__alien_day
   , subq_7.metric_time__hour
   , subq_7.archived_users AS subdaily_cumulative_window_metric
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
     , SUM(subq_6.archived_users) AS archived_users
   FROM (
-    -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_5.metric_time__martian_day
+      subq_5.metric_time__alien_day
       , subq_5.metric_time__hour
       , subq_5.archived_users
     FROM (
@@ -213,7 +213,7 @@ FROM (
         , subq_1.home_state AS home_state
         , subq_1.user__home_state AS user__home_state
         , subq_1.archived_users AS archived_users
-        , subq_4.martian_day AS metric_time__martian_day
+        , subq_4.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -612,6 +612,6 @@ FROM (
     ) subq_5
   ) subq_6
   GROUP BY
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
 ) subq_7
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
index fd1ee976fe..09129895ff 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Postgres
 ---
 -- Join Self Over Time Range
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+-- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_12.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS metric_time__alien_day
   , subq_11.ts AS metric_time__hour
   , SUM(subq_9.archived_users) AS subdaily_cumulative_window_metric
 FROM ***************************.mf_time_spine_hour subq_11
@@ -31,5 +31,5 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', subq_11.ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
+  subq_12.alien_day
   , subq_11.ts
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
index 9173b68109..a404e96d99 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.metric_time__hour
   , subq_9.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_8.metric_time__martian_day AS metric_time__martian_day
+    subq_8.metric_time__alien_day AS metric_time__alien_day
     , subq_8.metric_time__hour AS metric_time__hour
     , subq_4.archived_users AS archived_users
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__hour
     FROM (
       -- Change Column Aliases
@@ -34,7 +34,7 @@ FROM (
         , subq_5.ts__extract_day AS ts__extract_day
         , subq_5.ts__extract_dow AS ts__extract_dow
         , subq_5.ts__extract_doy AS ts__extract_doy
-        , subq_6.martian_day AS metric_time__martian_day
+        , subq_6.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -61,13 +61,13 @@ FROM (
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
       , SUM(subq_3.archived_users) AS archived_users
     FROM (
-      -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+      -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.metric_time__hour
         , subq_2.archived_users
       FROM (
@@ -264,7 +264,7 @@ FROM (
           , subq_0.home_state AS home_state
           , subq_0.user__home_state AS user__home_state
           , subq_0.archived_users AS archived_users
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'users_ds_source'
           SELECT
@@ -456,7 +456,7 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
   ) subq_4
   ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
index 25b700f708..64ef0c730a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
@@ -5,15 +5,15 @@ sql_engine: Postgres
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_18.metric_time__martian_day AS metric_time__martian_day
+  subq_18.metric_time__alien_day AS metric_time__alien_day
   , subq_18.metric_time__hour AS metric_time__hour
   , subq_14.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Change Column Aliases
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
   SELECT
-    subq_16.martian_day AS metric_time__martian_day
+    subq_16.alien_day AS metric_time__alien_day
     , time_spine_src_28005.ts AS metric_time__hour
   FROM ***************************.mf_time_spine_hour time_spine_src_28005
   LEFT OUTER JOIN
@@ -24,10 +24,10 @@ FROM (
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'archived_at'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
   -- Aggregate Measures
   SELECT
-    subq_11.martian_day AS metric_time__martian_day
+    subq_11.alien_day AS metric_time__alien_day
     , subq_10.archived_at__hour AS metric_time__hour
     , SUM(subq_10.archived_users) AS archived_users
   FROM (
@@ -43,7 +43,7 @@ LEFT OUTER JOIN (
   ON
     subq_10.archived_at__day = subq_11.ds
   GROUP BY
-    subq_11.martian_day
+    subq_11.alien_day
     , subq_10.archived_at__hour
 ) subq_14
 ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 0d67edcdf8..c0ad1f079e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -2,10 +2,10 @@ test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
 sql_engine: Postgres
 ---
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
 FROM (
@@ -193,8 +193,8 @@ FROM (
     , subq_0.user__home_state AS user__home_state
     , subq_0.new_users AS new_users
     , subq_0.archived_users AS archived_users
-    , subq_4.martian_day AS metric_time__martian_day
-    , subq_5.martian_day AS user__bio_added_ts__martian_day
+    , subq_4.alien_day AS metric_time__alien_day
+    , subq_5.alien_day AS user__bio_added_ts__alien_day
   FROM (
     -- Read Elements From Semantic Model 'users_ds_source'
     SELECT
@@ -397,7 +397,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -409,7 +409,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -424,7 +424,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
@@ -439,7 +439,7 @@ FROM (
     subq_0.user__bio_added_ts__day = subq_5.ds
 ) subq_6
 GROUP BY
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 653f324f95..43d970eae4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -5,10 +5,10 @@ sql_engine: Postgres
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_12.martian_day AS user__bio_added_ts__martian_day
-  , subq_11.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS user__bio_added_ts__alien_day
+  , subq_11.alien_day AS metric_time__alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__month
   , time_spine_src_28006.ds AS metric_time__day
 FROM ***************************.dim_users users_ds_source_src_28000
@@ -23,7 +23,7 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', users_ds_source_src_28000.bio_added_ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
-  , subq_11.martian_day
+  subq_12.alien_day
+  , subq_11.alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts)
   , time_spine_src_28006.ds
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql
index 95ba609d92..9d91478e75 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: Postgres
 ---
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
@@ -20,7 +20,7 @@ FROM (
     , subq_0.ds__extract_day AS ds__extract_day
     , subq_0.ds__extract_dow AS ds__extract_dow
     , subq_0.ds__extract_doy AS ds__extract_doy
-    , subq_0.ds__martian_day AS ds__martian_day
+    , subq_0.ds__alien_day AS ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -32,8 +32,8 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
-    , subq_1.martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
+    , subq_1.alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
   LEFT OUTER JOIN
@@ -57,4 +57,4 @@ FROM (
     subq_0.ds__day = subq_1.ds
 ) subq_2
 GROUP BY
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 380aa8983d..6eb92d93ff 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: Postgres
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_4.martian_day AS metric_time__martian_day
+  subq_4.alien_day AS metric_time__alien_day
 FROM ***************************.mf_time_spine time_spine_src_28006
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_4
 ON
   time_spine_src_28006.ds = subq_4.ds
 GROUP BY
-  subq_4.martian_day
+  subq_4.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index b16d7c73dd..f607d7f0cb 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: Postgres
 ---
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Join to Custom Granularity Dataset
@@ -97,7 +97,7 @@ FROM (
     , bookings_source_src_28000.listing_id AS booking__listing
     , bookings_source_src_28000.guest_id AS booking__guest
     , bookings_source_src_28000.host_id AS booking__host
-    , subq_0.martian_day AS booking__ds__martian_day
+    , subq_0.alien_day AS booking__ds__alien_day
   FROM ***************************.fct_bookings bookings_source_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_0
@@ -105,4 +105,4 @@ FROM (
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_0.ds
 ) subq_1
 GROUP BY
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index f890eccfcf..dbec520bf2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: Postgres
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_2.martian_day AS booking__ds__martian_day
+  subq_2.alien_day AS booking__ds__alien_day
 FROM ***************************.fct_bookings bookings_source_src_28000
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_2
 ON
   DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_2.ds
 GROUP BY
-  subq_2.martian_day
+  subq_2.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql
index f5a032a0b9..949d77ffda 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -10,7 +10,7 @@ SELECT
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
   subq_2.listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 315768f36a..38e7beec1b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -13,13 +13,13 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
-    , subq_3.martian_day AS listing__ds__martian_day
+    , subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
   listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 31eaedc6e2..5a2f6d0b83 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -4,13 +4,13 @@ docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
 sql_engine: Postgres
 ---
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index f8d5598eaf..8bd2e98824 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,20 +5,20 @@ docstring:
 sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  listing__ds__martian_day
+  listing__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Join to Custom Granularity Dataset
   SELECT
-    subq_3.martian_day AS listing__ds__martian_day
+    subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
-  listing__ds__martian_day
+  listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql
index 6407d60ce8..306f864671 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0.sql
@@ -4,22 +4,22 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
+  subq_9.booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
+    subq_8.booking__ds__alien_day
     , subq_8.bookings AS bookings_5_days_ago
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
+        subq_6.booking__ds__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
@@ -123,7 +123,7 @@ FROM (
           , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_5.martian_day AS booking__ds__martian_day
+          , subq_5.alien_day AS booking__ds__alien_day
         FROM (
           -- Pass Only Elements: ['booking__ds__day',]
           SELECT
@@ -142,7 +142,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -157,7 +157,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
@@ -366,6 +366,6 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index 7a645df17d..630890cd6f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.martian_day AS booking__ds__martian_day
+    subq_15.alien_day AS booking__ds__alien_day
     , SUM(subq_11.bookings) AS bookings_5_days_ago
   FROM ***************************.mf_time_spine time_spine_src_28006
   INNER JOIN (
@@ -31,5 +31,5 @@ FROM (
   ON
     time_spine_src_28006.ds = subq_15.ds
   GROUP BY
-    subq_15.martian_day
+    subq_15.alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 41883ea06f..22839c9473 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -24,7 +24,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_6.metric_time__martian_day
+          subq_6.metric_time__alien_day
           , subq_6.ds__day
           , subq_6.ds__week
           , subq_6.ds__month
@@ -225,7 +225,7 @@ FROM (
             , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_5.martian_day AS metric_time__martian_day
+            , subq_5.alien_day AS metric_time__alien_day
           FROM (
             -- Pass Only Elements: ['metric_time__day',]
             SELECT
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -466,7 +466,7 @@ FROM (
           ON
             subq_4.metric_time__day = subq_5.ds
         ) subq_6
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_7
     ) subq_8
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 8e795d4a4e..5b4b5fe6a8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -20,7 +20,7 @@ FROM (
     SELECT
       time_spine_src_28006.ds AS metric_time__day
       , subq_12.bookings AS bookings
-      , subq_16.martian_day AS metric_time__martian_day
+      , subq_16.alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
     INNER JOIN (
       -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ FROM (
     ON
       time_spine_src_28006.ds = subq_16.ds
   ) subq_17
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_21
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql
index 73f430277f..fbdda44d56 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.booking__ds__martian_day
+  subq_4.booking__ds__alien_day
   , subq_4.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
     , SUM(subq_3.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
     SELECT
-      subq_2.booking__ds__martian_day
+      subq_2.booking__ds__alien_day
       , subq_2.bookings
     FROM (
       -- Metric Time Dimension 'ds'
@@ -118,7 +118,7 @@ FROM (
         , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_1.martian_day AS booking__ds__martian_day
+        , subq_1.alien_day AS booking__ds__alien_day
       FROM (
         -- Read Elements From Semantic Model 'bookings_source'
         SELECT
@@ -219,5 +219,5 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index dab1643eda..af93a0a4f7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Postgres
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS booking__ds__martian_day
+  subq_6.alien_day AS booking__ds__alien_day
   , SUM(subq_5.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -22,4 +22,4 @@ LEFT OUTER JOIN
 ON
   subq_5.booking__ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index 3d92e453e4..e03b30ba7f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.listing__ds__martian_day
+  subq_8.listing__ds__alien_day
   , subq_8.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
     , SUM(subq_7.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
     SELECT
-      subq_6.listing__ds__martian_day
+      subq_6.listing__ds__alien_day
       , subq_6.bookings
     FROM (
       -- Join Standard Outputs
@@ -119,7 +119,7 @@ FROM (
         , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_5.martian_day AS listing__ds__martian_day
+        , subq_5.alien_day AS listing__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -462,5 +462,5 @@ FROM (
     ) subq_6
   ) subq_7
   GROUP BY
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index 3dfb93b421..e7b5a55649 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_14.martian_day AS listing__ds__martian_day
+  subq_14.alien_day AS listing__ds__alien_day
   , SUM(subq_10.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -27,4 +27,4 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_14.ds
 GROUP BY
-  subq_14.martian_day
+  subq_14.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql
index b8cd46b9af..1d2629198a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -18,7 +18,7 @@ FROM (
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -219,7 +219,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -318,7 +318,7 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 9cac5a5d78..a4dc39e325 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -15,7 +15,7 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -28,4 +28,4 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index b1607d6bdf..0e462c615b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -6,22 +6,22 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_5.metric_time__martian_day
+  subq_5.metric_time__alien_day
   , subq_5.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , SUM(subq_4.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+    -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -222,7 +222,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -321,9 +321,9 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
   GROUP BY
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index ad69272ffc..ea06e387d5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,18 +5,18 @@ docstring:
 sql_engine: Postgres
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+-- Pass Only Elements: ['bookings', 'metric_time__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , SUM(bookings) AS bookings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -29,6 +29,6 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index e80619af64..d14615909c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -6,17 +6,17 @@ sql_engine: Postgres
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_36.listing__user__ds__martian_day
+  subq_36.listing__user__ds__alien_day
   , subq_36.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
     , SUM(subq_35.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
     SELECT
-      subq_34.listing__user__ds__martian_day
+      subq_34.listing__user__ds__alien_day
       , subq_34.bookings
     FROM (
       -- Join Standard Outputs
@@ -122,7 +122,7 @@ FROM (
         , subq_25.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_25.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_25.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_33.martian_day AS listing__user__ds__martian_day
+        , subq_33.alien_day AS listing__user__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -1400,5 +1400,5 @@ FROM (
     ) subq_34
   ) subq_35
   GROUP BY
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
 ) subq_36
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index 33596be6a9..7a84a6721f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Postgres/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -6,11 +6,11 @@ sql_engine: Postgres
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_46.martian_day AS listing__user__ds__martian_day
+  subq_46.alien_day AS listing__user__ds__alien_day
   , SUM(subq_38.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -45,4 +45,4 @@ LEFT OUTER JOIN
 ON
   subq_45.user__ds__day = subq_46.ds
 GROUP BY
-  subq_46.martian_day
+  subq_46.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql
index 28b6c9c826..5ab4ba3cf0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_15.metric_time__martian_day
+  subq_15.metric_time__alien_day
   , CAST(subq_15.buys AS DOUBLE PRECISION) / CAST(NULLIF(subq_15.visits, 0) AS DOUBLE PRECISION) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_4.visits) AS visits
     , MAX(subq_14.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.visits
       FROM (
         -- Metric Time Dimension 'ds'
@@ -67,7 +67,7 @@ FROM (
           , subq_0.visit__referrer_id AS visit__referrer_id
           , subq_0.visits AS visits
           , subq_0.visitors AS visitors
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'visits_source'
           SELECT
@@ -110,22 +110,22 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
       , SUM(subq_13.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_12.metric_time__martian_day
+        subq_12.metric_time__alien_day
         , subq_12.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_11.metric_time__martian_day
+          subq_11.metric_time__alien_day
           , subq_11.metric_time__day
           , subq_11.user
           , subq_11.buys
@@ -141,14 +141,14 @@ FROM (
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_7.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_7.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_10.user
                 , subq_10.metric_time__day
                 , subq_10.mf_internal_uuid
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_7.metric_time__day) OVER (
               PARTITION BY
                 subq_10.user
@@ -168,9 +168,9 @@ FROM (
             , subq_10.mf_internal_uuid AS mf_internal_uuid
             , subq_10.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_6.metric_time__martian_day
+              subq_6.metric_time__alien_day
               , subq_6.metric_time__day
               , subq_6.user
               , subq_6.visits
@@ -219,7 +219,7 @@ FROM (
                 , subq_0.visit__referrer_id AS visit__referrer_id
                 , subq_0.visits AS visits
                 , subq_0.visitors AS visitors
-                , subq_5.martian_day AS metric_time__martian_day
+                , subq_5.alien_day AS metric_time__alien_day
               FROM (
                 -- Read Elements From Semantic Model 'visits_source'
                 SELECT
@@ -432,10 +432,10 @@ FROM (
       ) subq_12
     ) subq_13
     GROUP BY
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
   ) subq_14
   ON
-    subq_4.metric_time__martian_day = subq_14.metric_time__martian_day
+    subq_4.metric_time__alien_day = subq_14.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day)
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day)
 ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index 8617bbf6a5..95ed6b9ad9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -14,21 +14,21 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE PRECISION) / CAST(NULLIF(visits, 0) AS DOUBLE PRECISION) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_20.visits) AS visits
     , MAX(subq_30.buys) AS buys
   FROM (
     -- Read From CTE For node_id=sma_28019
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      subq_17.martian_day AS metric_time__martian_day
+      subq_17.alien_day AS metric_time__alien_day
       , SUM(sma_28019_cte.visits) AS visits
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
@@ -36,14 +36,14 @@ FROM (
     ON
       sma_28019_cte.metric_time__day = subq_17.ds
     GROUP BY
-      subq_17.martian_day
+      subq_17.alien_day
   ) subq_20
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -56,14 +56,14 @@ FROM (
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_23.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_23.metric_time__alien_day) OVER (
           PARTITION BY
             subq_26.user
             , subq_26.metric_time__day
             , subq_26.mf_internal_uuid
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_23.metric_time__day) OVER (
           PARTITION BY
             subq_26.user
@@ -85,9 +85,9 @@ FROM (
       FROM (
         -- Read From CTE For node_id=sma_28019
         -- Join to Custom Granularity Dataset
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          subq_21.martian_day AS metric_time__martian_day
+          subq_21.alien_day AS metric_time__alien_day
           , sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
@@ -120,10 +120,10 @@ FROM (
         )
     ) subq_27
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_30
   ON
-    subq_20.metric_time__martian_day = subq_30.metric_time__martian_day
+    subq_20.metric_time__alien_day = subq_30.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day)
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day)
 ) subq_31
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index 4f01416b82..44beb16134 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_17.metric_time__martian_day
+  subq_17.metric_time__alien_day
   , CAST(subq_17.buys AS DOUBLE PRECISION) / CAST(NULLIF(subq_17.visits, 0) AS DOUBLE PRECISION) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_5.visits) AS visits
     , MAX(subq_16.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.visits
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -112,7 +112,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -153,26 +153,26 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
       , SUM(subq_15.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_14.metric_time__martian_day
+        subq_14.metric_time__alien_day
         , subq_14.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -188,14 +188,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -215,16 +215,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -311,7 +311,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -352,7 +352,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
@@ -526,10 +526,10 @@ FROM (
       ) subq_14
     ) subq_15
     GROUP BY
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
   ) subq_16
   ON
-    subq_5.metric_time__martian_day = subq_16.metric_time__martian_day
+    subq_5.metric_time__alien_day = subq_16.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day)
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day)
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index 0f22e9b5bd..a64e348ee6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -14,43 +14,43 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE PRECISION) / CAST(NULLIF(visits, 0) AS DOUBLE PRECISION) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_23.visits) AS visits
     , MAX(subq_34.buys) AS buys
   FROM (
     -- Constrain Output with WHERE
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(visits) AS visits
     FROM (
       -- Read From CTE For node_id=sma_28019
       -- Join to Custom Granularity Dataset
       SELECT
         sma_28019_cte.visits AS visits
-        , subq_19.martian_day AS metric_time__martian_day
+        , subq_19.alien_day AS metric_time__alien_day
       FROM sma_28019_cte sma_28019_cte
       LEFT OUTER JOIN
         ***************************.mf_time_spine subq_19
       ON
         sma_28019_cte.metric_time__day = subq_19.ds
     ) subq_20
-    WHERE metric_time__martian_day = '2020-01-01'
+    WHERE metric_time__alien_day = '2020-01-01'
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_23
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -63,14 +63,14 @@ FROM (
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
           PARTITION BY
             subq_30.user
             , subq_30.metric_time__day
             , subq_30.mf_internal_uuid
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_27.metric_time__day) OVER (
           PARTITION BY
             subq_30.user
@@ -91,9 +91,9 @@ FROM (
         , subq_30.buys AS buys
       FROM (
         -- Constrain Output with WHERE
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          metric_time__martian_day
+          metric_time__alien_day
           , metric_time__day
           , subq_25.user
           , visits
@@ -104,14 +104,14 @@ FROM (
             sma_28019_cte.metric_time__day AS metric_time__day
             , sma_28019_cte.user AS user
             , sma_28019_cte.visits AS visits
-            , subq_24.martian_day AS metric_time__martian_day
+            , subq_24.alien_day AS metric_time__alien_day
           FROM sma_28019_cte sma_28019_cte
           LEFT OUTER JOIN
             ***************************.mf_time_spine subq_24
           ON
             sma_28019_cte.metric_time__day = subq_24.ds
         ) subq_25
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_27
       INNER JOIN (
         -- Read Elements From Semantic Model 'buys_source'
@@ -136,10 +136,10 @@ FROM (
         )
     ) subq_31
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_34
   ON
-    subq_23.metric_time__martian_day = subq_34.metric_time__martian_day
+    subq_23.metric_time__alien_day = subq_34.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day)
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day)
 ) subq_35
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 1781321c48..62861cf022 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -108,7 +108,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -149,7 +149,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
   ) subq_5
@@ -164,7 +164,7 @@ FROM (
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -180,14 +180,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -207,16 +207,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -303,7 +303,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -344,7 +344,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index c3ee5a6e31..6e452229b7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -27,14 +27,14 @@ FROM (
     -- Join to Custom Granularity Dataset
     SELECT
       sma_28019_cte.visits AS visits
-      , subq_19.martian_day AS metric_time__martian_day
+      , subq_19.alien_day AS metric_time__alien_day
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_19
     ON
       sma_28019_cte.metric_time__day = subq_19.ds
   ) subq_20
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_23
 CROSS JOIN (
   -- Find conversions for user within the range of 7 day
@@ -53,14 +53,14 @@ CROSS JOIN (
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS visits
-      , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+      , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
         PARTITION BY
           subq_30.user
           , subq_30.metric_time__day
           , subq_30.mf_internal_uuid
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-      ) AS metric_time__martian_day
+      ) AS metric_time__alien_day
       , FIRST_VALUE(subq_27.metric_time__day) OVER (
         PARTITION BY
           subq_30.user
@@ -81,9 +81,9 @@ CROSS JOIN (
       , subq_30.buys AS buys
     FROM (
       -- Constrain Output with WHERE
-      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
       SELECT
-        metric_time__martian_day
+        metric_time__alien_day
         , metric_time__day
         , subq_25.user
         , visits
@@ -94,14 +94,14 @@ CROSS JOIN (
           sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
-          , subq_24.martian_day AS metric_time__martian_day
+          , subq_24.alien_day AS metric_time__alien_day
         FROM sma_28019_cte sma_28019_cte
         LEFT OUTER JOIN
           ***************************.mf_time_spine subq_24
         ON
           sma_28019_cte.metric_time__day = subq_24.ds
       ) subq_25
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_27
     INNER JOIN (
       -- Read Elements From Semantic Model 'buys_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql
index 2d3116870b..7b6a39f614 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -4,29 +4,29 @@ sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
 FROM (
   -- Window Function for Metric Re-aggregation
   SELECT
-    subq_8.metric_time__martian_day
-    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__martian_day) AS trailing_2_months_revenue
+    subq_8.metric_time__alien_day
+    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__day
       , subq_7.txn_revenue AS trailing_2_months_revenue
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
         , SUM(subq_6.txn_revenue) AS txn_revenue
       FROM (
-        -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+        -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
         SELECT
-          subq_5.metric_time__martian_day
+          subq_5.metric_time__alien_day
           , subq_5.metric_time__day
           , subq_5.txn_revenue
         FROM (
@@ -69,7 +69,7 @@ FROM (
             , subq_1.user AS user
             , subq_1.revenue_instance__user AS revenue_instance__user
             , subq_1.txn_revenue AS txn_revenue
-            , subq_4.martian_day AS metric_time__martian_day
+            , subq_4.alien_day AS metric_time__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -159,11 +159,11 @@ FROM (
         ) subq_5
       ) subq_6
       GROUP BY
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
     ) subq_7
   ) subq_8
 ) subq_9
 GROUP BY
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index d182129726..7625ccaf24 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,21 +4,21 @@ sql_engine: Redshift
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
 FROM (
   -- Compute Metrics via Expressions
   -- Window Function for Metric Re-aggregation
   SELECT
-    metric_time__martian_day
-    , AVG(txn_revenue) OVER (PARTITION BY metric_time__martian_day) AS trailing_2_months_revenue
+    metric_time__alien_day
+    , AVG(txn_revenue) OVER (PARTITION BY metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Join Self Over Time Range
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+    -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
     -- Aggregate Measures
     SELECT
-      subq_14.martian_day AS metric_time__martian_day
+      subq_14.alien_day AS metric_time__alien_day
       , subq_13.ds AS metric_time__day
       , SUM(revenue_src_28000.revenue) AS txn_revenue
     FROM ***************************.mf_time_spine subq_13
@@ -35,10 +35,10 @@ FROM (
     ON
       subq_13.ds = subq_14.ds
     GROUP BY
-      subq_14.martian_day
+      subq_14.alien_day
       , subq_13.ds
   ) subq_17
 ) subq_19
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0.sql
index ff0394387f..c520becb7b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: Redshift
 -- Compute Metrics via Expressions
 SELECT
   subq_15.metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -138,19 +138,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -167,7 +167,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -183,24 +183,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0_optimized.sql
index 6e818372aa..2e7cd963ef 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: Redshift
 -- Compute Metrics via Expressions
 SELECT
   metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['bookings', 'metric_time__day']
@@ -21,19 +21,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -50,24 +50,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_23
     ) subq_24
     ON
-      cte_6.ds__martian_day = subq_24.ds__martian_day
+      cte_6.ds__alien_day = subq_24.ds__alien_day
   ) subq_25
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
index d4f3000a9a..448f3fd6e3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day
+  subq_16.metric_time__alien_day
   , subq_16.booking__ds__month
   , subq_16.metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.metric_time__martian_day
+    subq_15.metric_time__alien_day
     , subq_15.booking__ds__month
     , subq_15.metric_time__extract_year
     , subq_15.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
       , SUM(subq_14.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
       SELECT
-        subq_13.metric_time__martian_day
+        subq_13.metric_time__alien_day
         , subq_13.booking__ds__month
         , subq_13.metric_time__extract_year
         , subq_13.bookings
@@ -131,7 +131,7 @@ FROM (
           , subq_5.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_5.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_5.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_12.martian_day AS metric_time__martian_day
+          , subq_12.alien_day AS metric_time__alien_day
         FROM (
           -- Pass Only Elements: ['ds__day', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__day']
           SELECT
@@ -152,19 +152,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -181,7 +181,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -197,24 +197,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
@@ -422,7 +422,7 @@ FROM (
       ) subq_13
     ) subq_14
     GROUP BY
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
   ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
index 4fd946b40f..38e24da801 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
@@ -4,18 +4,18 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , booking__ds__month
   , metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_29.martian_day AS metric_time__martian_day
+    subq_29.alien_day AS metric_time__alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead) AS booking__ds__month
     , EXTRACT(year FROM subq_26.ds__day__lead) AS metric_time__extract_year
     , SUM(subq_22.bookings) AS bookings
@@ -26,19 +26,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -55,24 +55,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_24
     ) subq_25
     ON
-      cte_6.ds__martian_day = subq_25.ds__martian_day
+      cte_6.ds__alien_day = subq_25.ds__alien_day
   ) subq_26
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -89,7 +89,7 @@ FROM (
   ON
     subq_26.ds__day__lead = subq_29.ds
   GROUP BY
-    subq_29.martian_day
+    subq_29.alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead)
     , EXTRACT(year FROM subq_26.ds__day__lead)
 ) subq_33
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_multiple_time_spines__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_multiple_time_spines__plan0.sql
index c01120d7cd..60c830571e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_multiple_time_spines__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_multiple_time_spines__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: Redshift
 -- Compute Metrics via Expressions
 SELECT
   subq_17.metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -230,19 +230,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_8.ts__hour AS ts__hour
-                  , subq_7.ds__martian_day AS ds__martian_day
+                  , subq_7.ds__alien_day AS ds__alien_day
                   , FIRST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__first_value
                   , LAST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                   ) AS ts__hour__row_number
                 FROM (
@@ -259,7 +259,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
                 INNER JOIN (
@@ -294,24 +294,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_9.ds__martian_day
-                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__first_value__lead
-                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__last_value__lead
+                  subq_9.ds__alien_day
+                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__first_value__lead
+                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                 ) subq_9
               ) subq_10
               ON
-                cte_2.ds__martian_day = subq_10.ds__martian_day
+                cte_2.ds__alien_day = subq_10.ds__alien_day
             ) subq_11
           ) subq_12
         ) subq_13
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
index de855225e7..8fc83b30a2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: Redshift
 -- Compute Metrics via Expressions
 SELECT
   metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['archived_users', 'metric_time__hour']
@@ -20,19 +20,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         time_spine_src_28005.ts AS ts__hour
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
         , FIRST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__first_value
         , LAST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
         ) AS ts__hour__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -53,24 +53,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__first_value__lead
-        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__last_value__lead
+        ds__alien_day
+        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__first_value__lead
+        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
       ) subq_27
     ) subq_28
     ON
-      cte_6.ds__martian_day = subq_28.ds__martian_day
+      cte_6.ds__alien_day = subq_28.ds__alien_day
   ) subq_29
   INNER JOIN (
     -- Read Elements From Semantic Model 'users_ds_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_only_window_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_only_window_grain__plan0.sql
index ee53b44bbe..8be9e9b0c4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_only_window_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_only_window_grain__plan0.sql
@@ -4,33 +4,33 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
-  , subq_9.metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  subq_9.booking__ds__alien_day
+  , subq_9.metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
-    , subq_8.metric_time__martian_day
+    subq_8.booking__ds__alien_day
+    , subq_8.metric_time__alien_day
     , subq_8.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
-        , subq_6.metric_time__martian_day
+        subq_6.booking__ds__alien_day
+        , subq_6.metric_time__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
         SELECT
           subq_5.metric_time__day AS metric_time__day
-          , subq_5.booking__ds__martian_day AS booking__ds__martian_day
-          , subq_5.metric_time__martian_day AS metric_time__martian_day
+          , subq_5.booking__ds__alien_day AS booking__ds__alien_day
+          , subq_5.metric_time__alien_day AS metric_time__alien_day
           , subq_2.ds__day AS ds__day
           , subq_2.ds__week AS ds__week
           , subq_2.ds__month AS ds__month
@@ -129,12 +129,12 @@ FROM (
           , subq_2.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_2.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
         FROM (
-          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__martian_day', 'metric_time__martian_day']
+          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__alien_day', 'metric_time__alien_day']
           SELECT
             subq_4.ds__day
             , subq_4.metric_time__day
-            , subq_4.booking__ds__martian_day
-            , subq_4.metric_time__martian_day
+            , subq_4.booking__ds__alien_day
+            , subq_4.metric_time__alien_day
           FROM (
             -- Join Offset Custom Granularity to Base Granularity
             WITH cte_2 AS (
@@ -151,27 +151,27 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             )
 
             SELECT
               cte_2.ds__day AS ds__day
-              , subq_3.ds__martian_day__lead AS metric_time__day
-              , subq_3.ds__martian_day__lead AS booking__ds__martian_day
-              , subq_3.ds__martian_day__lead AS metric_time__martian_day
+              , subq_3.ds__alien_day__lead AS metric_time__day
+              , subq_3.ds__alien_day__lead AS booking__ds__alien_day
+              , subq_3.ds__alien_day__lead AS metric_time__alien_day
             FROM cte_2 cte_2
             INNER JOIN (
               -- Offset Custom Granularity
               SELECT
-                cte_2.ds__martian_day
-                , LEAD(cte_2.ds__martian_day, 1) OVER (ORDER BY cte_2.ds__martian_day) AS ds__martian_day__lead
+                cte_2.ds__alien_day
+                , LEAD(cte_2.ds__alien_day, 1) OVER (ORDER BY cte_2.ds__alien_day) AS ds__alien_day__lead
               FROM cte_2 cte_2
               GROUP BY
-                cte_2.ds__martian_day
+                cte_2.ds__alien_day
             ) subq_3
             ON
-              cte_2.ds__martian_day = subq_3.ds__martian_day
+              cte_2.ds__alien_day = subq_3.ds__alien_day
           ) subq_4
         ) subq_5
         INNER JOIN (
@@ -374,7 +374,7 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
index 6b72ba1001..3abf541740 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
-  , metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  booking__ds__alien_day
+  , metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_14.booking__ds__martian_day AS booking__ds__martian_day
-    , subq_14.metric_time__martian_day AS metric_time__martian_day
+    subq_14.booking__ds__alien_day AS booking__ds__alien_day
+    , subq_14.metric_time__alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Join Offset Custom Granularity to Base Granularity
@@ -22,26 +22,26 @@ FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     )
 
     SELECT
       cte_6.ds__day AS ds__day
-      , subq_13.ds__martian_day__lead AS booking__ds__martian_day
-      , subq_13.ds__martian_day__lead AS metric_time__martian_day
+      , subq_13.ds__alien_day__lead AS booking__ds__alien_day
+      , subq_13.ds__alien_day__lead AS metric_time__alien_day
     FROM cte_6 cte_6
     INNER JOIN (
       -- Offset Custom Granularity
       SELECT
-        ds__martian_day
-        , LEAD(ds__martian_day, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__lead
+        ds__alien_day
+        , LEAD(ds__alien_day, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__lead
       FROM cte_6 cte_6
       GROUP BY
-        ds__martian_day
+        ds__alien_day
     ) subq_13
     ON
-      cte_6.ds__martian_day = subq_13.ds__martian_day
+      cte_6.ds__alien_day = subq_13.ds__alien_day
   ) subq_14
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -54,6 +54,6 @@ FROM (
   ON
     subq_14.ds__day = subq_12.metric_time__day
   GROUP BY
-    subq_14.booking__ds__martian_day
-    , subq_14.metric_time__martian_day
+    subq_14.booking__ds__alien_day
+    , subq_14.metric_time__alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql
index 5e810abd49..fb71f3a9e3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_11.booking__ds__martian_day
+  subq_11.booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day) AS booking__ds__martian_day
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day) AS booking__ds__alien_day
     , MAX(subq_5.booking_value) AS booking_value
     , MAX(subq_10.bookers) AS bookers
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_4.booking__ds__martian_day
+      subq_4.booking__ds__alien_day
       , subq_4.booking_value
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
         , SUM(subq_3.booking_value) AS booking_value
       FROM (
-        -- Pass Only Elements: ['booking_value', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['booking_value', 'booking__ds__alien_day']
         SELECT
-          subq_2.booking__ds__martian_day
+          subq_2.booking__ds__alien_day
           , subq_2.booking_value
         FROM (
           -- Metric Time Dimension 'ds'
@@ -129,7 +129,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS booking__ds__martian_day
+            , subq_1.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -230,23 +230,23 @@ FROM (
         ) subq_2
       ) subq_3
       GROUP BY
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
     ) subq_4
   ) subq_5
   FULL OUTER JOIN (
     -- Compute Metrics via Expressions
     SELECT
-      subq_9.booking__ds__martian_day
+      subq_9.booking__ds__alien_day
       , subq_9.bookers
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
         , COUNT(DISTINCT subq_8.bookers) AS bookers
       FROM (
-        -- Pass Only Elements: ['bookers', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['bookers', 'booking__ds__alien_day']
         SELECT
-          subq_7.booking__ds__martian_day
+          subq_7.booking__ds__alien_day
           , subq_7.bookers
         FROM (
           -- Metric Time Dimension 'ds'
@@ -350,7 +350,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_6.martian_day AS booking__ds__martian_day
+            , subq_6.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -451,11 +451,11 @@ FROM (
         ) subq_7
       ) subq_8
       GROUP BY
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
     ) subq_9
   ) subq_10
   ON
-    subq_5.booking__ds__martian_day = subq_10.booking__ds__martian_day
+    subq_5.booking__ds__alien_day = subq_10.booking__ds__alien_day
   GROUP BY
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day)
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day)
 ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index 7481343444..ef552de213 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS booking__ds__martian_day
+    subq_13.alien_day AS booking__ds__alien_day
     , SUM(bookings_source_src_28000.booking_value) AS booking_value
     , COUNT(DISTINCT bookings_source_src_28000.guest_id) AS bookers
   FROM ***************************.fct_bookings bookings_source_src_28000
@@ -22,5 +22,5 @@ FROM (
   ON
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index a72fea082f..1b0e730fd2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.metric_time__martian_day
+  subq_8.metric_time__alien_day
   , subq_8.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_7.metric_time__martian_day AS metric_time__martian_day
+    subq_7.metric_time__alien_day AS metric_time__alien_day
     , subq_4.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
     FROM (
       -- Change Column Aliases
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day AS metric_time__martian_day
+        , subq_5.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,22 +44,22 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
     GROUP BY
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
   ) subq_7
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -163,7 +163,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -264,8 +264,8 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   ON
-    subq_7.metric_time__martian_day = subq_4.metric_time__martian_day
+    subq_7.metric_time__alien_day = subq_4.metric_time__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index 2d99cb612c..028455cebe 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -5,25 +5,25 @@ sql_engine: Redshift
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day AS metric_time__martian_day
+  subq_16.metric_time__alien_day AS metric_time__alien_day
   , subq_13.bookings AS bookings_join_to_time_spine
 FROM (
   -- Read From Time Spine 'mf_time_spine'
   -- Change Column Aliases
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    martian_day AS metric_time__martian_day
+    alien_day AS metric_time__alien_day
   FROM ***************************.mf_time_spine time_spine_src_28006
   GROUP BY
-    martian_day
+    alien_day
 ) subq_16
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    subq_10.martian_day AS metric_time__martian_day
+    subq_10.alien_day AS metric_time__alien_day
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ LEFT OUTER JOIN (
   ON
     subq_9.ds__day = subq_10.ds
   GROUP BY
-    subq_10.martian_day
+    subq_10.alien_day
 ) subq_13
 ON
-  subq_16.metric_time__martian_day = subq_13.metric_time__martian_day
+  subq_16.metric_time__alien_day = subq_13.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
index 9719af7d29..d0aa7a278d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.metric_time__martian_day
+  subq_10.metric_time__alien_day
   , subq_10.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_9.metric_time__martian_day AS metric_time__martian_day
+    subq_9.metric_time__alien_day AS metric_time__alien_day
     , subq_5.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
     FROM (
       -- Constrain Output with WHERE
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,29 +59,29 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
     GROUP BY
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
   ) subq_9
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.bookings
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -282,7 +282,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -381,12 +381,12 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   ON
-    subq_9.metric_time__martian_day = subq_5.metric_time__martian_day
+    subq_9.metric_time__alien_day = subq_5.metric_time__alien_day
 ) subq_10
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
index 4b943bdf2c..04e762f631 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -5,37 +5,37 @@ sql_engine: Redshift
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_20.metric_time__martian_day AS metric_time__martian_day
+  subq_20.metric_time__alien_day AS metric_time__alien_day
   , subq_16.bookings AS bookings_join_to_time_spine
 FROM (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     -- Change Column Aliases
     SELECT
-      martian_day AS metric_time__martian_day
+      alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
     , SUM(bookings) AS bookings
   FROM (
     -- Metric Time Dimension 'ds'
     -- Join to Custom Granularity Dataset
     SELECT
       subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,9 +48,9 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_16
 ON
-  subq_20.metric_time__martian_day = subq_16.metric_time__martian_day
+  subq_20.metric_time__alien_day = subq_16.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 6da6fff672..735b391b61 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,11 +59,11 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
   ) subq_9
   LEFT OUTER JOIN (
@@ -79,7 +79,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -280,7 +280,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -379,7 +379,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 4e6c2869ff..9ab5bc282d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -17,10 +17,10 @@ FROM (
     -- Change Column Aliases
     SELECT
       ds AS metric_time__day
-      , martian_day AS metric_time__martian_day
+      , alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
@@ -35,7 +35,7 @@ LEFT OUTER JOIN (
     SELECT
       subq_11.ds__day AS metric_time__day
       , subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,7 +48,7 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_16
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 9526fb7534..459b3ff555 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.metric_time__martian_day
+  subq_4.metric_time__alien_day
   , subq_4.listing__ds__month
   , subq_4.listings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
     , SUM(subq_3.listings) AS listings
   FROM (
-    -- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+    -- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
     SELECT
-      subq_2.metric_time__martian_day
+      subq_2.metric_time__alien_day
       , subq_2.listing__ds__month
       , subq_2.listings
     FROM (
@@ -90,7 +90,7 @@ FROM (
         , subq_0.listings AS listings
         , subq_0.largest_listing AS largest_listing
         , subq_0.smallest_listing AS smallest_listing
-        , subq_1.martian_day AS metric_time__martian_day
+        , subq_1.alien_day AS metric_time__alien_day
       FROM (
         -- Read Elements From Semantic Model 'listings_latest'
         SELECT
@@ -159,6 +159,6 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 56d2c8ed17..9306aec3cb 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Redshift
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+-- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS metric_time__martian_day
+  subq_6.alien_day AS metric_time__alien_day
   , subq_5.listing__ds__month AS listing__ds__month
   , SUM(subq_5.listings) AS listings
 FROM (
@@ -24,5 +24,5 @@ LEFT OUTER JOIN
 ON
   subq_5.ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
   , subq_5.listing__ds__month
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql
index b569186b76..299f98e168 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_5.bookings) AS bookings
   , MAX(subq_11.listings) AS listings
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , subq_4.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -124,7 +124,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -225,23 +225,23 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
 ) subq_5
 FULL OUTER JOIN (
   -- Compute Metrics via Expressions
   SELECT
-    subq_10.metric_time__martian_day
+    subq_10.metric_time__alien_day
     , subq_10.listings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
       , SUM(subq_9.listings) AS listings
     FROM (
-      -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['listings', 'metric_time__alien_day']
       SELECT
-        subq_8.metric_time__martian_day
+        subq_8.metric_time__alien_day
         , subq_8.listings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -314,7 +314,7 @@ FULL OUTER JOIN (
           , subq_6.listings AS listings
           , subq_6.largest_listing AS largest_listing
           , subq_6.smallest_listing AS smallest_listing
-          , subq_7.martian_day AS metric_time__martian_day
+          , subq_7.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'listings_latest'
           SELECT
@@ -383,10 +383,10 @@ FULL OUTER JOIN (
       ) subq_8
     ) subq_9
     GROUP BY
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
   ) subq_10
 ) subq_11
 ON
-  subq_5.metric_time__martian_day = subq_11.metric_time__martian_day
+  subq_5.metric_time__alien_day = subq_11.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day)
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index 1c8b925d26..7a1265920d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: Redshift
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_17.bookings) AS bookings
   , MAX(subq_23.listings) AS listings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS metric_time__martian_day
+    subq_13.alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -28,16 +28,16 @@ FROM (
   ON
     subq_12.ds__day = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
 FULL OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['listings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_19.martian_day AS metric_time__martian_day
+    subq_19.alien_day AS metric_time__alien_day
     , SUM(subq_18.listings) AS listings
   FROM (
     -- Read Elements From Semantic Model 'listings_latest'
@@ -51,9 +51,9 @@ FULL OUTER JOIN (
   ON
     subq_18.ds__day = subq_19.ds
   GROUP BY
-    subq_19.martian_day
+    subq_19.alien_day
 ) subq_23
 ON
-  subq_17.metric_time__martian_day = subq_23.metric_time__martian_day
+  subq_17.metric_time__alien_day = subq_23.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day)
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
index b45f74003e..7a68dc1a12 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_7.metric_time__martian_day
+  subq_7.metric_time__alien_day
   , subq_7.metric_time__hour
   , subq_7.archived_users AS subdaily_cumulative_window_metric
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
     , SUM(subq_6.archived_users) AS archived_users
   FROM (
-    -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_5.metric_time__martian_day
+      subq_5.metric_time__alien_day
       , subq_5.metric_time__hour
       , subq_5.archived_users
     FROM (
@@ -213,7 +213,7 @@ FROM (
         , subq_1.home_state AS home_state
         , subq_1.user__home_state AS user__home_state
         , subq_1.archived_users AS archived_users
-        , subq_4.martian_day AS metric_time__martian_day
+        , subq_4.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -612,6 +612,6 @@ FROM (
     ) subq_5
   ) subq_6
   GROUP BY
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
 ) subq_7
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
index 597ed772df..976241294c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Redshift
 ---
 -- Join Self Over Time Range
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+-- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_12.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS metric_time__alien_day
   , subq_11.ts AS metric_time__hour
   , SUM(subq_9.archived_users) AS subdaily_cumulative_window_metric
 FROM ***************************.mf_time_spine_hour subq_11
@@ -31,5 +31,5 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', subq_11.ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
+  subq_12.alien_day
   , subq_11.ts
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
index 4f4d076ffe..529ffdc04d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.metric_time__hour
   , subq_9.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_8.metric_time__martian_day AS metric_time__martian_day
+    subq_8.metric_time__alien_day AS metric_time__alien_day
     , subq_8.metric_time__hour AS metric_time__hour
     , subq_4.archived_users AS archived_users
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__hour
     FROM (
       -- Change Column Aliases
@@ -34,7 +34,7 @@ FROM (
         , subq_5.ts__extract_day AS ts__extract_day
         , subq_5.ts__extract_dow AS ts__extract_dow
         , subq_5.ts__extract_doy AS ts__extract_doy
-        , subq_6.martian_day AS metric_time__martian_day
+        , subq_6.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -61,13 +61,13 @@ FROM (
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
       , SUM(subq_3.archived_users) AS archived_users
     FROM (
-      -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+      -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.metric_time__hour
         , subq_2.archived_users
       FROM (
@@ -264,7 +264,7 @@ FROM (
           , subq_0.home_state AS home_state
           , subq_0.user__home_state AS user__home_state
           , subq_0.archived_users AS archived_users
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'users_ds_source'
           SELECT
@@ -456,7 +456,7 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
   ) subq_4
   ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
index bb3fb6f449..f6a723d7f3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
@@ -5,15 +5,15 @@ sql_engine: Redshift
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_18.metric_time__martian_day AS metric_time__martian_day
+  subq_18.metric_time__alien_day AS metric_time__alien_day
   , subq_18.metric_time__hour AS metric_time__hour
   , subq_14.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Change Column Aliases
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
   SELECT
-    subq_16.martian_day AS metric_time__martian_day
+    subq_16.alien_day AS metric_time__alien_day
     , time_spine_src_28005.ts AS metric_time__hour
   FROM ***************************.mf_time_spine_hour time_spine_src_28005
   LEFT OUTER JOIN
@@ -24,10 +24,10 @@ FROM (
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'archived_at'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
   -- Aggregate Measures
   SELECT
-    subq_11.martian_day AS metric_time__martian_day
+    subq_11.alien_day AS metric_time__alien_day
     , subq_10.archived_at__hour AS metric_time__hour
     , SUM(subq_10.archived_users) AS archived_users
   FROM (
@@ -43,7 +43,7 @@ LEFT OUTER JOIN (
   ON
     subq_10.archived_at__day = subq_11.ds
   GROUP BY
-    subq_11.martian_day
+    subq_11.alien_day
     , subq_10.archived_at__hour
 ) subq_14
 ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 1a4710abab..919d28ef09 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -2,10 +2,10 @@ test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
 sql_engine: Redshift
 ---
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
 FROM (
@@ -193,8 +193,8 @@ FROM (
     , subq_0.user__home_state AS user__home_state
     , subq_0.new_users AS new_users
     , subq_0.archived_users AS archived_users
-    , subq_4.martian_day AS metric_time__martian_day
-    , subq_5.martian_day AS user__bio_added_ts__martian_day
+    , subq_4.alien_day AS metric_time__alien_day
+    , subq_5.alien_day AS user__bio_added_ts__alien_day
   FROM (
     -- Read Elements From Semantic Model 'users_ds_source'
     SELECT
@@ -397,7 +397,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -409,7 +409,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -424,7 +424,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
@@ -439,7 +439,7 @@ FROM (
     subq_0.user__bio_added_ts__day = subq_5.ds
 ) subq_6
 GROUP BY
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 1bc0258fc5..71ff42ceba 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -5,10 +5,10 @@ sql_engine: Redshift
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_12.martian_day AS user__bio_added_ts__martian_day
-  , subq_11.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS user__bio_added_ts__alien_day
+  , subq_11.alien_day AS metric_time__alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__month
   , time_spine_src_28006.ds AS metric_time__day
 FROM ***************************.dim_users users_ds_source_src_28000
@@ -23,7 +23,7 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', users_ds_source_src_28000.bio_added_ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
-  , subq_11.martian_day
+  subq_12.alien_day
+  , subq_11.alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts)
   , time_spine_src_28006.ds
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql
index 22b6d8988f..0b28abe63e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: Redshift
 ---
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
@@ -20,7 +20,7 @@ FROM (
     , subq_0.ds__extract_day AS ds__extract_day
     , subq_0.ds__extract_dow AS ds__extract_dow
     , subq_0.ds__extract_doy AS ds__extract_doy
-    , subq_0.ds__martian_day AS ds__martian_day
+    , subq_0.ds__alien_day AS ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -32,8 +32,8 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
-    , subq_1.martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
+    , subq_1.alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
   LEFT OUTER JOIN
@@ -57,4 +57,4 @@ FROM (
     subq_0.ds__day = subq_1.ds
 ) subq_2
 GROUP BY
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 8fdfeeaffa..2090115df9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: Redshift
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_4.martian_day AS metric_time__martian_day
+  subq_4.alien_day AS metric_time__alien_day
 FROM ***************************.mf_time_spine time_spine_src_28006
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_4
 ON
   time_spine_src_28006.ds = subq_4.ds
 GROUP BY
-  subq_4.martian_day
+  subq_4.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index 4af0ff1e2f..51b82cae45 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: Redshift
 ---
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Join to Custom Granularity Dataset
@@ -97,7 +97,7 @@ FROM (
     , bookings_source_src_28000.listing_id AS booking__listing
     , bookings_source_src_28000.guest_id AS booking__guest
     , bookings_source_src_28000.host_id AS booking__host
-    , subq_0.martian_day AS booking__ds__martian_day
+    , subq_0.alien_day AS booking__ds__alien_day
   FROM ***************************.fct_bookings bookings_source_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_0
@@ -105,4 +105,4 @@ FROM (
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_0.ds
 ) subq_1
 GROUP BY
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index 971e2e8e15..c3de89c3f9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: Redshift
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_2.martian_day AS booking__ds__martian_day
+  subq_2.alien_day AS booking__ds__alien_day
 FROM ***************************.fct_bookings bookings_source_src_28000
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_2
 ON
   DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_2.ds
 GROUP BY
-  subq_2.martian_day
+  subq_2.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql
index c28abb2dd5..827d68911e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -10,7 +10,7 @@ SELECT
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
   subq_2.listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index e83f8d5376..e9db4d0d07 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -13,13 +13,13 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
-    , subq_3.martian_day AS listing__ds__martian_day
+    , subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
   listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 10842592f6..55b8449617 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -4,13 +4,13 @@ docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
 sql_engine: Redshift
 ---
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index 6c4f83493e..0b503d6439 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,20 +5,20 @@ docstring:
 sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  listing__ds__martian_day
+  listing__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Join to Custom Granularity Dataset
   SELECT
-    subq_3.martian_day AS listing__ds__martian_day
+    subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
-  listing__ds__martian_day
+  listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql
index 467650ce6d..a234488d0f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0.sql
@@ -4,22 +4,22 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
+  subq_9.booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
+    subq_8.booking__ds__alien_day
     , subq_8.bookings AS bookings_5_days_ago
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
+        subq_6.booking__ds__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
@@ -123,7 +123,7 @@ FROM (
           , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_5.martian_day AS booking__ds__martian_day
+          , subq_5.alien_day AS booking__ds__alien_day
         FROM (
           -- Pass Only Elements: ['booking__ds__day',]
           SELECT
@@ -142,7 +142,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -157,7 +157,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
@@ -366,6 +366,6 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index 6e0433144c..15da23f059 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.martian_day AS booking__ds__martian_day
+    subq_15.alien_day AS booking__ds__alien_day
     , SUM(subq_11.bookings) AS bookings_5_days_ago
   FROM ***************************.mf_time_spine time_spine_src_28006
   INNER JOIN (
@@ -31,5 +31,5 @@ FROM (
   ON
     time_spine_src_28006.ds = subq_15.ds
   GROUP BY
-    subq_15.martian_day
+    subq_15.alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 6768ba3a0a..ab314f91bc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -24,7 +24,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_6.metric_time__martian_day
+          subq_6.metric_time__alien_day
           , subq_6.ds__day
           , subq_6.ds__week
           , subq_6.ds__month
@@ -225,7 +225,7 @@ FROM (
             , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_5.martian_day AS metric_time__martian_day
+            , subq_5.alien_day AS metric_time__alien_day
           FROM (
             -- Pass Only Elements: ['metric_time__day',]
             SELECT
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -466,7 +466,7 @@ FROM (
           ON
             subq_4.metric_time__day = subq_5.ds
         ) subq_6
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_7
     ) subq_8
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index c5b00d5129..a8ffca7b7c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -20,7 +20,7 @@ FROM (
     SELECT
       time_spine_src_28006.ds AS metric_time__day
       , subq_12.bookings AS bookings
-      , subq_16.martian_day AS metric_time__martian_day
+      , subq_16.alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
     INNER JOIN (
       -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ FROM (
     ON
       time_spine_src_28006.ds = subq_16.ds
   ) subq_17
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_21
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql
index b8dc3840d8..d67c94e1ff 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.booking__ds__martian_day
+  subq_4.booking__ds__alien_day
   , subq_4.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
     , SUM(subq_3.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
     SELECT
-      subq_2.booking__ds__martian_day
+      subq_2.booking__ds__alien_day
       , subq_2.bookings
     FROM (
       -- Metric Time Dimension 'ds'
@@ -118,7 +118,7 @@ FROM (
         , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_1.martian_day AS booking__ds__martian_day
+        , subq_1.alien_day AS booking__ds__alien_day
       FROM (
         -- Read Elements From Semantic Model 'bookings_source'
         SELECT
@@ -219,5 +219,5 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index fb59951fa5..4e42e231a8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Redshift
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS booking__ds__martian_day
+  subq_6.alien_day AS booking__ds__alien_day
   , SUM(subq_5.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -22,4 +22,4 @@ LEFT OUTER JOIN
 ON
   subq_5.booking__ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index b02c6fe690..e120d452f2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.listing__ds__martian_day
+  subq_8.listing__ds__alien_day
   , subq_8.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
     , SUM(subq_7.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
     SELECT
-      subq_6.listing__ds__martian_day
+      subq_6.listing__ds__alien_day
       , subq_6.bookings
     FROM (
       -- Join Standard Outputs
@@ -119,7 +119,7 @@ FROM (
         , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_5.martian_day AS listing__ds__martian_day
+        , subq_5.alien_day AS listing__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -462,5 +462,5 @@ FROM (
     ) subq_6
   ) subq_7
   GROUP BY
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index 6893708216..2c6b15bd89 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_14.martian_day AS listing__ds__martian_day
+  subq_14.alien_day AS listing__ds__alien_day
   , SUM(subq_10.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -27,4 +27,4 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_14.ds
 GROUP BY
-  subq_14.martian_day
+  subq_14.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql
index 91a1741fd8..b2fc2f8cb2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -18,7 +18,7 @@ FROM (
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -219,7 +219,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -318,7 +318,7 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 616a3908df..876cdef3f8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -15,7 +15,7 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -28,4 +28,4 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 6c3ae5e850..50071588f6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -6,22 +6,22 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_5.metric_time__martian_day
+  subq_5.metric_time__alien_day
   , subq_5.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , SUM(subq_4.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+    -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -222,7 +222,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -321,9 +321,9 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
   GROUP BY
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index d4f5eb3f7d..873bcac323 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,18 +5,18 @@ docstring:
 sql_engine: Redshift
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+-- Pass Only Elements: ['bookings', 'metric_time__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , SUM(bookings) AS bookings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -29,6 +29,6 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index fa53a74eb6..4955407635 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -6,17 +6,17 @@ sql_engine: Redshift
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_36.listing__user__ds__martian_day
+  subq_36.listing__user__ds__alien_day
   , subq_36.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
     , SUM(subq_35.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
     SELECT
-      subq_34.listing__user__ds__martian_day
+      subq_34.listing__user__ds__alien_day
       , subq_34.bookings
     FROM (
       -- Join Standard Outputs
@@ -122,7 +122,7 @@ FROM (
         , subq_25.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_25.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_25.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_33.martian_day AS listing__user__ds__martian_day
+        , subq_33.alien_day AS listing__user__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -1400,5 +1400,5 @@ FROM (
     ) subq_34
   ) subq_35
   GROUP BY
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
 ) subq_36
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index 33f5b0854d..47fdbfd579 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Redshift/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -6,11 +6,11 @@ sql_engine: Redshift
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_46.martian_day AS listing__user__ds__martian_day
+  subq_46.alien_day AS listing__user__ds__alien_day
   , SUM(subq_38.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -45,4 +45,4 @@ LEFT OUTER JOIN
 ON
   subq_45.user__ds__day = subq_46.ds
 GROUP BY
-  subq_46.martian_day
+  subq_46.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql
index 744c9009ee..aa628c14b7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_15.metric_time__martian_day
+  subq_15.metric_time__alien_day
   , CAST(subq_15.buys AS DOUBLE) / CAST(NULLIF(subq_15.visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_4.visits) AS visits
     , MAX(subq_14.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.visits
       FROM (
         -- Metric Time Dimension 'ds'
@@ -67,7 +67,7 @@ FROM (
           , subq_0.visit__referrer_id AS visit__referrer_id
           , subq_0.visits AS visits
           , subq_0.visitors AS visitors
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'visits_source'
           SELECT
@@ -110,22 +110,22 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
       , SUM(subq_13.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_12.metric_time__martian_day
+        subq_12.metric_time__alien_day
         , subq_12.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_11.metric_time__martian_day
+          subq_11.metric_time__alien_day
           , subq_11.metric_time__day
           , subq_11.user
           , subq_11.buys
@@ -141,14 +141,14 @@ FROM (
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_7.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_7.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_10.user
                 , subq_10.metric_time__day
                 , subq_10.mf_internal_uuid
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_7.metric_time__day) OVER (
               PARTITION BY
                 subq_10.user
@@ -168,9 +168,9 @@ FROM (
             , subq_10.mf_internal_uuid AS mf_internal_uuid
             , subq_10.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_6.metric_time__martian_day
+              subq_6.metric_time__alien_day
               , subq_6.metric_time__day
               , subq_6.user
               , subq_6.visits
@@ -219,7 +219,7 @@ FROM (
                 , subq_0.visit__referrer_id AS visit__referrer_id
                 , subq_0.visits AS visits
                 , subq_0.visitors AS visitors
-                , subq_5.martian_day AS metric_time__martian_day
+                , subq_5.alien_day AS metric_time__alien_day
               FROM (
                 -- Read Elements From Semantic Model 'visits_source'
                 SELECT
@@ -432,10 +432,10 @@ FROM (
       ) subq_12
     ) subq_13
     GROUP BY
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
   ) subq_14
   ON
-    subq_4.metric_time__martian_day = subq_14.metric_time__martian_day
+    subq_4.metric_time__alien_day = subq_14.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day)
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day)
 ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index 5b33d9aacd..9141f787e8 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -14,21 +14,21 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE) / CAST(NULLIF(visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_20.visits) AS visits
     , MAX(subq_30.buys) AS buys
   FROM (
     -- Read From CTE For node_id=sma_28019
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      subq_17.martian_day AS metric_time__martian_day
+      subq_17.alien_day AS metric_time__alien_day
       , SUM(sma_28019_cte.visits) AS visits
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
@@ -36,14 +36,14 @@ FROM (
     ON
       sma_28019_cte.metric_time__day = subq_17.ds
     GROUP BY
-      subq_17.martian_day
+      subq_17.alien_day
   ) subq_20
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -56,14 +56,14 @@ FROM (
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_23.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_23.metric_time__alien_day) OVER (
           PARTITION BY
             subq_26.user
             , subq_26.metric_time__day
             , subq_26.mf_internal_uuid
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_23.metric_time__day) OVER (
           PARTITION BY
             subq_26.user
@@ -85,9 +85,9 @@ FROM (
       FROM (
         -- Read From CTE For node_id=sma_28019
         -- Join to Custom Granularity Dataset
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          subq_21.martian_day AS metric_time__martian_day
+          subq_21.alien_day AS metric_time__alien_day
           , sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
@@ -120,10 +120,10 @@ FROM (
         )
     ) subq_27
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_30
   ON
-    subq_20.metric_time__martian_day = subq_30.metric_time__martian_day
+    subq_20.metric_time__alien_day = subq_30.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day)
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day)
 ) subq_31
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index 1a7e49ec20..caedc2f456 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_17.metric_time__martian_day
+  subq_17.metric_time__alien_day
   , CAST(subq_17.buys AS DOUBLE) / CAST(NULLIF(subq_17.visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_5.visits) AS visits
     , MAX(subq_16.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.visits
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -112,7 +112,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -153,26 +153,26 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
       , SUM(subq_15.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_14.metric_time__martian_day
+        subq_14.metric_time__alien_day
         , subq_14.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -188,14 +188,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -215,16 +215,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -311,7 +311,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -352,7 +352,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
@@ -526,10 +526,10 @@ FROM (
       ) subq_14
     ) subq_15
     GROUP BY
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
   ) subq_16
   ON
-    subq_5.metric_time__martian_day = subq_16.metric_time__martian_day
+    subq_5.metric_time__alien_day = subq_16.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day)
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day)
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index 875ff0697c..6b34317005 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -14,43 +14,43 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE) / CAST(NULLIF(visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_23.visits) AS visits
     , MAX(subq_34.buys) AS buys
   FROM (
     -- Constrain Output with WHERE
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(visits) AS visits
     FROM (
       -- Read From CTE For node_id=sma_28019
       -- Join to Custom Granularity Dataset
       SELECT
         sma_28019_cte.visits AS visits
-        , subq_19.martian_day AS metric_time__martian_day
+        , subq_19.alien_day AS metric_time__alien_day
       FROM sma_28019_cte sma_28019_cte
       LEFT OUTER JOIN
         ***************************.mf_time_spine subq_19
       ON
         sma_28019_cte.metric_time__day = subq_19.ds
     ) subq_20
-    WHERE metric_time__martian_day = '2020-01-01'
+    WHERE metric_time__alien_day = '2020-01-01'
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_23
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -63,14 +63,14 @@ FROM (
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
           PARTITION BY
             subq_30.user
             , subq_30.metric_time__day
             , subq_30.mf_internal_uuid
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_27.metric_time__day) OVER (
           PARTITION BY
             subq_30.user
@@ -91,9 +91,9 @@ FROM (
         , subq_30.buys AS buys
       FROM (
         -- Constrain Output with WHERE
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          metric_time__martian_day
+          metric_time__alien_day
           , metric_time__day
           , subq_25.user
           , visits
@@ -104,14 +104,14 @@ FROM (
             sma_28019_cte.metric_time__day AS metric_time__day
             , sma_28019_cte.user AS user
             , sma_28019_cte.visits AS visits
-            , subq_24.martian_day AS metric_time__martian_day
+            , subq_24.alien_day AS metric_time__alien_day
           FROM sma_28019_cte sma_28019_cte
           LEFT OUTER JOIN
             ***************************.mf_time_spine subq_24
           ON
             sma_28019_cte.metric_time__day = subq_24.ds
         ) subq_25
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_27
       INNER JOIN (
         -- Read Elements From Semantic Model 'buys_source'
@@ -136,10 +136,10 @@ FROM (
         )
     ) subq_31
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_34
   ON
-    subq_23.metric_time__martian_day = subq_34.metric_time__martian_day
+    subq_23.metric_time__alien_day = subq_34.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day)
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day)
 ) subq_35
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 874b3efdee..40c8b90606 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -108,7 +108,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -149,7 +149,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
   ) subq_5
@@ -164,7 +164,7 @@ FROM (
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -180,14 +180,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -207,16 +207,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -303,7 +303,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -344,7 +344,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index e2aa8b45cd..4aaf5151ad 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -27,14 +27,14 @@ FROM (
     -- Join to Custom Granularity Dataset
     SELECT
       sma_28019_cte.visits AS visits
-      , subq_19.martian_day AS metric_time__martian_day
+      , subq_19.alien_day AS metric_time__alien_day
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_19
     ON
       sma_28019_cte.metric_time__day = subq_19.ds
   ) subq_20
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_23
 CROSS JOIN (
   -- Find conversions for user within the range of 7 day
@@ -53,14 +53,14 @@ CROSS JOIN (
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS visits
-      , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+      , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
         PARTITION BY
           subq_30.user
           , subq_30.metric_time__day
           , subq_30.mf_internal_uuid
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-      ) AS metric_time__martian_day
+      ) AS metric_time__alien_day
       , FIRST_VALUE(subq_27.metric_time__day) OVER (
         PARTITION BY
           subq_30.user
@@ -81,9 +81,9 @@ CROSS JOIN (
       , subq_30.buys AS buys
     FROM (
       -- Constrain Output with WHERE
-      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
       SELECT
-        metric_time__martian_day
+        metric_time__alien_day
         , metric_time__day
         , subq_25.user
         , visits
@@ -94,14 +94,14 @@ CROSS JOIN (
           sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
-          , subq_24.martian_day AS metric_time__martian_day
+          , subq_24.alien_day AS metric_time__alien_day
         FROM sma_28019_cte sma_28019_cte
         LEFT OUTER JOIN
           ***************************.mf_time_spine subq_24
         ON
           sma_28019_cte.metric_time__day = subq_24.ds
       ) subq_25
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_27
     INNER JOIN (
       -- Read Elements From Semantic Model 'buys_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql
index 570ef24011..cd30e66938 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -4,29 +4,29 @@ sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
 FROM (
   -- Window Function for Metric Re-aggregation
   SELECT
-    subq_8.metric_time__martian_day
-    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__martian_day) AS trailing_2_months_revenue
+    subq_8.metric_time__alien_day
+    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__day
       , subq_7.txn_revenue AS trailing_2_months_revenue
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
         , SUM(subq_6.txn_revenue) AS txn_revenue
       FROM (
-        -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+        -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
         SELECT
-          subq_5.metric_time__martian_day
+          subq_5.metric_time__alien_day
           , subq_5.metric_time__day
           , subq_5.txn_revenue
         FROM (
@@ -69,7 +69,7 @@ FROM (
             , subq_1.user AS user
             , subq_1.revenue_instance__user AS revenue_instance__user
             , subq_1.txn_revenue AS txn_revenue
-            , subq_4.martian_day AS metric_time__martian_day
+            , subq_4.alien_day AS metric_time__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -159,11 +159,11 @@ FROM (
         ) subq_5
       ) subq_6
       GROUP BY
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
     ) subq_7
   ) subq_8
 ) subq_9
 GROUP BY
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index 5a01ab40ea..caee9c2b30 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,21 +4,21 @@ sql_engine: Snowflake
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
 FROM (
   -- Compute Metrics via Expressions
   -- Window Function for Metric Re-aggregation
   SELECT
-    metric_time__martian_day
-    , AVG(txn_revenue) OVER (PARTITION BY metric_time__martian_day) AS trailing_2_months_revenue
+    metric_time__alien_day
+    , AVG(txn_revenue) OVER (PARTITION BY metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Join Self Over Time Range
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+    -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
     -- Aggregate Measures
     SELECT
-      subq_14.martian_day AS metric_time__martian_day
+      subq_14.alien_day AS metric_time__alien_day
       , subq_13.ds AS metric_time__day
       , SUM(revenue_src_28000.revenue) AS txn_revenue
     FROM ***************************.mf_time_spine subq_13
@@ -35,10 +35,10 @@ FROM (
     ON
       subq_13.ds = subq_14.ds
     GROUP BY
-      subq_14.martian_day
+      subq_14.alien_day
       , subq_13.ds
   ) subq_17
 ) subq_19
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0.sql
index 5be9b5313b..44397e5afe 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: Snowflake
 -- Compute Metrics via Expressions
 SELECT
   subq_15.metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -138,19 +138,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -167,7 +167,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -183,24 +183,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0_optimized.sql
index db37bcec42..467c9dd8ee 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: Snowflake
 -- Compute Metrics via Expressions
 SELECT
   metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['bookings', 'metric_time__day']
@@ -21,19 +21,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -50,24 +50,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_23
     ) subq_24
     ON
-      cte_6.ds__martian_day = subq_24.ds__martian_day
+      cte_6.ds__alien_day = subq_24.ds__alien_day
   ) subq_25
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
index 96d07a8f8a..09a68d388b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day
+  subq_16.metric_time__alien_day
   , subq_16.booking__ds__month
   , subq_16.metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.metric_time__martian_day
+    subq_15.metric_time__alien_day
     , subq_15.booking__ds__month
     , subq_15.metric_time__extract_year
     , subq_15.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
       , SUM(subq_14.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
       SELECT
-        subq_13.metric_time__martian_day
+        subq_13.metric_time__alien_day
         , subq_13.booking__ds__month
         , subq_13.metric_time__extract_year
         , subq_13.bookings
@@ -131,7 +131,7 @@ FROM (
           , subq_5.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_5.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_5.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_12.martian_day AS metric_time__martian_day
+          , subq_12.alien_day AS metric_time__alien_day
         FROM (
           -- Pass Only Elements: ['ds__day', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__day']
           SELECT
@@ -152,19 +152,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -181,7 +181,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -197,24 +197,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
@@ -422,7 +422,7 @@ FROM (
       ) subq_13
     ) subq_14
     GROUP BY
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
   ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
index b70a16822c..5514f9824e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
@@ -4,18 +4,18 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , booking__ds__month
   , metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_29.martian_day AS metric_time__martian_day
+    subq_29.alien_day AS metric_time__alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead) AS booking__ds__month
     , EXTRACT(year FROM subq_26.ds__day__lead) AS metric_time__extract_year
     , SUM(subq_22.bookings) AS bookings
@@ -26,19 +26,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -55,24 +55,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_24
     ) subq_25
     ON
-      cte_6.ds__martian_day = subq_25.ds__martian_day
+      cte_6.ds__alien_day = subq_25.ds__alien_day
   ) subq_26
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -89,7 +89,7 @@ FROM (
   ON
     subq_26.ds__day__lead = subq_29.ds
   GROUP BY
-    subq_29.martian_day
+    subq_29.alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead)
     , EXTRACT(year FROM subq_26.ds__day__lead)
 ) subq_33
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_multiple_time_spines__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_multiple_time_spines__plan0.sql
index 0b79923567..dfd381f7cc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_multiple_time_spines__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_multiple_time_spines__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: Snowflake
 -- Compute Metrics via Expressions
 SELECT
   subq_17.metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -230,19 +230,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_8.ts__hour AS ts__hour
-                  , subq_7.ds__martian_day AS ds__martian_day
+                  , subq_7.ds__alien_day AS ds__alien_day
                   , FIRST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__first_value
                   , LAST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                   ) AS ts__hour__row_number
                 FROM (
@@ -259,7 +259,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
                 INNER JOIN (
@@ -294,24 +294,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_9.ds__martian_day
-                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__first_value__lead
-                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__last_value__lead
+                  subq_9.ds__alien_day
+                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__first_value__lead
+                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                 ) subq_9
               ) subq_10
               ON
-                cte_2.ds__martian_day = subq_10.ds__martian_day
+                cte_2.ds__alien_day = subq_10.ds__alien_day
             ) subq_11
           ) subq_12
         ) subq_13
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
index 191ee71727..0d88de3d56 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: Snowflake
 -- Compute Metrics via Expressions
 SELECT
   metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['archived_users', 'metric_time__hour']
@@ -20,19 +20,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         time_spine_src_28005.ts AS ts__hour
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
         , FIRST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__first_value
         , LAST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
         ) AS ts__hour__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -53,24 +53,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__first_value__lead
-        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__last_value__lead
+        ds__alien_day
+        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__first_value__lead
+        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
       ) subq_27
     ) subq_28
     ON
-      cte_6.ds__martian_day = subq_28.ds__martian_day
+      cte_6.ds__alien_day = subq_28.ds__alien_day
   ) subq_29
   INNER JOIN (
     -- Read Elements From Semantic Model 'users_ds_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_only_window_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_only_window_grain__plan0.sql
index 1ca73d3cd9..c3caa153b4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_only_window_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_only_window_grain__plan0.sql
@@ -4,33 +4,33 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
-  , subq_9.metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  subq_9.booking__ds__alien_day
+  , subq_9.metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
-    , subq_8.metric_time__martian_day
+    subq_8.booking__ds__alien_day
+    , subq_8.metric_time__alien_day
     , subq_8.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
-        , subq_6.metric_time__martian_day
+        subq_6.booking__ds__alien_day
+        , subq_6.metric_time__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
         SELECT
           subq_5.metric_time__day AS metric_time__day
-          , subq_5.booking__ds__martian_day AS booking__ds__martian_day
-          , subq_5.metric_time__martian_day AS metric_time__martian_day
+          , subq_5.booking__ds__alien_day AS booking__ds__alien_day
+          , subq_5.metric_time__alien_day AS metric_time__alien_day
           , subq_2.ds__day AS ds__day
           , subq_2.ds__week AS ds__week
           , subq_2.ds__month AS ds__month
@@ -129,12 +129,12 @@ FROM (
           , subq_2.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_2.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
         FROM (
-          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__martian_day', 'metric_time__martian_day']
+          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__alien_day', 'metric_time__alien_day']
           SELECT
             subq_4.ds__day
             , subq_4.metric_time__day
-            , subq_4.booking__ds__martian_day
-            , subq_4.metric_time__martian_day
+            , subq_4.booking__ds__alien_day
+            , subq_4.metric_time__alien_day
           FROM (
             -- Join Offset Custom Granularity to Base Granularity
             WITH cte_2 AS (
@@ -151,27 +151,27 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             )
 
             SELECT
               cte_2.ds__day AS ds__day
-              , subq_3.ds__martian_day__lead AS metric_time__day
-              , subq_3.ds__martian_day__lead AS booking__ds__martian_day
-              , subq_3.ds__martian_day__lead AS metric_time__martian_day
+              , subq_3.ds__alien_day__lead AS metric_time__day
+              , subq_3.ds__alien_day__lead AS booking__ds__alien_day
+              , subq_3.ds__alien_day__lead AS metric_time__alien_day
             FROM cte_2 cte_2
             INNER JOIN (
               -- Offset Custom Granularity
               SELECT
-                cte_2.ds__martian_day
-                , LEAD(cte_2.ds__martian_day, 1) OVER (ORDER BY cte_2.ds__martian_day) AS ds__martian_day__lead
+                cte_2.ds__alien_day
+                , LEAD(cte_2.ds__alien_day, 1) OVER (ORDER BY cte_2.ds__alien_day) AS ds__alien_day__lead
               FROM cte_2 cte_2
               GROUP BY
-                cte_2.ds__martian_day
+                cte_2.ds__alien_day
             ) subq_3
             ON
-              cte_2.ds__martian_day = subq_3.ds__martian_day
+              cte_2.ds__alien_day = subq_3.ds__alien_day
           ) subq_4
         ) subq_5
         INNER JOIN (
@@ -374,7 +374,7 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
index 9555f5ba4e..a677272504 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
-  , metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  booking__ds__alien_day
+  , metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_14.booking__ds__martian_day AS booking__ds__martian_day
-    , subq_14.metric_time__martian_day AS metric_time__martian_day
+    subq_14.booking__ds__alien_day AS booking__ds__alien_day
+    , subq_14.metric_time__alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Join Offset Custom Granularity to Base Granularity
@@ -22,26 +22,26 @@ FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     )
 
     SELECT
       cte_6.ds__day AS ds__day
-      , subq_13.ds__martian_day__lead AS booking__ds__martian_day
-      , subq_13.ds__martian_day__lead AS metric_time__martian_day
+      , subq_13.ds__alien_day__lead AS booking__ds__alien_day
+      , subq_13.ds__alien_day__lead AS metric_time__alien_day
     FROM cte_6 cte_6
     INNER JOIN (
       -- Offset Custom Granularity
       SELECT
-        ds__martian_day
-        , LEAD(ds__martian_day, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__lead
+        ds__alien_day
+        , LEAD(ds__alien_day, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__lead
       FROM cte_6 cte_6
       GROUP BY
-        ds__martian_day
+        ds__alien_day
     ) subq_13
     ON
-      cte_6.ds__martian_day = subq_13.ds__martian_day
+      cte_6.ds__alien_day = subq_13.ds__alien_day
   ) subq_14
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -54,6 +54,6 @@ FROM (
   ON
     subq_14.ds__day = subq_12.metric_time__day
   GROUP BY
-    subq_14.booking__ds__martian_day
-    , subq_14.metric_time__martian_day
+    subq_14.booking__ds__alien_day
+    , subq_14.metric_time__alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql
index 06cbf1cbef..0ea7d5c6ec 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_11.booking__ds__martian_day
+  subq_11.booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day) AS booking__ds__martian_day
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day) AS booking__ds__alien_day
     , MAX(subq_5.booking_value) AS booking_value
     , MAX(subq_10.bookers) AS bookers
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_4.booking__ds__martian_day
+      subq_4.booking__ds__alien_day
       , subq_4.booking_value
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
         , SUM(subq_3.booking_value) AS booking_value
       FROM (
-        -- Pass Only Elements: ['booking_value', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['booking_value', 'booking__ds__alien_day']
         SELECT
-          subq_2.booking__ds__martian_day
+          subq_2.booking__ds__alien_day
           , subq_2.booking_value
         FROM (
           -- Metric Time Dimension 'ds'
@@ -129,7 +129,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS booking__ds__martian_day
+            , subq_1.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -230,23 +230,23 @@ FROM (
         ) subq_2
       ) subq_3
       GROUP BY
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
     ) subq_4
   ) subq_5
   FULL OUTER JOIN (
     -- Compute Metrics via Expressions
     SELECT
-      subq_9.booking__ds__martian_day
+      subq_9.booking__ds__alien_day
       , subq_9.bookers
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
         , COUNT(DISTINCT subq_8.bookers) AS bookers
       FROM (
-        -- Pass Only Elements: ['bookers', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['bookers', 'booking__ds__alien_day']
         SELECT
-          subq_7.booking__ds__martian_day
+          subq_7.booking__ds__alien_day
           , subq_7.bookers
         FROM (
           -- Metric Time Dimension 'ds'
@@ -350,7 +350,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_6.martian_day AS booking__ds__martian_day
+            , subq_6.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -451,11 +451,11 @@ FROM (
         ) subq_7
       ) subq_8
       GROUP BY
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
     ) subq_9
   ) subq_10
   ON
-    subq_5.booking__ds__martian_day = subq_10.booking__ds__martian_day
+    subq_5.booking__ds__alien_day = subq_10.booking__ds__alien_day
   GROUP BY
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day)
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day)
 ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index bb3ab9f41d..6914d3b44c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS booking__ds__martian_day
+    subq_13.alien_day AS booking__ds__alien_day
     , SUM(bookings_source_src_28000.booking_value) AS booking_value
     , COUNT(DISTINCT bookings_source_src_28000.guest_id) AS bookers
   FROM ***************************.fct_bookings bookings_source_src_28000
@@ -22,5 +22,5 @@ FROM (
   ON
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index 8468873a52..5e6f574b5d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.metric_time__martian_day
+  subq_8.metric_time__alien_day
   , subq_8.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_7.metric_time__martian_day AS metric_time__martian_day
+    subq_7.metric_time__alien_day AS metric_time__alien_day
     , subq_4.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
     FROM (
       -- Change Column Aliases
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day AS metric_time__martian_day
+        , subq_5.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,22 +44,22 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
     GROUP BY
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
   ) subq_7
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -163,7 +163,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -264,8 +264,8 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   ON
-    subq_7.metric_time__martian_day = subq_4.metric_time__martian_day
+    subq_7.metric_time__alien_day = subq_4.metric_time__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index 61940d0dd0..a268b8c1d6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -5,25 +5,25 @@ sql_engine: Snowflake
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day AS metric_time__martian_day
+  subq_16.metric_time__alien_day AS metric_time__alien_day
   , subq_13.bookings AS bookings_join_to_time_spine
 FROM (
   -- Read From Time Spine 'mf_time_spine'
   -- Change Column Aliases
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    martian_day AS metric_time__martian_day
+    alien_day AS metric_time__alien_day
   FROM ***************************.mf_time_spine time_spine_src_28006
   GROUP BY
-    martian_day
+    alien_day
 ) subq_16
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    subq_10.martian_day AS metric_time__martian_day
+    subq_10.alien_day AS metric_time__alien_day
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ LEFT OUTER JOIN (
   ON
     subq_9.ds__day = subq_10.ds
   GROUP BY
-    subq_10.martian_day
+    subq_10.alien_day
 ) subq_13
 ON
-  subq_16.metric_time__martian_day = subq_13.metric_time__martian_day
+  subq_16.metric_time__alien_day = subq_13.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
index 5f9a46b7b6..700fb314b0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.metric_time__martian_day
+  subq_10.metric_time__alien_day
   , subq_10.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_9.metric_time__martian_day AS metric_time__martian_day
+    subq_9.metric_time__alien_day AS metric_time__alien_day
     , subq_5.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
     FROM (
       -- Constrain Output with WHERE
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,29 +59,29 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
     GROUP BY
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
   ) subq_9
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.bookings
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -282,7 +282,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -381,12 +381,12 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   ON
-    subq_9.metric_time__martian_day = subq_5.metric_time__martian_day
+    subq_9.metric_time__alien_day = subq_5.metric_time__alien_day
 ) subq_10
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
index a966529c32..2f722f45f1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -5,37 +5,37 @@ sql_engine: Snowflake
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_20.metric_time__martian_day AS metric_time__martian_day
+  subq_20.metric_time__alien_day AS metric_time__alien_day
   , subq_16.bookings AS bookings_join_to_time_spine
 FROM (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     -- Change Column Aliases
     SELECT
-      martian_day AS metric_time__martian_day
+      alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
     , SUM(bookings) AS bookings
   FROM (
     -- Metric Time Dimension 'ds'
     -- Join to Custom Granularity Dataset
     SELECT
       subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,9 +48,9 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_16
 ON
-  subq_20.metric_time__martian_day = subq_16.metric_time__martian_day
+  subq_20.metric_time__alien_day = subq_16.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index fbfc517893..a3632cbab4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,11 +59,11 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
   ) subq_9
   LEFT OUTER JOIN (
@@ -79,7 +79,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -280,7 +280,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -379,7 +379,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 128ef76e45..4714820f9f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -17,10 +17,10 @@ FROM (
     -- Change Column Aliases
     SELECT
       ds AS metric_time__day
-      , martian_day AS metric_time__martian_day
+      , alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
@@ -35,7 +35,7 @@ LEFT OUTER JOIN (
     SELECT
       subq_11.ds__day AS metric_time__day
       , subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,7 +48,7 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_16
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 4295ce8ef0..8d2d874ef7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.metric_time__martian_day
+  subq_4.metric_time__alien_day
   , subq_4.listing__ds__month
   , subq_4.listings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
     , SUM(subq_3.listings) AS listings
   FROM (
-    -- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+    -- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
     SELECT
-      subq_2.metric_time__martian_day
+      subq_2.metric_time__alien_day
       , subq_2.listing__ds__month
       , subq_2.listings
     FROM (
@@ -90,7 +90,7 @@ FROM (
         , subq_0.listings AS listings
         , subq_0.largest_listing AS largest_listing
         , subq_0.smallest_listing AS smallest_listing
-        , subq_1.martian_day AS metric_time__martian_day
+        , subq_1.alien_day AS metric_time__alien_day
       FROM (
         -- Read Elements From Semantic Model 'listings_latest'
         SELECT
@@ -159,6 +159,6 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 9c76f54867..6870f62d87 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Snowflake
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+-- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS metric_time__martian_day
+  subq_6.alien_day AS metric_time__alien_day
   , subq_5.listing__ds__month AS listing__ds__month
   , SUM(subq_5.listings) AS listings
 FROM (
@@ -24,5 +24,5 @@ LEFT OUTER JOIN
 ON
   subq_5.ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
   , subq_5.listing__ds__month
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql
index a7fc48e871..958753ef53 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_5.bookings) AS bookings
   , MAX(subq_11.listings) AS listings
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , subq_4.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -124,7 +124,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -225,23 +225,23 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
 ) subq_5
 FULL OUTER JOIN (
   -- Compute Metrics via Expressions
   SELECT
-    subq_10.metric_time__martian_day
+    subq_10.metric_time__alien_day
     , subq_10.listings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
       , SUM(subq_9.listings) AS listings
     FROM (
-      -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['listings', 'metric_time__alien_day']
       SELECT
-        subq_8.metric_time__martian_day
+        subq_8.metric_time__alien_day
         , subq_8.listings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -314,7 +314,7 @@ FULL OUTER JOIN (
           , subq_6.listings AS listings
           , subq_6.largest_listing AS largest_listing
           , subq_6.smallest_listing AS smallest_listing
-          , subq_7.martian_day AS metric_time__martian_day
+          , subq_7.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'listings_latest'
           SELECT
@@ -383,10 +383,10 @@ FULL OUTER JOIN (
       ) subq_8
     ) subq_9
     GROUP BY
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
   ) subq_10
 ) subq_11
 ON
-  subq_5.metric_time__martian_day = subq_11.metric_time__martian_day
+  subq_5.metric_time__alien_day = subq_11.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day)
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index d4164aaf0e..a68c84f04f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: Snowflake
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_17.bookings) AS bookings
   , MAX(subq_23.listings) AS listings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS metric_time__martian_day
+    subq_13.alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -28,16 +28,16 @@ FROM (
   ON
     subq_12.ds__day = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
 FULL OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['listings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_19.martian_day AS metric_time__martian_day
+    subq_19.alien_day AS metric_time__alien_day
     , SUM(subq_18.listings) AS listings
   FROM (
     -- Read Elements From Semantic Model 'listings_latest'
@@ -51,9 +51,9 @@ FULL OUTER JOIN (
   ON
     subq_18.ds__day = subq_19.ds
   GROUP BY
-    subq_19.martian_day
+    subq_19.alien_day
 ) subq_23
 ON
-  subq_17.metric_time__martian_day = subq_23.metric_time__martian_day
+  subq_17.metric_time__alien_day = subq_23.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day)
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
index a545892afd..d0228c2e65 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_7.metric_time__martian_day
+  subq_7.metric_time__alien_day
   , subq_7.metric_time__hour
   , subq_7.archived_users AS subdaily_cumulative_window_metric
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
     , SUM(subq_6.archived_users) AS archived_users
   FROM (
-    -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_5.metric_time__martian_day
+      subq_5.metric_time__alien_day
       , subq_5.metric_time__hour
       , subq_5.archived_users
     FROM (
@@ -213,7 +213,7 @@ FROM (
         , subq_1.home_state AS home_state
         , subq_1.user__home_state AS user__home_state
         , subq_1.archived_users AS archived_users
-        , subq_4.martian_day AS metric_time__martian_day
+        , subq_4.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -612,6 +612,6 @@ FROM (
     ) subq_5
   ) subq_6
   GROUP BY
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
 ) subq_7
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
index aa7c2f0459..2c5802feba 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Snowflake
 ---
 -- Join Self Over Time Range
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+-- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_12.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS metric_time__alien_day
   , subq_11.ts AS metric_time__hour
   , SUM(subq_9.archived_users) AS subdaily_cumulative_window_metric
 FROM ***************************.mf_time_spine_hour subq_11
@@ -31,5 +31,5 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', subq_11.ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
+  subq_12.alien_day
   , subq_11.ts
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
index ed2b8bd594..916a764a25 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.metric_time__hour
   , subq_9.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_8.metric_time__martian_day AS metric_time__martian_day
+    subq_8.metric_time__alien_day AS metric_time__alien_day
     , subq_8.metric_time__hour AS metric_time__hour
     , subq_4.archived_users AS archived_users
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__hour
     FROM (
       -- Change Column Aliases
@@ -34,7 +34,7 @@ FROM (
         , subq_5.ts__extract_day AS ts__extract_day
         , subq_5.ts__extract_dow AS ts__extract_dow
         , subq_5.ts__extract_doy AS ts__extract_doy
-        , subq_6.martian_day AS metric_time__martian_day
+        , subq_6.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -61,13 +61,13 @@ FROM (
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
       , SUM(subq_3.archived_users) AS archived_users
     FROM (
-      -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+      -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.metric_time__hour
         , subq_2.archived_users
       FROM (
@@ -264,7 +264,7 @@ FROM (
           , subq_0.home_state AS home_state
           , subq_0.user__home_state AS user__home_state
           , subq_0.archived_users AS archived_users
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'users_ds_source'
           SELECT
@@ -456,7 +456,7 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
   ) subq_4
   ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
index 077ea64bb5..e648bf90b6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
@@ -5,15 +5,15 @@ sql_engine: Snowflake
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_18.metric_time__martian_day AS metric_time__martian_day
+  subq_18.metric_time__alien_day AS metric_time__alien_day
   , subq_18.metric_time__hour AS metric_time__hour
   , subq_14.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Change Column Aliases
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
   SELECT
-    subq_16.martian_day AS metric_time__martian_day
+    subq_16.alien_day AS metric_time__alien_day
     , time_spine_src_28005.ts AS metric_time__hour
   FROM ***************************.mf_time_spine_hour time_spine_src_28005
   LEFT OUTER JOIN
@@ -24,10 +24,10 @@ FROM (
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'archived_at'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
   -- Aggregate Measures
   SELECT
-    subq_11.martian_day AS metric_time__martian_day
+    subq_11.alien_day AS metric_time__alien_day
     , subq_10.archived_at__hour AS metric_time__hour
     , SUM(subq_10.archived_users) AS archived_users
   FROM (
@@ -43,7 +43,7 @@ LEFT OUTER JOIN (
   ON
     subq_10.archived_at__day = subq_11.ds
   GROUP BY
-    subq_11.martian_day
+    subq_11.alien_day
     , subq_10.archived_at__hour
 ) subq_14
 ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 57bc6b1202..8a94769fa2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -2,10 +2,10 @@ test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
 sql_engine: Snowflake
 ---
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
 FROM (
@@ -193,8 +193,8 @@ FROM (
     , subq_0.user__home_state AS user__home_state
     , subq_0.new_users AS new_users
     , subq_0.archived_users AS archived_users
-    , subq_4.martian_day AS metric_time__martian_day
-    , subq_5.martian_day AS user__bio_added_ts__martian_day
+    , subq_4.alien_day AS metric_time__alien_day
+    , subq_5.alien_day AS user__bio_added_ts__alien_day
   FROM (
     -- Read Elements From Semantic Model 'users_ds_source'
     SELECT
@@ -397,7 +397,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -409,7 +409,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -424,7 +424,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
@@ -439,7 +439,7 @@ FROM (
     subq_0.user__bio_added_ts__day = subq_5.ds
 ) subq_6
 GROUP BY
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 139e5479a5..e4d251f6a4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -5,10 +5,10 @@ sql_engine: Snowflake
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_12.martian_day AS user__bio_added_ts__martian_day
-  , subq_11.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS user__bio_added_ts__alien_day
+  , subq_11.alien_day AS metric_time__alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__month
   , time_spine_src_28006.ds AS metric_time__day
 FROM ***************************.dim_users users_ds_source_src_28000
@@ -23,7 +23,7 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', users_ds_source_src_28000.bio_added_ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
-  , subq_11.martian_day
+  subq_12.alien_day
+  , subq_11.alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts)
   , time_spine_src_28006.ds
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql
index e06791c752..5b6207cbdc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: Snowflake
 ---
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
@@ -20,7 +20,7 @@ FROM (
     , subq_0.ds__extract_day AS ds__extract_day
     , subq_0.ds__extract_dow AS ds__extract_dow
     , subq_0.ds__extract_doy AS ds__extract_doy
-    , subq_0.ds__martian_day AS ds__martian_day
+    , subq_0.ds__alien_day AS ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -32,8 +32,8 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
-    , subq_1.martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
+    , subq_1.alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
   LEFT OUTER JOIN
@@ -57,4 +57,4 @@ FROM (
     subq_0.ds__day = subq_1.ds
 ) subq_2
 GROUP BY
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 68d6d40cbb..85fb10192f 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: Snowflake
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_4.martian_day AS metric_time__martian_day
+  subq_4.alien_day AS metric_time__alien_day
 FROM ***************************.mf_time_spine time_spine_src_28006
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_4
 ON
   time_spine_src_28006.ds = subq_4.ds
 GROUP BY
-  subq_4.martian_day
+  subq_4.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index 4185039977..51f683b614 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: Snowflake
 ---
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Join to Custom Granularity Dataset
@@ -97,7 +97,7 @@ FROM (
     , bookings_source_src_28000.listing_id AS booking__listing
     , bookings_source_src_28000.guest_id AS booking__guest
     , bookings_source_src_28000.host_id AS booking__host
-    , subq_0.martian_day AS booking__ds__martian_day
+    , subq_0.alien_day AS booking__ds__alien_day
   FROM ***************************.fct_bookings bookings_source_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_0
@@ -105,4 +105,4 @@ FROM (
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_0.ds
 ) subq_1
 GROUP BY
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index 79bcd5ec29..c901e83846 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: Snowflake
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_2.martian_day AS booking__ds__martian_day
+  subq_2.alien_day AS booking__ds__alien_day
 FROM ***************************.fct_bookings bookings_source_src_28000
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_2
 ON
   DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_2.ds
 GROUP BY
-  subq_2.martian_day
+  subq_2.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql
index 74eec90abf..689fc7e674 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -10,7 +10,7 @@ SELECT
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
   subq_2.listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index 7266f223ed..d79408f3c0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -13,13 +13,13 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
-    , subq_3.martian_day AS listing__ds__martian_day
+    , subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
   listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 8bd2d4bb9f..b781c8ce4e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -4,13 +4,13 @@ docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
 sql_engine: Snowflake
 ---
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index 271956f1a9..f4d3b27e61 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,20 +5,20 @@ docstring:
 sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  listing__ds__martian_day
+  listing__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Join to Custom Granularity Dataset
   SELECT
-    subq_3.martian_day AS listing__ds__martian_day
+    subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
-  listing__ds__martian_day
+  listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql
index 0295884776..88ded488df 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0.sql
@@ -4,22 +4,22 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
+  subq_9.booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
+    subq_8.booking__ds__alien_day
     , subq_8.bookings AS bookings_5_days_ago
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
+        subq_6.booking__ds__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
@@ -123,7 +123,7 @@ FROM (
           , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_5.martian_day AS booking__ds__martian_day
+          , subq_5.alien_day AS booking__ds__alien_day
         FROM (
           -- Pass Only Elements: ['booking__ds__day',]
           SELECT
@@ -142,7 +142,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -157,7 +157,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
@@ -366,6 +366,6 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index 1ee62fa020..1948433d5a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.martian_day AS booking__ds__martian_day
+    subq_15.alien_day AS booking__ds__alien_day
     , SUM(subq_11.bookings) AS bookings_5_days_ago
   FROM ***************************.mf_time_spine time_spine_src_28006
   INNER JOIN (
@@ -31,5 +31,5 @@ FROM (
   ON
     time_spine_src_28006.ds = subq_15.ds
   GROUP BY
-    subq_15.martian_day
+    subq_15.alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index afe488e940..7f611b5a62 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -24,7 +24,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_6.metric_time__martian_day
+          subq_6.metric_time__alien_day
           , subq_6.ds__day
           , subq_6.ds__week
           , subq_6.ds__month
@@ -225,7 +225,7 @@ FROM (
             , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_5.martian_day AS metric_time__martian_day
+            , subq_5.alien_day AS metric_time__alien_day
           FROM (
             -- Pass Only Elements: ['metric_time__day',]
             SELECT
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -466,7 +466,7 @@ FROM (
           ON
             subq_4.metric_time__day = subq_5.ds
         ) subq_6
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_7
     ) subq_8
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 758c9edb49..8408ef72c5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -20,7 +20,7 @@ FROM (
     SELECT
       time_spine_src_28006.ds AS metric_time__day
       , subq_12.bookings AS bookings
-      , subq_16.martian_day AS metric_time__martian_day
+      , subq_16.alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
     INNER JOIN (
       -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ FROM (
     ON
       time_spine_src_28006.ds = subq_16.ds
   ) subq_17
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_21
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql
index 1f2f82377c..f797208ca5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.booking__ds__martian_day
+  subq_4.booking__ds__alien_day
   , subq_4.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
     , SUM(subq_3.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
     SELECT
-      subq_2.booking__ds__martian_day
+      subq_2.booking__ds__alien_day
       , subq_2.bookings
     FROM (
       -- Metric Time Dimension 'ds'
@@ -118,7 +118,7 @@ FROM (
         , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_1.martian_day AS booking__ds__martian_day
+        , subq_1.alien_day AS booking__ds__alien_day
       FROM (
         -- Read Elements From Semantic Model 'bookings_source'
         SELECT
@@ -219,5 +219,5 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index 0f7a70285c..3aed50ae8a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Snowflake
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS booking__ds__martian_day
+  subq_6.alien_day AS booking__ds__alien_day
   , SUM(subq_5.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -22,4 +22,4 @@ LEFT OUTER JOIN
 ON
   subq_5.booking__ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index 3e456ee85c..0e96902b04 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.listing__ds__martian_day
+  subq_8.listing__ds__alien_day
   , subq_8.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
     , SUM(subq_7.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
     SELECT
-      subq_6.listing__ds__martian_day
+      subq_6.listing__ds__alien_day
       , subq_6.bookings
     FROM (
       -- Join Standard Outputs
@@ -119,7 +119,7 @@ FROM (
         , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_5.martian_day AS listing__ds__martian_day
+        , subq_5.alien_day AS listing__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -462,5 +462,5 @@ FROM (
     ) subq_6
   ) subq_7
   GROUP BY
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index 2a7ee6c6e0..831ae2ed03 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_14.martian_day AS listing__ds__martian_day
+  subq_14.alien_day AS listing__ds__alien_day
   , SUM(subq_10.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -27,4 +27,4 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_14.ds
 GROUP BY
-  subq_14.martian_day
+  subq_14.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql
index 8eecd83b4a..9c0a180100 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -18,7 +18,7 @@ FROM (
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -219,7 +219,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -318,7 +318,7 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index 1fb764d2fe..5a99457a95 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -15,7 +15,7 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -28,4 +28,4 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 5362d12848..189bef46da 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -6,22 +6,22 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_5.metric_time__martian_day
+  subq_5.metric_time__alien_day
   , subq_5.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , SUM(subq_4.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+    -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -222,7 +222,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -321,9 +321,9 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
   GROUP BY
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index 24ae4b3b81..bc854d9b89 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,18 +5,18 @@ docstring:
 sql_engine: Snowflake
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+-- Pass Only Elements: ['bookings', 'metric_time__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , SUM(bookings) AS bookings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -29,6 +29,6 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index edf7bfaa80..d84a8f7c51 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -6,17 +6,17 @@ sql_engine: Snowflake
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_36.listing__user__ds__martian_day
+  subq_36.listing__user__ds__alien_day
   , subq_36.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
     , SUM(subq_35.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
     SELECT
-      subq_34.listing__user__ds__martian_day
+      subq_34.listing__user__ds__alien_day
       , subq_34.bookings
     FROM (
       -- Join Standard Outputs
@@ -122,7 +122,7 @@ FROM (
         , subq_25.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_25.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_25.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_33.martian_day AS listing__user__ds__martian_day
+        , subq_33.alien_day AS listing__user__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -1400,5 +1400,5 @@ FROM (
     ) subq_34
   ) subq_35
   GROUP BY
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
 ) subq_36
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index 3066760184..fa22f0e38c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Snowflake/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -6,11 +6,11 @@ sql_engine: Snowflake
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_46.martian_day AS listing__user__ds__martian_day
+  subq_46.alien_day AS listing__user__ds__alien_day
   , SUM(subq_38.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -45,4 +45,4 @@ LEFT OUTER JOIN
 ON
   subq_45.user__ds__day = subq_46.ds
 GROUP BY
-  subq_46.martian_day
+  subq_46.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql
index c4bc2f798a..0c2dd14c90 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_15.metric_time__martian_day
+  subq_15.metric_time__alien_day
   , CAST(subq_15.buys AS DOUBLE) / CAST(NULLIF(subq_15.visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_4.visits) AS visits
     , MAX(subq_14.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.visits
       FROM (
         -- Metric Time Dimension 'ds'
@@ -67,7 +67,7 @@ FROM (
           , subq_0.visit__referrer_id AS visit__referrer_id
           , subq_0.visits AS visits
           , subq_0.visitors AS visitors
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'visits_source'
           SELECT
@@ -110,22 +110,22 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
       , SUM(subq_13.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_12.metric_time__martian_day
+        subq_12.metric_time__alien_day
         , subq_12.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_11.metric_time__martian_day
+          subq_11.metric_time__alien_day
           , subq_11.metric_time__day
           , subq_11.user
           , subq_11.buys
@@ -141,14 +141,14 @@ FROM (
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_7.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_7.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_10.user
                 , subq_10.metric_time__day
                 , subq_10.mf_internal_uuid
               ORDER BY subq_7.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_7.metric_time__day) OVER (
               PARTITION BY
                 subq_10.user
@@ -168,9 +168,9 @@ FROM (
             , subq_10.mf_internal_uuid AS mf_internal_uuid
             , subq_10.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_6.metric_time__martian_day
+              subq_6.metric_time__alien_day
               , subq_6.metric_time__day
               , subq_6.user
               , subq_6.visits
@@ -219,7 +219,7 @@ FROM (
                 , subq_0.visit__referrer_id AS visit__referrer_id
                 , subq_0.visits AS visits
                 , subq_0.visitors AS visitors
-                , subq_5.martian_day AS metric_time__martian_day
+                , subq_5.alien_day AS metric_time__alien_day
               FROM (
                 -- Read Elements From Semantic Model 'visits_source'
                 SELECT
@@ -432,10 +432,10 @@ FROM (
       ) subq_12
     ) subq_13
     GROUP BY
-      subq_13.metric_time__martian_day
+      subq_13.metric_time__alien_day
   ) subq_14
   ON
-    subq_4.metric_time__martian_day = subq_14.metric_time__martian_day
+    subq_4.metric_time__alien_day = subq_14.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_4.metric_time__martian_day, subq_14.metric_time__martian_day)
+    COALESCE(subq_4.metric_time__alien_day, subq_14.metric_time__alien_day)
 ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
index e789d92646..d94a079787 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity__plan0_optimized.sql
@@ -14,21 +14,21 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE) / CAST(NULLIF(visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_20.visits) AS visits
     , MAX(subq_30.buys) AS buys
   FROM (
     -- Read From CTE For node_id=sma_28019
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      subq_17.martian_day AS metric_time__martian_day
+      subq_17.alien_day AS metric_time__alien_day
       , SUM(sma_28019_cte.visits) AS visits
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
@@ -36,14 +36,14 @@ FROM (
     ON
       sma_28019_cte.metric_time__day = subq_17.ds
     GROUP BY
-      subq_17.martian_day
+      subq_17.alien_day
   ) subq_20
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -56,14 +56,14 @@ FROM (
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_23.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_23.metric_time__alien_day) OVER (
           PARTITION BY
             subq_26.user
             , subq_26.metric_time__day
             , subq_26.mf_internal_uuid
           ORDER BY subq_23.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_23.metric_time__day) OVER (
           PARTITION BY
             subq_26.user
@@ -85,9 +85,9 @@ FROM (
       FROM (
         -- Read From CTE For node_id=sma_28019
         -- Join to Custom Granularity Dataset
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          subq_21.martian_day AS metric_time__martian_day
+          subq_21.alien_day AS metric_time__alien_day
           , sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
@@ -120,10 +120,10 @@ FROM (
         )
     ) subq_27
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_30
   ON
-    subq_20.metric_time__martian_day = subq_30.metric_time__martian_day
+    subq_20.metric_time__alien_day = subq_30.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_20.metric_time__martian_day, subq_30.metric_time__martian_day)
+    COALESCE(subq_20.metric_time__alien_day, subq_30.metric_time__alien_day)
 ) subq_31
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql
index d992a8ebd7..dd47ac427d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_17.metric_time__martian_day
+  subq_17.metric_time__alien_day
   , CAST(subq_17.buys AS DOUBLE) / CAST(NULLIF(subq_17.visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_5.visits) AS visits
     , MAX(subq_16.buys) AS buys
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.visits) AS visits
     FROM (
-      -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+      -- Pass Only Elements: ['visits', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.visits
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -112,7 +112,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -153,26 +153,26 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   FULL OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
       , SUM(subq_15.buys) AS buys
     FROM (
-      -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+      -- Pass Only Elements: ['buys', 'metric_time__alien_day']
       SELECT
-        subq_14.metric_time__martian_day
+        subq_14.metric_time__alien_day
         , subq_14.buys
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -188,14 +188,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -215,16 +215,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -311,7 +311,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -352,7 +352,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
@@ -526,10 +526,10 @@ FROM (
       ) subq_14
     ) subq_15
     GROUP BY
-      subq_15.metric_time__martian_day
+      subq_15.metric_time__alien_day
   ) subq_16
   ON
-    subq_5.metric_time__martian_day = subq_16.metric_time__martian_day
+    subq_5.metric_time__alien_day = subq_16.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_5.metric_time__martian_day, subq_16.metric_time__martian_day)
+    COALESCE(subq_5.metric_time__alien_day, subq_16.metric_time__alien_day)
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
index 844886e591..19b36ffa86 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -14,43 +14,43 @@ WITH sma_28019_cte AS (
 )
 
 SELECT
-  metric_time__martian_day AS metric_time__martian_day
+  metric_time__alien_day AS metric_time__alien_day
   , CAST(buys AS DOUBLE) / CAST(NULLIF(visits, 0) AS DOUBLE) AS visit_buy_conversion_rate_7days
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day) AS metric_time__martian_day
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day) AS metric_time__alien_day
     , MAX(subq_23.visits) AS visits
     , MAX(subq_34.buys) AS buys
   FROM (
     -- Constrain Output with WHERE
-    -- Pass Only Elements: ['visits', 'metric_time__martian_day']
+    -- Pass Only Elements: ['visits', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(visits) AS visits
     FROM (
       -- Read From CTE For node_id=sma_28019
       -- Join to Custom Granularity Dataset
       SELECT
         sma_28019_cte.visits AS visits
-        , subq_19.martian_day AS metric_time__martian_day
+        , subq_19.alien_day AS metric_time__alien_day
       FROM sma_28019_cte sma_28019_cte
       LEFT OUTER JOIN
         ***************************.mf_time_spine subq_19
       ON
         sma_28019_cte.metric_time__day = subq_19.ds
     ) subq_20
-    WHERE metric_time__martian_day = '2020-01-01'
+    WHERE metric_time__alien_day = '2020-01-01'
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_23
   FULL OUTER JOIN (
     -- Find conversions for user within the range of 7 day
-    -- Pass Only Elements: ['buys', 'metric_time__martian_day']
+    -- Pass Only Elements: ['buys', 'metric_time__alien_day']
     -- Aggregate Measures
     SELECT
-      metric_time__martian_day
+      metric_time__alien_day
       , SUM(buys) AS buys
     FROM (
       -- Dedupe the fanout with mf_internal_uuid in the conversion data set
@@ -63,14 +63,14 @@ FROM (
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS visits
-        , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+        , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
           PARTITION BY
             subq_30.user
             , subq_30.metric_time__day
             , subq_30.mf_internal_uuid
           ORDER BY subq_27.metric_time__day DESC
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-        ) AS metric_time__martian_day
+        ) AS metric_time__alien_day
         , FIRST_VALUE(subq_27.metric_time__day) OVER (
           PARTITION BY
             subq_30.user
@@ -91,9 +91,9 @@ FROM (
         , subq_30.buys AS buys
       FROM (
         -- Constrain Output with WHERE
-        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+        -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
         SELECT
-          metric_time__martian_day
+          metric_time__alien_day
           , metric_time__day
           , subq_25.user
           , visits
@@ -104,14 +104,14 @@ FROM (
             sma_28019_cte.metric_time__day AS metric_time__day
             , sma_28019_cte.user AS user
             , sma_28019_cte.visits AS visits
-            , subq_24.martian_day AS metric_time__martian_day
+            , subq_24.alien_day AS metric_time__alien_day
           FROM sma_28019_cte sma_28019_cte
           LEFT OUTER JOIN
             ***************************.mf_time_spine subq_24
           ON
             sma_28019_cte.metric_time__day = subq_24.ds
         ) subq_25
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_27
       INNER JOIN (
         -- Read Elements From Semantic Model 'buys_source'
@@ -136,10 +136,10 @@ FROM (
         )
     ) subq_31
     GROUP BY
-      metric_time__martian_day
+      metric_time__alien_day
   ) subq_34
   ON
-    subq_23.metric_time__martian_day = subq_34.metric_time__martian_day
+    subq_23.metric_time__alien_day = subq_34.metric_time__alien_day
   GROUP BY
-    COALESCE(subq_23.metric_time__martian_day, subq_34.metric_time__martian_day)
+    COALESCE(subq_23.metric_time__alien_day, subq_34.metric_time__alien_day)
 ) subq_35
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 2b1e6f589c..7fdb1eea02 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -21,7 +21,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -108,7 +108,7 @@ FROM (
             , subq_0.visit__referrer_id AS visit__referrer_id
             , subq_0.visits AS visits
             , subq_0.visitors AS visitors
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'visits_source'
             SELECT
@@ -149,7 +149,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
   ) subq_5
@@ -164,7 +164,7 @@ FROM (
       FROM (
         -- Find conversions for user within the range of 7 day
         SELECT
-          subq_13.metric_time__martian_day
+          subq_13.metric_time__alien_day
           , subq_13.metric_time__day
           , subq_13.user
           , subq_13.buys
@@ -180,14 +180,14 @@ FROM (
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
             ) AS visits
-            , FIRST_VALUE(subq_9.metric_time__martian_day) OVER (
+            , FIRST_VALUE(subq_9.metric_time__alien_day) OVER (
               PARTITION BY
                 subq_12.user
                 , subq_12.metric_time__day
                 , subq_12.mf_internal_uuid
               ORDER BY subq_9.metric_time__day DESC
               ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-            ) AS metric_time__martian_day
+            ) AS metric_time__alien_day
             , FIRST_VALUE(subq_9.metric_time__day) OVER (
               PARTITION BY
                 subq_12.user
@@ -207,16 +207,16 @@ FROM (
             , subq_12.mf_internal_uuid AS mf_internal_uuid
             , subq_12.buys AS buys
           FROM (
-            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+            -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
             SELECT
-              subq_8.metric_time__martian_day
+              subq_8.metric_time__alien_day
               , subq_8.metric_time__day
               , subq_8.user
               , subq_8.visits
             FROM (
               -- Constrain Output with WHERE
               SELECT
-                subq_7.metric_time__martian_day
+                subq_7.metric_time__alien_day
                 , subq_7.ds__day
                 , subq_7.ds__week
                 , subq_7.ds__month
@@ -303,7 +303,7 @@ FROM (
                   , subq_0.visit__referrer_id AS visit__referrer_id
                   , subq_0.visits AS visits
                   , subq_0.visitors AS visitors
-                  , subq_6.martian_day AS metric_time__martian_day
+                  , subq_6.alien_day AS metric_time__alien_day
                 FROM (
                   -- Read Elements From Semantic Model 'visits_source'
                   SELECT
@@ -344,7 +344,7 @@ FROM (
                 ON
                   subq_0.ds__day = subq_6.ds
               ) subq_7
-              WHERE metric_time__martian_day = '2020-01-01'
+              WHERE metric_time__alien_day = '2020-01-01'
             ) subq_8
           ) subq_9
           INNER JOIN (
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index 18bfef05ed..5f1d2b920d 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_conversion_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -27,14 +27,14 @@ FROM (
     -- Join to Custom Granularity Dataset
     SELECT
       sma_28019_cte.visits AS visits
-      , subq_19.martian_day AS metric_time__martian_day
+      , subq_19.alien_day AS metric_time__alien_day
     FROM sma_28019_cte sma_28019_cte
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_19
     ON
       sma_28019_cte.metric_time__day = subq_19.ds
   ) subq_20
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_23
 CROSS JOIN (
   -- Find conversions for user within the range of 7 day
@@ -53,14 +53,14 @@ CROSS JOIN (
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS visits
-      , FIRST_VALUE(subq_27.metric_time__martian_day) OVER (
+      , FIRST_VALUE(subq_27.metric_time__alien_day) OVER (
         PARTITION BY
           subq_30.user
           , subq_30.metric_time__day
           , subq_30.mf_internal_uuid
         ORDER BY subq_27.metric_time__day DESC
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
-      ) AS metric_time__martian_day
+      ) AS metric_time__alien_day
       , FIRST_VALUE(subq_27.metric_time__day) OVER (
         PARTITION BY
           subq_30.user
@@ -81,9 +81,9 @@ CROSS JOIN (
       , subq_30.buys AS buys
     FROM (
       -- Constrain Output with WHERE
-      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__martian_day', 'user']
+      -- Pass Only Elements: ['visits', 'metric_time__day', 'metric_time__alien_day', 'user']
       SELECT
-        metric_time__martian_day
+        metric_time__alien_day
         , metric_time__day
         , subq_25.user
         , visits
@@ -94,14 +94,14 @@ CROSS JOIN (
           sma_28019_cte.metric_time__day AS metric_time__day
           , sma_28019_cte.user AS user
           , sma_28019_cte.visits AS visits
-          , subq_24.martian_day AS metric_time__martian_day
+          , subq_24.alien_day AS metric_time__alien_day
         FROM sma_28019_cte sma_28019_cte
         LEFT OUTER JOIN
           ***************************.mf_time_spine subq_24
         ON
           sma_28019_cte.metric_time__day = subq_24.ds
       ) subq_25
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_27
     INNER JOIN (
       -- Read Elements From Semantic Model 'buys_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql
index e6b309ff91..d5d59ab809 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0.sql
@@ -4,29 +4,29 @@ sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
 FROM (
   -- Window Function for Metric Re-aggregation
   SELECT
-    subq_8.metric_time__martian_day
-    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__martian_day) AS trailing_2_months_revenue
+    subq_8.metric_time__alien_day
+    , AVG(subq_8.trailing_2_months_revenue) OVER (PARTITION BY subq_8.metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__day
       , subq_7.txn_revenue AS trailing_2_months_revenue
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
         , SUM(subq_6.txn_revenue) AS txn_revenue
       FROM (
-        -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+        -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
         SELECT
-          subq_5.metric_time__martian_day
+          subq_5.metric_time__alien_day
           , subq_5.metric_time__day
           , subq_5.txn_revenue
         FROM (
@@ -69,7 +69,7 @@ FROM (
             , subq_1.user AS user
             , subq_1.revenue_instance__user AS revenue_instance__user
             , subq_1.txn_revenue AS txn_revenue
-            , subq_4.martian_day AS metric_time__martian_day
+            , subq_4.alien_day AS metric_time__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -159,11 +159,11 @@ FROM (
         ) subq_5
       ) subq_6
       GROUP BY
-        subq_6.metric_time__martian_day
+        subq_6.metric_time__alien_day
         , subq_6.metric_time__day
     ) subq_7
   ) subq_8
 ) subq_9
 GROUP BY
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
index 814e7974de..a132c65809 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_cumulative_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,21 +4,21 @@ sql_engine: Trino
 ---
 -- Re-aggregate Metric via Group By
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
 FROM (
   -- Compute Metrics via Expressions
   -- Window Function for Metric Re-aggregation
   SELECT
-    metric_time__martian_day
-    , AVG(txn_revenue) OVER (PARTITION BY metric_time__martian_day) AS trailing_2_months_revenue
+    metric_time__alien_day
+    , AVG(txn_revenue) OVER (PARTITION BY metric_time__alien_day) AS trailing_2_months_revenue
   FROM (
     -- Join Self Over Time Range
     -- Join to Custom Granularity Dataset
-    -- Pass Only Elements: ['txn_revenue', 'metric_time__martian_day', 'metric_time__day']
+    -- Pass Only Elements: ['txn_revenue', 'metric_time__alien_day', 'metric_time__day']
     -- Aggregate Measures
     SELECT
-      subq_14.martian_day AS metric_time__martian_day
+      subq_14.alien_day AS metric_time__alien_day
       , subq_13.ds AS metric_time__day
       , SUM(revenue_src_28000.revenue) AS txn_revenue
     FROM ***************************.mf_time_spine subq_13
@@ -35,10 +35,10 @@ FROM (
     ON
       subq_13.ds = subq_14.ds
     GROUP BY
-      subq_14.martian_day
+      subq_14.alien_day
       , subq_13.ds
   ) subq_17
 ) subq_19
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
   , trailing_2_months_revenue
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0.sql
index 4d7d7cf7ff..f7e8c829cf 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: Trino
 -- Compute Metrics via Expressions
 SELECT
   subq_15.metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -138,19 +138,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -167,7 +167,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -183,24 +183,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0_optimized.sql
index 27dcae06b2..983f89ab73 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: Trino
 -- Compute Metrics via Expressions
 SELECT
   metric_time__day
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['bookings', 'metric_time__day']
@@ -21,19 +21,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -50,24 +50,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_23
     ) subq_24
     ON
-      cte_6.ds__martian_day = subq_24.ds__martian_day
+      cte_6.ds__alien_day = subq_24.ds__alien_day
   ) subq_25
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
index c3a5cc93a6..14f5f46af9 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day
+  subq_16.metric_time__alien_day
   , subq_16.booking__ds__month
   , subq_16.metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.metric_time__martian_day
+    subq_15.metric_time__alien_day
     , subq_15.booking__ds__month
     , subq_15.metric_time__extract_year
     , subq_15.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
       , SUM(subq_14.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
       SELECT
-        subq_13.metric_time__martian_day
+        subq_13.metric_time__alien_day
         , subq_13.booking__ds__month
         , subq_13.metric_time__extract_year
         , subq_13.bookings
@@ -131,7 +131,7 @@ FROM (
           , subq_5.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_5.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_5.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_12.martian_day AS metric_time__martian_day
+          , subq_12.alien_day AS metric_time__alien_day
         FROM (
           -- Pass Only Elements: ['ds__day', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__day']
           SELECT
@@ -152,19 +152,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_6.ds__day
-                  , subq_6.ds__martian_day
+                  , subq_6.ds__alien_day
                   , FIRST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__first_value
                   , LAST_VALUE(subq_6.ds__day) OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ds__day__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_6.ds__martian_day
+                    PARTITION BY subq_6.ds__alien_day
                     ORDER BY subq_6.ds__day
                   ) AS ds__day__row_number
                 FROM (
@@ -181,7 +181,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_6
               )
@@ -197,24 +197,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_7.ds__martian_day
-                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__first_value__lead
-                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__martian_day) AS ds__day__last_value__lead
+                  subq_7.ds__alien_day
+                  , LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
+                  , LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ds__day__first_value
                     , cte_2.ds__day__last_value
                 ) subq_7
               ) subq_8
               ON
-                cte_2.ds__martian_day = subq_8.ds__martian_day
+                cte_2.ds__alien_day = subq_8.ds__alien_day
             ) subq_9
           ) subq_10
         ) subq_11
@@ -422,7 +422,7 @@ FROM (
       ) subq_13
     ) subq_14
     GROUP BY
-      subq_14.metric_time__martian_day
+      subq_14.metric_time__alien_day
       , subq_14.booking__ds__month
       , subq_14.metric_time__extract_year
   ) subq_15
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
index 1f1489bd93..2af9092284 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql
@@ -4,18 +4,18 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , booking__ds__month
   , metric_time__extract_year
-  , bookings AS bookings_offset_one_martian_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__month', 'metric_time__extract_year', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_29.martian_day AS metric_time__martian_day
+    subq_29.alien_day AS metric_time__alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead) AS booking__ds__month
     , EXTRACT(year FROM subq_26.ds__day__lead) AS metric_time__extract_year
     , SUM(subq_22.bookings) AS bookings
@@ -26,19 +26,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
         , FIRST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__first_value
         , LAST_VALUE(ds) OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ds__day__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY martian_day
+          PARTITION BY alien_day
           ORDER BY ds
         ) AS ds__day__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -55,24 +55,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+        ds__alien_day
+        , LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+        , LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ds__day__first_value
           , ds__day__last_value
       ) subq_24
     ) subq_25
     ON
-      cte_6.ds__martian_day = subq_25.ds__martian_day
+      cte_6.ds__alien_day = subq_25.ds__alien_day
   ) subq_26
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -89,7 +89,7 @@ FROM (
   ON
     subq_26.ds__day__lead = subq_29.ds
   GROUP BY
-    subq_29.martian_day
+    subq_29.alien_day
     , DATE_TRUNC('month', subq_26.ds__day__lead)
     , EXTRACT(year FROM subq_26.ds__day__lead)
 ) subq_33
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_multiple_time_spines__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_multiple_time_spines__plan0.sql
index 9e6aa114da..b35f2f159e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_multiple_time_spines__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_multiple_time_spines__plan0.sql
@@ -5,7 +5,7 @@ sql_engine: Trino
 -- Compute Metrics via Expressions
 SELECT
   subq_17.metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
@@ -230,19 +230,19 @@ FROM (
                 -- Get Custom Granularity Bounds
                 SELECT
                   subq_8.ts__hour AS ts__hour
-                  , subq_7.ds__martian_day AS ds__martian_day
+                  , subq_7.ds__alien_day AS ds__alien_day
                   , FIRST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__first_value
                   , LAST_VALUE(subq_8.ts__hour) OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                     ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
                   ) AS ts__hour__last_value
                   , ROW_NUMBER() OVER (
-                    PARTITION BY subq_7.ds__martian_day
+                    PARTITION BY subq_7.ds__alien_day
                     ORDER BY subq_8.ts__hour
                   ) AS ts__hour__row_number
                 FROM (
@@ -259,7 +259,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
                 INNER JOIN (
@@ -294,24 +294,24 @@ FROM (
               INNER JOIN (
                 -- Offset Custom Granularity Bounds
                 SELECT
-                  subq_9.ds__martian_day
-                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__first_value__lead
-                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__martian_day) AS ts__hour__last_value__lead
+                  subq_9.ds__alien_day
+                  , LEAD(subq_9.ts__hour__first_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__first_value__lead
+                  , LEAD(subq_9.ts__hour__last_value, 1) OVER (ORDER BY subq_9.ds__alien_day) AS ts__hour__last_value__lead
                 FROM (
                   -- Get Unique Rows for Custom Granularity Bounds
                   SELECT
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                   FROM cte_2 cte_2
                   GROUP BY
-                    cte_2.ds__martian_day
+                    cte_2.ds__alien_day
                     , cte_2.ts__hour__first_value
                     , cte_2.ts__hour__last_value
                 ) subq_9
               ) subq_10
               ON
-                cte_2.ds__martian_day = subq_10.ds__martian_day
+                cte_2.ds__alien_day = subq_10.ds__alien_day
             ) subq_11
           ) subq_12
         ) subq_13
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
index 3ed934e808..6b85b44f63 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_multiple_time_spines__plan0_optimized.sql
@@ -5,7 +5,7 @@ sql_engine: Trino
 -- Compute Metrics via Expressions
 SELECT
   metric_time__hour
-  , archived_users AS archived_users_offset_1_martian_day
+  , archived_users AS archived_users_offset_1_alien_day
 FROM (
   -- Join to Time Spine Dataset
   -- Pass Only Elements: ['archived_users', 'metric_time__hour']
@@ -20,19 +20,19 @@ FROM (
       -- Get Custom Granularity Bounds
       SELECT
         time_spine_src_28005.ts AS ts__hour
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
         , FIRST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__first_value
         , LAST_VALUE(time_spine_src_28005.ts) OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
           ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
         ) AS ts__hour__last_value
         , ROW_NUMBER() OVER (
-          PARTITION BY time_spine_src_28006.martian_day
+          PARTITION BY time_spine_src_28006.alien_day
           ORDER BY time_spine_src_28005.ts
         ) AS ts__hour__row_number
       FROM ***************************.mf_time_spine time_spine_src_28006
@@ -53,24 +53,24 @@ FROM (
     INNER JOIN (
       -- Offset Custom Granularity Bounds
       SELECT
-        ds__martian_day
-        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__first_value__lead
-        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__martian_day) AS ts__hour__last_value__lead
+        ds__alien_day
+        , LEAD(ts__hour__first_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__first_value__lead
+        , LEAD(ts__hour__last_value, 1) OVER (ORDER BY ds__alien_day) AS ts__hour__last_value__lead
       FROM (
         -- Get Unique Rows for Custom Granularity Bounds
         SELECT
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
         FROM cte_6 cte_6
         GROUP BY
-          ds__martian_day
+          ds__alien_day
           , ts__hour__first_value
           , ts__hour__last_value
       ) subq_27
     ) subq_28
     ON
-      cte_6.ds__martian_day = subq_28.ds__martian_day
+      cte_6.ds__alien_day = subq_28.ds__alien_day
   ) subq_29
   INNER JOIN (
     -- Read Elements From Semantic Model 'users_ds_source'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_only_window_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_only_window_grain__plan0.sql
index 39c0fdb3e4..2fd3fa3acf 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_only_window_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_only_window_grain__plan0.sql
@@ -4,33 +4,33 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
-  , subq_9.metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  subq_9.booking__ds__alien_day
+  , subq_9.metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
-    , subq_8.metric_time__martian_day
+    subq_8.booking__ds__alien_day
+    , subq_8.metric_time__alien_day
     , subq_8.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
-        , subq_6.metric_time__martian_day
+        subq_6.booking__ds__alien_day
+        , subq_6.metric_time__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
         SELECT
           subq_5.metric_time__day AS metric_time__day
-          , subq_5.booking__ds__martian_day AS booking__ds__martian_day
-          , subq_5.metric_time__martian_day AS metric_time__martian_day
+          , subq_5.booking__ds__alien_day AS booking__ds__alien_day
+          , subq_5.metric_time__alien_day AS metric_time__alien_day
           , subq_2.ds__day AS ds__day
           , subq_2.ds__week AS ds__week
           , subq_2.ds__month AS ds__month
@@ -129,12 +129,12 @@ FROM (
           , subq_2.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_2.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
         FROM (
-          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__martian_day', 'metric_time__martian_day']
+          -- Pass Only Elements: ['ds__day', 'metric_time__day', 'booking__ds__alien_day', 'metric_time__alien_day']
           SELECT
             subq_4.ds__day
             , subq_4.metric_time__day
-            , subq_4.booking__ds__martian_day
-            , subq_4.metric_time__martian_day
+            , subq_4.booking__ds__alien_day
+            , subq_4.metric_time__alien_day
           FROM (
             -- Join Offset Custom Granularity to Base Granularity
             WITH cte_2 AS (
@@ -151,27 +151,27 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             )
 
             SELECT
               cte_2.ds__day AS ds__day
-              , subq_3.ds__martian_day__lead AS metric_time__day
-              , subq_3.ds__martian_day__lead AS booking__ds__martian_day
-              , subq_3.ds__martian_day__lead AS metric_time__martian_day
+              , subq_3.ds__alien_day__lead AS metric_time__day
+              , subq_3.ds__alien_day__lead AS booking__ds__alien_day
+              , subq_3.ds__alien_day__lead AS metric_time__alien_day
             FROM cte_2 cte_2
             INNER JOIN (
               -- Offset Custom Granularity
               SELECT
-                cte_2.ds__martian_day
-                , LEAD(cte_2.ds__martian_day, 1) OVER (ORDER BY cte_2.ds__martian_day) AS ds__martian_day__lead
+                cte_2.ds__alien_day
+                , LEAD(cte_2.ds__alien_day, 1) OVER (ORDER BY cte_2.ds__alien_day) AS ds__alien_day__lead
               FROM cte_2 cte_2
               GROUP BY
-                cte_2.ds__martian_day
+                cte_2.ds__alien_day
             ) subq_3
             ON
-              cte_2.ds__martian_day = subq_3.ds__martian_day
+              cte_2.ds__alien_day = subq_3.ds__alien_day
           ) subq_4
         ) subq_5
         INNER JOIN (
@@ -374,7 +374,7 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
-      , subq_7.metric_time__martian_day
+      subq_7.booking__ds__alien_day
+      , subq_7.metric_time__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
index 54f7b688dd..2933db0755 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_custom_offset_window_with_only_window_grain__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
-  , metric_time__martian_day
-  , bookings AS bookings_offset_one_martian_day
+  booking__ds__alien_day
+  , metric_time__alien_day
+  , bookings AS bookings_offset_one_alien_day
 FROM (
   -- Join to Time Spine Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_14.booking__ds__martian_day AS booking__ds__martian_day
-    , subq_14.metric_time__martian_day AS metric_time__martian_day
+    subq_14.booking__ds__alien_day AS booking__ds__alien_day
+    , subq_14.metric_time__alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Join Offset Custom Granularity to Base Granularity
@@ -22,26 +22,26 @@ FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
         ds AS ds__day
-        , martian_day AS ds__martian_day
+        , alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     )
 
     SELECT
       cte_6.ds__day AS ds__day
-      , subq_13.ds__martian_day__lead AS booking__ds__martian_day
-      , subq_13.ds__martian_day__lead AS metric_time__martian_day
+      , subq_13.ds__alien_day__lead AS booking__ds__alien_day
+      , subq_13.ds__alien_day__lead AS metric_time__alien_day
     FROM cte_6 cte_6
     INNER JOIN (
       -- Offset Custom Granularity
       SELECT
-        ds__martian_day
-        , LEAD(ds__martian_day, 1) OVER (ORDER BY ds__martian_day) AS ds__martian_day__lead
+        ds__alien_day
+        , LEAD(ds__alien_day, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__lead
       FROM cte_6 cte_6
       GROUP BY
-        ds__martian_day
+        ds__alien_day
     ) subq_13
     ON
-      cte_6.ds__martian_day = subq_13.ds__martian_day
+      cte_6.ds__alien_day = subq_13.ds__alien_day
   ) subq_14
   INNER JOIN (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -54,6 +54,6 @@ FROM (
   ON
     subq_14.ds__day = subq_12.metric_time__day
   GROUP BY
-    subq_14.booking__ds__martian_day
-    , subq_14.metric_time__martian_day
+    subq_14.booking__ds__alien_day
+    , subq_14.metric_time__alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql
index c8c28e4e94..aba87d84b6 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0.sql
@@ -4,28 +4,28 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_11.booking__ds__martian_day
+  subq_11.booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Combine Aggregated Outputs
   SELECT
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day) AS booking__ds__martian_day
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day) AS booking__ds__alien_day
     , MAX(subq_5.booking_value) AS booking_value
     , MAX(subq_10.bookers) AS bookers
   FROM (
     -- Compute Metrics via Expressions
     SELECT
-      subq_4.booking__ds__martian_day
+      subq_4.booking__ds__alien_day
       , subq_4.booking_value
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
         , SUM(subq_3.booking_value) AS booking_value
       FROM (
-        -- Pass Only Elements: ['booking_value', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['booking_value', 'booking__ds__alien_day']
         SELECT
-          subq_2.booking__ds__martian_day
+          subq_2.booking__ds__alien_day
           , subq_2.booking_value
         FROM (
           -- Metric Time Dimension 'ds'
@@ -129,7 +129,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS booking__ds__martian_day
+            , subq_1.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -230,23 +230,23 @@ FROM (
         ) subq_2
       ) subq_3
       GROUP BY
-        subq_3.booking__ds__martian_day
+        subq_3.booking__ds__alien_day
     ) subq_4
   ) subq_5
   FULL OUTER JOIN (
     -- Compute Metrics via Expressions
     SELECT
-      subq_9.booking__ds__martian_day
+      subq_9.booking__ds__alien_day
       , subq_9.bookers
     FROM (
       -- Aggregate Measures
       SELECT
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
         , COUNT(DISTINCT subq_8.bookers) AS bookers
       FROM (
-        -- Pass Only Elements: ['bookers', 'booking__ds__martian_day']
+        -- Pass Only Elements: ['bookers', 'booking__ds__alien_day']
         SELECT
-          subq_7.booking__ds__martian_day
+          subq_7.booking__ds__alien_day
           , subq_7.bookers
         FROM (
           -- Metric Time Dimension 'ds'
@@ -350,7 +350,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_6.martian_day AS booking__ds__martian_day
+            , subq_6.alien_day AS booking__ds__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -451,11 +451,11 @@ FROM (
         ) subq_7
       ) subq_8
       GROUP BY
-        subq_8.booking__ds__martian_day
+        subq_8.booking__ds__alien_day
     ) subq_9
   ) subq_10
   ON
-    subq_5.booking__ds__martian_day = subq_10.booking__ds__martian_day
+    subq_5.booking__ds__alien_day = subq_10.booking__ds__alien_day
   GROUP BY
-    COALESCE(subq_5.booking__ds__martian_day, subq_10.booking__ds__martian_day)
+    COALESCE(subq_5.booking__ds__alien_day, subq_10.booking__ds__alien_day)
 ) subq_11
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql
index 7d8a785918..3090a6c122 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_derived_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , booking_value * 0.05 / bookers AS booking_fees_per_booker
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS booking__ds__martian_day
+    subq_13.alien_day AS booking__ds__alien_day
     , SUM(bookings_source_src_28000.booking_value) AS booking_value
     , COUNT(DISTINCT bookings_source_src_28000.guest_id) AS bookers
   FROM ***************************.fct_bookings bookings_source_src_28000
@@ -22,5 +22,5 @@ FROM (
   ON
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
index ce94beb043..3d3e6484da 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.metric_time__martian_day
+  subq_8.metric_time__alien_day
   , subq_8.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_7.metric_time__martian_day AS metric_time__martian_day
+    subq_7.metric_time__alien_day AS metric_time__alien_day
     , subq_4.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
     FROM (
       -- Change Column Aliases
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day AS metric_time__martian_day
+        , subq_5.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,22 +44,22 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
     GROUP BY
-      subq_6.metric_time__martian_day
+      subq_6.metric_time__alien_day
   ) subq_7
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -163,7 +163,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -264,8 +264,8 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
   ON
-    subq_7.metric_time__martian_day = subq_4.metric_time__martian_day
+    subq_7.metric_time__alien_day = subq_4.metric_time__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
index d9454b3ef0..000dc615b5 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_time_spine_metric_grouped_by_custom_grain__plan0_optimized.sql
@@ -5,25 +5,25 @@ sql_engine: Trino
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_16.metric_time__martian_day AS metric_time__martian_day
+  subq_16.metric_time__alien_day AS metric_time__alien_day
   , subq_13.bookings AS bookings_join_to_time_spine
 FROM (
   -- Read From Time Spine 'mf_time_spine'
   -- Change Column Aliases
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    martian_day AS metric_time__martian_day
+    alien_day AS metric_time__alien_day
   FROM ***************************.mf_time_spine time_spine_src_28006
   GROUP BY
-    martian_day
+    alien_day
 ) subq_16
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    subq_10.martian_day AS metric_time__martian_day
+    subq_10.alien_day AS metric_time__alien_day
     , SUM(subq_9.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ LEFT OUTER JOIN (
   ON
     subq_9.ds__day = subq_10.ds
   GROUP BY
-    subq_10.martian_day
+    subq_10.alien_day
 ) subq_13
 ON
-  subq_16.metric_time__martian_day = subq_13.metric_time__martian_day
+  subq_16.metric_time__alien_day = subq_13.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
index 062e337f3d..53d023b3fc 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_10.metric_time__martian_day
+  subq_10.metric_time__alien_day
   , subq_10.bookings AS bookings_join_to_time_spine
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_9.metric_time__martian_day AS metric_time__martian_day
+    subq_9.metric_time__alien_day AS metric_time__alien_day
     , subq_5.bookings AS bookings
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day',]
+    -- Pass Only Elements: ['metric_time__alien_day',]
     SELECT
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
     FROM (
       -- Constrain Output with WHERE
       SELECT
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,29 +59,29 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
     GROUP BY
-      subq_8.metric_time__martian_day
+      subq_8.metric_time__alien_day
   ) subq_9
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
       , SUM(subq_4.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_3.metric_time__martian_day
+        subq_3.metric_time__alien_day
         , subq_3.bookings
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -282,7 +282,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -381,12 +381,12 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
-      subq_4.metric_time__martian_day
+      subq_4.metric_time__alien_day
   ) subq_5
   ON
-    subq_9.metric_time__martian_day = subq_5.metric_time__martian_day
+    subq_9.metric_time__alien_day = subq_5.metric_time__alien_day
 ) subq_10
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
index 7f99b60136..a3f9b85643 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -5,37 +5,37 @@ sql_engine: Trino
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_20.metric_time__martian_day AS metric_time__martian_day
+  subq_20.metric_time__alien_day AS metric_time__alien_day
   , subq_16.bookings AS bookings_join_to_time_spine
 FROM (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['metric_time__martian_day',]
+  -- Pass Only Elements: ['metric_time__alien_day',]
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     -- Change Column Aliases
     SELECT
-      martian_day AS metric_time__martian_day
+      alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   SELECT
-    metric_time__martian_day
+    metric_time__alien_day
     , SUM(bookings) AS bookings
   FROM (
     -- Metric Time Dimension 'ds'
     -- Join to Custom Granularity Dataset
     SELECT
       subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,9 +48,9 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
-    metric_time__martian_day
+    metric_time__alien_day
 ) subq_16
 ON
-  subq_20.metric_time__martian_day = subq_16.metric_time__martian_day
+  subq_20.metric_time__alien_day = subq_16.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index f0d59bb8f1..6cf624610b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.metric_time__martian_day
+        , subq_7.metric_time__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day AS metric_time__martian_day
+          , subq_6.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,11 +59,11 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_8
   ) subq_9
   LEFT OUTER JOIN (
@@ -79,7 +79,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_2.metric_time__martian_day
+          subq_2.metric_time__alien_day
           , subq_2.ds__day
           , subq_2.ds__week
           , subq_2.ds__month
@@ -280,7 +280,7 @@ FROM (
             , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_1.martian_day AS metric_time__martian_day
+            , subq_1.alien_day AS metric_time__alien_day
           FROM (
             -- Read Elements From Semantic Model 'bookings_source'
             SELECT
@@ -379,7 +379,7 @@ FROM (
           ON
             subq_0.ds__day = subq_1.ds
         ) subq_2
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_3
     ) subq_4
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index c4eb2e31ce..f866f17f6c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_join_to_timespine_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -17,10 +17,10 @@ FROM (
     -- Change Column Aliases
     SELECT
       ds AS metric_time__day
-      , martian_day AS metric_time__martian_day
+      , alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_18
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
 ) subq_20
 LEFT OUTER JOIN (
   -- Constrain Output with WHERE
@@ -35,7 +35,7 @@ LEFT OUTER JOIN (
     SELECT
       subq_11.ds__day AS metric_time__day
       , subq_11.bookings AS bookings
-      , subq_12.martian_day AS metric_time__martian_day
+      , subq_12.alien_day AS metric_time__alien_day
     FROM (
       -- Read Elements From Semantic Model 'bookings_source'
       SELECT
@@ -48,7 +48,7 @@ LEFT OUTER JOIN (
     ON
       subq_11.ds__day = subq_12.ds
   ) subq_13
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_16
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 51b217d1d8..e4d66d25d4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.metric_time__martian_day
+  subq_4.metric_time__alien_day
   , subq_4.listing__ds__month
   , subq_4.listings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
     , SUM(subq_3.listings) AS listings
   FROM (
-    -- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+    -- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
     SELECT
-      subq_2.metric_time__martian_day
+      subq_2.metric_time__alien_day
       , subq_2.listing__ds__month
       , subq_2.listings
     FROM (
@@ -90,7 +90,7 @@ FROM (
         , subq_0.listings AS listings
         , subq_0.largest_listing AS largest_listing
         , subq_0.smallest_listing AS smallest_listing
-        , subq_1.martian_day AS metric_time__martian_day
+        , subq_1.alien_day AS metric_time__alien_day
       FROM (
         -- Read Elements From Semantic Model 'listings_latest'
         SELECT
@@ -159,6 +159,6 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.metric_time__martian_day
+    subq_3.metric_time__alien_day
     , subq_3.listing__ds__month
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 04ee9b07f6..0ebd9cd12b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Trino
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
+-- Pass Only Elements: ['listings', 'metric_time__alien_day', 'listing__ds__month']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS metric_time__martian_day
+  subq_6.alien_day AS metric_time__alien_day
   , subq_5.listing__ds__month AS listing__ds__month
   , SUM(subq_5.listings) AS listings
 FROM (
@@ -24,5 +24,5 @@ LEFT OUTER JOIN
 ON
   subq_5.ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
   , subq_5.listing__ds__month
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql
index a4f017f2ce..0bd774fc49 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0.sql
@@ -4,23 +4,23 @@ sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_5.bookings) AS bookings
   , MAX(subq_11.listings) AS listings
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , subq_4.bookings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , SUM(subq_3.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.bookings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -124,7 +124,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -225,23 +225,23 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
   ) subq_4
 ) subq_5
 FULL OUTER JOIN (
   -- Compute Metrics via Expressions
   SELECT
-    subq_10.metric_time__martian_day
+    subq_10.metric_time__alien_day
     , subq_10.listings
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
       , SUM(subq_9.listings) AS listings
     FROM (
-      -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+      -- Pass Only Elements: ['listings', 'metric_time__alien_day']
       SELECT
-        subq_8.metric_time__martian_day
+        subq_8.metric_time__alien_day
         , subq_8.listings
       FROM (
         -- Metric Time Dimension 'ds'
@@ -314,7 +314,7 @@ FULL OUTER JOIN (
           , subq_6.listings AS listings
           , subq_6.largest_listing AS largest_listing
           , subq_6.smallest_listing AS smallest_listing
-          , subq_7.martian_day AS metric_time__martian_day
+          , subq_7.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'listings_latest'
           SELECT
@@ -383,10 +383,10 @@ FULL OUTER JOIN (
       ) subq_8
     ) subq_9
     GROUP BY
-      subq_9.metric_time__martian_day
+      subq_9.metric_time__alien_day
   ) subq_10
 ) subq_11
 ON
-  subq_5.metric_time__martian_day = subq_11.metric_time__martian_day
+  subq_5.metric_time__alien_day = subq_11.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_5.metric_time__martian_day, subq_11.metric_time__martian_day)
+  COALESCE(subq_5.metric_time__alien_day, subq_11.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
index 8f00e938d9..47f8f9a5b0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_metrics_with_custom_granularity__plan0_optimized.sql
@@ -4,17 +4,17 @@ sql_engine: Trino
 ---
 -- Combine Aggregated Outputs
 SELECT
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day) AS metric_time__martian_day
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day) AS metric_time__alien_day
   , MAX(subq_17.bookings) AS bookings
   , MAX(subq_23.listings) AS listings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_13.martian_day AS metric_time__martian_day
+    subq_13.alien_day AS metric_time__alien_day
     , SUM(subq_12.bookings) AS bookings
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
@@ -28,16 +28,16 @@ FROM (
   ON
     subq_12.ds__day = subq_13.ds
   GROUP BY
-    subq_13.martian_day
+    subq_13.alien_day
 ) subq_17
 FULL OUTER JOIN (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['listings', 'metric_time__martian_day']
+  -- Pass Only Elements: ['listings', 'metric_time__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_19.martian_day AS metric_time__martian_day
+    subq_19.alien_day AS metric_time__alien_day
     , SUM(subq_18.listings) AS listings
   FROM (
     -- Read Elements From Semantic Model 'listings_latest'
@@ -51,9 +51,9 @@ FULL OUTER JOIN (
   ON
     subq_18.ds__day = subq_19.ds
   GROUP BY
-    subq_19.martian_day
+    subq_19.alien_day
 ) subq_23
 ON
-  subq_17.metric_time__martian_day = subq_23.metric_time__martian_day
+  subq_17.metric_time__alien_day = subq_23.metric_time__alien_day
 GROUP BY
-  COALESCE(subq_17.metric_time__martian_day, subq_23.metric_time__martian_day)
+  COALESCE(subq_17.metric_time__alien_day, subq_23.metric_time__alien_day)
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
index d9ef58cfc4..4081f8edb2 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_cumulative_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_7.metric_time__martian_day
+  subq_7.metric_time__alien_day
   , subq_7.metric_time__hour
   , subq_7.archived_users AS subdaily_cumulative_window_metric
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
     , SUM(subq_6.archived_users) AS archived_users
   FROM (
-    -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_5.metric_time__martian_day
+      subq_5.metric_time__alien_day
       , subq_5.metric_time__hour
       , subq_5.archived_users
     FROM (
@@ -213,7 +213,7 @@ FROM (
         , subq_1.home_state AS home_state
         , subq_1.user__home_state AS user__home_state
         , subq_1.archived_users AS archived_users
-        , subq_4.martian_day AS metric_time__martian_day
+        , subq_4.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -612,6 +612,6 @@ FROM (
     ) subq_5
   ) subq_6
   GROUP BY
-    subq_6.metric_time__martian_day
+    subq_6.metric_time__alien_day
     , subq_6.metric_time__hour
 ) subq_7
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
index 8da460c21d..1e039bab1b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_cumulative_metric__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Trino
 ---
 -- Join Self Over Time Range
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+-- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_12.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS metric_time__alien_day
   , subq_11.ts AS metric_time__hour
   , SUM(subq_9.archived_users) AS subdaily_cumulative_window_metric
 FROM ***************************.mf_time_spine_hour subq_11
@@ -31,5 +31,5 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', subq_11.ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
+  subq_12.alien_day
   , subq_11.ts
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
index c29a3e66cc..00eb1c0178 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0.sql
@@ -4,19 +4,19 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.metric_time__martian_day
+  subq_9.metric_time__alien_day
   , subq_9.metric_time__hour
   , subq_9.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Join to Time Spine Dataset
   SELECT
-    subq_8.metric_time__martian_day AS metric_time__martian_day
+    subq_8.metric_time__alien_day AS metric_time__alien_day
     , subq_8.metric_time__hour AS metric_time__hour
     , subq_4.archived_users AS archived_users
   FROM (
-    -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+    -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
     SELECT
-      subq_7.metric_time__martian_day
+      subq_7.metric_time__alien_day
       , subq_7.metric_time__hour
     FROM (
       -- Change Column Aliases
@@ -34,7 +34,7 @@ FROM (
         , subq_5.ts__extract_day AS ts__extract_day
         , subq_5.ts__extract_dow AS ts__extract_dow
         , subq_5.ts__extract_doy AS ts__extract_doy
-        , subq_6.martian_day AS metric_time__martian_day
+        , subq_6.alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine_hour'
         SELECT
@@ -61,13 +61,13 @@ FROM (
   LEFT OUTER JOIN (
     -- Aggregate Measures
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
       , SUM(subq_3.archived_users) AS archived_users
     FROM (
-      -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+      -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.metric_time__hour
         , subq_2.archived_users
       FROM (
@@ -264,7 +264,7 @@ FROM (
           , subq_0.home_state AS home_state
           , subq_0.user__home_state AS user__home_state
           , subq_0.archived_users AS archived_users
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'users_ds_source'
           SELECT
@@ -456,7 +456,7 @@ FROM (
       ) subq_2
     ) subq_3
     GROUP BY
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.metric_time__hour
   ) subq_4
   ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
index e2e96b98d0..17218e97f4 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_multiple_time_spines_in_query_for_join_to_time_spine_metric__plan0_optimized.sql
@@ -5,15 +5,15 @@ sql_engine: Trino
 -- Join to Time Spine Dataset
 -- Compute Metrics via Expressions
 SELECT
-  subq_18.metric_time__martian_day AS metric_time__martian_day
+  subq_18.metric_time__alien_day AS metric_time__alien_day
   , subq_18.metric_time__hour AS metric_time__hour
   , subq_14.archived_users AS subdaily_join_to_time_spine_metric
 FROM (
   -- Change Column Aliases
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['metric_time__alien_day', 'metric_time__hour']
   SELECT
-    subq_16.martian_day AS metric_time__martian_day
+    subq_16.alien_day AS metric_time__alien_day
     , time_spine_src_28005.ts AS metric_time__hour
   FROM ***************************.mf_time_spine_hour time_spine_src_28005
   LEFT OUTER JOIN
@@ -24,10 +24,10 @@ FROM (
 LEFT OUTER JOIN (
   -- Metric Time Dimension 'archived_at'
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['archived_users', 'metric_time__martian_day', 'metric_time__hour']
+  -- Pass Only Elements: ['archived_users', 'metric_time__alien_day', 'metric_time__hour']
   -- Aggregate Measures
   SELECT
-    subq_11.martian_day AS metric_time__martian_day
+    subq_11.alien_day AS metric_time__alien_day
     , subq_10.archived_at__hour AS metric_time__hour
     , SUM(subq_10.archived_users) AS archived_users
   FROM (
@@ -43,7 +43,7 @@ LEFT OUTER JOIN (
   ON
     subq_10.archived_at__day = subq_11.ds
   GROUP BY
-    subq_11.martian_day
+    subq_11.alien_day
     , subq_10.archived_at__hour
 ) subq_14
 ON
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
index 121db942f8..383bbb7cc7 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0.sql
@@ -2,10 +2,10 @@ test_name: test_no_metric_custom_granularity_joined_to_non_default_grain
 test_filename: test_custom_granularity.py
 sql_engine: Trino
 ---
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
 FROM (
@@ -193,8 +193,8 @@ FROM (
     , subq_0.user__home_state AS user__home_state
     , subq_0.new_users AS new_users
     , subq_0.archived_users AS archived_users
-    , subq_4.martian_day AS metric_time__martian_day
-    , subq_5.martian_day AS user__bio_added_ts__martian_day
+    , subq_4.alien_day AS metric_time__alien_day
+    , subq_5.alien_day AS user__bio_added_ts__alien_day
   FROM (
     -- Read Elements From Semantic Model 'users_ds_source'
     SELECT
@@ -397,7 +397,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -409,7 +409,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -424,7 +424,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
@@ -439,7 +439,7 @@ FROM (
     subq_0.user__bio_added_ts__day = subq_5.ds
 ) subq_6
 GROUP BY
-  subq_6.user__bio_added_ts__martian_day
-  , subq_6.metric_time__martian_day
+  subq_6.user__bio_added_ts__alien_day
+  , subq_6.metric_time__alien_day
   , subq_6.user__bio_added_ts__month
   , subq_6.metric_time__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
index 90640bb4d6..355d126a78 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_joined_to_non_default_grain__plan0_optimized.sql
@@ -5,10 +5,10 @@ sql_engine: Trino
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
+-- Pass Only Elements: ['metric_time__day', 'metric_time__alien_day', 'user__bio_added_ts__alien_day', 'user__bio_added_ts__month']
 SELECT
-  subq_12.martian_day AS user__bio_added_ts__martian_day
-  , subq_11.martian_day AS metric_time__martian_day
+  subq_12.alien_day AS user__bio_added_ts__alien_day
+  , subq_11.alien_day AS metric_time__alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts) AS user__bio_added_ts__month
   , time_spine_src_28006.ds AS metric_time__day
 FROM ***************************.dim_users users_ds_source_src_28000
@@ -23,7 +23,7 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', users_ds_source_src_28000.bio_added_ts) = subq_12.ds
 GROUP BY
-  subq_12.martian_day
-  , subq_11.martian_day
+  subq_12.alien_day
+  , subq_11.alien_day
   , DATE_TRUNC('month', users_ds_source_src_28000.bio_added_ts)
   , time_spine_src_28006.ds
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql
index fe81fe2961..6469799e22 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: Trino
 ---
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
@@ -20,7 +20,7 @@ FROM (
     , subq_0.ds__extract_day AS ds__extract_day
     , subq_0.ds__extract_dow AS ds__extract_dow
     , subq_0.ds__extract_doy AS ds__extract_doy
-    , subq_0.ds__martian_day AS ds__martian_day
+    , subq_0.ds__alien_day AS ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -32,8 +32,8 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
-    , subq_1.martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
+    , subq_1.alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
   LEFT OUTER JOIN
@@ -57,4 +57,4 @@ FROM (
     subq_0.ds__day = subq_1.ds
 ) subq_2
 GROUP BY
-  subq_2.metric_time__martian_day
+  subq_2.metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
index 9fee5399e2..749a27d264 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: Trino
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['metric_time__martian_day',]
+-- Pass Only Elements: ['metric_time__alien_day',]
 SELECT
-  subq_4.martian_day AS metric_time__martian_day
+  subq_4.alien_day AS metric_time__alien_day
 FROM ***************************.mf_time_spine time_spine_src_28006
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_4
 ON
   time_spine_src_28006.ds = subq_4.ds
 GROUP BY
-  subq_4.martian_day
+  subq_4.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql
index 220ed52ffd..bc9f434cc3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0.sql
@@ -2,9 +2,9 @@ test_name: test_no_metric_custom_granularity_non_metric_time
 test_filename: test_custom_granularity.py
 sql_engine: Trino
 ---
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Join to Custom Granularity Dataset
@@ -97,7 +97,7 @@ FROM (
     , bookings_source_src_28000.listing_id AS booking__listing
     , bookings_source_src_28000.guest_id AS booking__guest
     , bookings_source_src_28000.host_id AS booking__host
-    , subq_0.martian_day AS booking__ds__martian_day
+    , subq_0.alien_day AS booking__ds__alien_day
   FROM ***************************.fct_bookings bookings_source_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_0
@@ -105,4 +105,4 @@ FROM (
     DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_0.ds
 ) subq_1
 GROUP BY
-  subq_1.booking__ds__martian_day
+  subq_1.booking__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
index f2f3bf03c0..93414e194a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metric_custom_granularity_non_metric_time__plan0_optimized.sql
@@ -4,13 +4,13 @@ sql_engine: Trino
 ---
 -- Read Elements From Semantic Model 'bookings_source'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['booking__ds__martian_day',]
+-- Pass Only Elements: ['booking__ds__alien_day',]
 SELECT
-  subq_2.martian_day AS booking__ds__martian_day
+  subq_2.alien_day AS booking__ds__alien_day
 FROM ***************************.fct_bookings bookings_source_src_28000
 LEFT OUTER JOIN
   ***************************.mf_time_spine subq_2
 ON
   DATE_TRUNC('day', bookings_source_src_28000.ds) = subq_2.ds
 GROUP BY
-  subq_2.martian_day
+  subq_2.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql
index 4f7056fb38..88d97b325b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0.sql
@@ -10,7 +10,7 @@ SELECT
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
   subq_2.listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
index b2b43ca2b0..77e525e919 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_filter__plan0_optimized.sql
@@ -13,13 +13,13 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
-    , subq_3.martian_day AS listing__ds__martian_day
+    , subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
   listing__ds__day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 20a13743a6..ca12928f71 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -4,13 +4,13 @@ docstring:
   Group by items only queried with a filter on a custom grain, where that grain is also used in the group by.
 sql_engine: Trino
 ---
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
 FROM (
   -- Constrain Output with WHERE
   SELECT
-    subq_1.listing__ds__martian_day
+    subq_1.listing__ds__alien_day
     , subq_1.ds__day
     , subq_1.ds__week
     , subq_1.ds__month
@@ -127,14 +127,14 @@ FROM (
       , listings_latest_src_28000.listing_id AS listing
       , listings_latest_src_28000.user_id AS user
       , listings_latest_src_28000.user_id AS listing__user
-      , subq_0.martian_day AS listing__ds__martian_day
+      , subq_0.alien_day AS listing__ds__alien_day
     FROM ***************************.dim_listings_latest listings_latest_src_28000
     LEFT OUTER JOIN
       ***************************.mf_time_spine subq_0
     ON
       DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_0.ds
   ) subq_1
-  WHERE listing__ds__martian_day = '2020-01-01'
+  WHERE listing__ds__alien_day = '2020-01-01'
 ) subq_2
 GROUP BY
-  subq_2.listing__ds__martian_day
+  subq_2.listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index 3a7a67a586..ed71a2021c 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_no_metrics_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,20 +5,20 @@ docstring:
 sql_engine: Trino
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['listing__ds__martian_day',]
+-- Pass Only Elements: ['listing__ds__alien_day',]
 SELECT
-  listing__ds__martian_day
+  listing__ds__alien_day
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Join to Custom Granularity Dataset
   SELECT
-    subq_3.martian_day AS listing__ds__martian_day
+    subq_3.alien_day AS listing__ds__alien_day
   FROM ***************************.dim_listings_latest listings_latest_src_28000
   LEFT OUTER JOIN
     ***************************.mf_time_spine subq_3
   ON
     DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_3.ds
 ) subq_4
-WHERE listing__ds__martian_day = '2020-01-01'
+WHERE listing__ds__alien_day = '2020-01-01'
 GROUP BY
-  listing__ds__martian_day
+  listing__ds__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql
index 90f72e554b..804086a353 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0.sql
@@ -4,22 +4,22 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.booking__ds__martian_day
+  subq_9.booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Compute Metrics via Expressions
   SELECT
-    subq_8.booking__ds__martian_day
+    subq_8.booking__ds__alien_day
     , subq_8.bookings AS bookings_5_days_ago
   FROM (
     -- Aggregate Measures
     SELECT
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
       , SUM(subq_7.bookings) AS bookings
     FROM (
-      -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+      -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
       SELECT
-        subq_6.booking__ds__martian_day
+        subq_6.booking__ds__alien_day
         , subq_6.bookings
       FROM (
         -- Join to Time Spine Dataset
@@ -123,7 +123,7 @@ FROM (
           , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_5.martian_day AS booking__ds__martian_day
+          , subq_5.alien_day AS booking__ds__alien_day
         FROM (
           -- Pass Only Elements: ['booking__ds__day',]
           SELECT
@@ -142,7 +142,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -157,7 +157,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
@@ -366,6 +366,6 @@ FROM (
       ) subq_6
     ) subq_7
     GROUP BY
-      subq_7.booking__ds__martian_day
+      subq_7.booking__ds__alien_day
   ) subq_8
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql
index 3a83a25a26..61f963d9b3 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,16 +4,16 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  booking__ds__martian_day
+  booking__ds__alien_day
   , bookings_5_days_ago AS bookings_5_day_lag
 FROM (
   -- Join to Time Spine Dataset
   -- Join to Custom Granularity Dataset
-  -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+  -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
   -- Aggregate Measures
   -- Compute Metrics via Expressions
   SELECT
-    subq_15.martian_day AS booking__ds__martian_day
+    subq_15.alien_day AS booking__ds__alien_day
     , SUM(subq_11.bookings) AS bookings_5_days_ago
   FROM ***************************.mf_time_spine time_spine_src_28006
   INNER JOIN (
@@ -31,5 +31,5 @@ FROM (
   ON
     time_spine_src_28006.ds = subq_15.ds
   GROUP BY
-    subq_15.martian_day
+    subq_15.alien_day
 ) subq_19
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
index 2a6a881305..df8626efe1 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0.sql
@@ -24,7 +24,7 @@ FROM (
       FROM (
         -- Constrain Output with WHERE
         SELECT
-          subq_6.metric_time__martian_day
+          subq_6.metric_time__alien_day
           , subq_6.ds__day
           , subq_6.ds__week
           , subq_6.ds__month
@@ -225,7 +225,7 @@ FROM (
             , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
             , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
             , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-            , subq_5.martian_day AS metric_time__martian_day
+            , subq_5.alien_day AS metric_time__alien_day
           FROM (
             -- Pass Only Elements: ['metric_time__day',]
             SELECT
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -466,7 +466,7 @@ FROM (
           ON
             subq_4.metric_time__day = subq_5.ds
         ) subq_6
-        WHERE metric_time__martian_day = '2020-01-01'
+        WHERE metric_time__alien_day = '2020-01-01'
       ) subq_7
     ) subq_8
     GROUP BY
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
index c161c74c5d..babf8d529b 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_offset_metric_with_custom_granularity_filter_not_in_group_by__plan0_optimized.sql
@@ -20,7 +20,7 @@ FROM (
     SELECT
       time_spine_src_28006.ds AS metric_time__day
       , subq_12.bookings AS bookings
-      , subq_16.martian_day AS metric_time__martian_day
+      , subq_16.alien_day AS metric_time__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
     INNER JOIN (
       -- Read Elements From Semantic Model 'bookings_source'
@@ -37,7 +37,7 @@ FROM (
     ON
       time_spine_src_28006.ds = subq_16.ds
   ) subq_17
-  WHERE metric_time__martian_day = '2020-01-01'
+  WHERE metric_time__alien_day = '2020-01-01'
   GROUP BY
     metric_time__day
 ) subq_21
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql
index 5897091096..620e59904e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_4.booking__ds__martian_day
+  subq_4.booking__ds__alien_day
   , subq_4.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
     , SUM(subq_3.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
     SELECT
-      subq_2.booking__ds__martian_day
+      subq_2.booking__ds__alien_day
       , subq_2.bookings
     FROM (
       -- Metric Time Dimension 'ds'
@@ -118,7 +118,7 @@ FROM (
         , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_1.martian_day AS booking__ds__martian_day
+        , subq_1.alien_day AS booking__ds__alien_day
       FROM (
         -- Read Elements From Semantic Model 'bookings_source'
         SELECT
@@ -219,5 +219,5 @@ FROM (
     ) subq_2
   ) subq_3
   GROUP BY
-    subq_3.booking__ds__martian_day
+    subq_3.booking__ds__alien_day
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql
index a60a41a75d..2fe2f50c4a 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Trino
 ---
 -- Metric Time Dimension 'ds'
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'booking__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_6.martian_day AS booking__ds__martian_day
+  subq_6.alien_day AS booking__ds__alien_day
   , SUM(subq_5.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -22,4 +22,4 @@ LEFT OUTER JOIN
 ON
   subq_5.booking__ds__day = subq_6.ds
 GROUP BY
-  subq_6.martian_day
+  subq_6.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql
index 612f490d5d..2e46b4f1fb 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0.sql
@@ -4,17 +4,17 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_8.listing__ds__martian_day
+  subq_8.listing__ds__alien_day
   , subq_8.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
     , SUM(subq_7.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
     SELECT
-      subq_6.listing__ds__martian_day
+      subq_6.listing__ds__alien_day
       , subq_6.bookings
     FROM (
       -- Join Standard Outputs
@@ -119,7 +119,7 @@ FROM (
         , subq_1.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_1.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_1.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_5.martian_day AS listing__ds__martian_day
+        , subq_5.alien_day AS listing__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -462,5 +462,5 @@ FROM (
     ) subq_6
   ) subq_7
   GROUP BY
-    subq_7.listing__ds__martian_day
+    subq_7.listing__ds__alien_day
 ) subq_8
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
index 3109487bc1..a63d5aaba0 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_and_join__plan0_optimized.sql
@@ -4,11 +4,11 @@ sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_14.martian_day AS listing__ds__martian_day
+  subq_14.alien_day AS listing__ds__alien_day
   , SUM(subq_10.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -27,4 +27,4 @@ LEFT OUTER JOIN
 ON
   DATE_TRUNC('day', listings_latest_src_28000.created_at) = subq_14.ds
 GROUP BY
-  subq_14.martian_day
+  subq_14.alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql
index cd4828678d..afafd09b47 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0.sql
@@ -18,7 +18,7 @@ FROM (
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -219,7 +219,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -318,7 +318,7 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
index f2dcb2666d..b373ec8e58 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_filter__plan0_optimized.sql
@@ -15,7 +15,7 @@ FROM (
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -28,4 +28,4 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
index 5ca21d66f3..8168289691 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0.sql
@@ -6,22 +6,22 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_5.metric_time__martian_day
+  subq_5.metric_time__alien_day
   , subq_5.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
     , SUM(subq_4.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+    -- Pass Only Elements: ['bookings', 'metric_time__alien_day']
     SELECT
-      subq_3.metric_time__martian_day
+      subq_3.metric_time__alien_day
       , subq_3.bookings
     FROM (
       -- Constrain Output with WHERE
       SELECT
-        subq_2.metric_time__martian_day
+        subq_2.metric_time__alien_day
         , subq_2.ds__day
         , subq_2.ds__week
         , subq_2.ds__month
@@ -222,7 +222,7 @@ FROM (
           , subq_0.discrete_booking_value_p99 AS discrete_booking_value_p99
           , subq_0.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
           , subq_0.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-          , subq_1.martian_day AS metric_time__martian_day
+          , subq_1.alien_day AS metric_time__alien_day
         FROM (
           -- Read Elements From Semantic Model 'bookings_source'
           SELECT
@@ -321,9 +321,9 @@ FROM (
         ON
           subq_0.ds__day = subq_1.ds
       ) subq_2
-      WHERE metric_time__martian_day = '2020-01-01'
+      WHERE metric_time__alien_day = '2020-01-01'
     ) subq_3
   ) subq_4
   GROUP BY
-    subq_4.metric_time__martian_day
+    subq_4.metric_time__alien_day
 ) subq_5
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
index b9f9272a3e..d7e98c4080 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_custom_granularity_in_filter_and_group_by__plan0_optimized.sql
@@ -5,18 +5,18 @@ docstring:
 sql_engine: Trino
 ---
 -- Constrain Output with WHERE
--- Pass Only Elements: ['bookings', 'metric_time__martian_day']
+-- Pass Only Elements: ['bookings', 'metric_time__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  metric_time__martian_day
+  metric_time__alien_day
   , SUM(bookings) AS bookings
 FROM (
   -- Metric Time Dimension 'ds'
   -- Join to Custom Granularity Dataset
   SELECT
     subq_6.bookings AS bookings
-    , subq_7.martian_day AS metric_time__martian_day
+    , subq_7.alien_day AS metric_time__alien_day
   FROM (
     -- Read Elements From Semantic Model 'bookings_source'
     SELECT
@@ -29,6 +29,6 @@ FROM (
   ON
     subq_6.ds__day = subq_7.ds
 ) subq_8
-WHERE metric_time__martian_day = '2020-01-01'
+WHERE metric_time__alien_day = '2020-01-01'
 GROUP BY
-  metric_time__martian_day
+  metric_time__alien_day
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
index 0bb8fc2bb4..9232d840ec 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0.sql
@@ -6,17 +6,17 @@ sql_engine: Trino
 ---
 -- Compute Metrics via Expressions
 SELECT
-  subq_36.listing__user__ds__martian_day
+  subq_36.listing__user__ds__alien_day
   , subq_36.bookings
 FROM (
   -- Aggregate Measures
   SELECT
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
     , SUM(subq_35.bookings) AS bookings
   FROM (
-    -- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+    -- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
     SELECT
-      subq_34.listing__user__ds__martian_day
+      subq_34.listing__user__ds__alien_day
       , subq_34.bookings
     FROM (
       -- Join Standard Outputs
@@ -122,7 +122,7 @@ FROM (
         , subq_25.discrete_booking_value_p99 AS discrete_booking_value_p99
         , subq_25.approximate_continuous_booking_value_p99 AS approximate_continuous_booking_value_p99
         , subq_25.approximate_discrete_booking_value_p99 AS approximate_discrete_booking_value_p99
-        , subq_33.martian_day AS listing__user__ds__martian_day
+        , subq_33.alien_day AS listing__user__ds__alien_day
       FROM (
         -- Metric Time Dimension 'ds'
         SELECT
@@ -1400,5 +1400,5 @@ FROM (
     ) subq_34
   ) subq_35
   GROUP BY
-    subq_35.listing__user__ds__martian_day
+    subq_35.listing__user__ds__alien_day
 ) subq_36
diff --git a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
index e6f49e7d58..4979e8375e 100644
--- a/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Trino/test_simple_metric_with_multi_hop_custom_granularity__plan0_optimized.sql
@@ -6,11 +6,11 @@ sql_engine: Trino
 ---
 -- Join Standard Outputs
 -- Join to Custom Granularity Dataset
--- Pass Only Elements: ['bookings', 'listing__user__ds__martian_day']
+-- Pass Only Elements: ['bookings', 'listing__user__ds__alien_day']
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_46.martian_day AS listing__user__ds__martian_day
+  subq_46.alien_day AS listing__user__ds__alien_day
   , SUM(subq_38.bookings) AS bookings
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
@@ -45,4 +45,4 @@ LEFT OUTER JOIN
 ON
   subq_45.user__ds__day = subq_46.ds
 GROUP BY
-  subq_46.martian_day
+  subq_46.alien_day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node__plan0.sql
index 48bf493d18..9f37f09289 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node__plan0.sql
@@ -12,19 +12,19 @@ FROM (
     -- Get Custom Granularity Bounds
     SELECT
       subq_0.ds__day
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , FIRST_VALUE(subq_0.ds__day) OVER (
-        PARTITION BY subq_0.ds__martian_day
+        PARTITION BY subq_0.ds__alien_day
         ORDER BY subq_0.ds__day
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS ds__day__first_value
       , LAST_VALUE(subq_0.ds__day) OVER (
-        PARTITION BY subq_0.ds__martian_day
+        PARTITION BY subq_0.ds__alien_day
         ORDER BY subq_0.ds__day
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS ds__day__last_value
       , ROW_NUMBER() OVER (
-        PARTITION BY subq_0.ds__martian_day
+        PARTITION BY subq_0.ds__alien_day
         ORDER BY subq_0.ds__day
       ) AS ds__day__row_number
     FROM (
@@ -41,7 +41,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   )
@@ -57,22 +57,22 @@ FROM (
   INNER JOIN (
     -- Offset Custom Granularity Bounds
     SELECT
-      subq_1.ds__martian_day
-      , LEAD(subq_1.ds__day__first_value, 3) OVER (ORDER BY subq_1.ds__martian_day) AS ds__day__first_value__lead
-      , LEAD(subq_1.ds__day__last_value, 3) OVER (ORDER BY subq_1.ds__martian_day) AS ds__day__last_value__lead
+      subq_1.ds__alien_day
+      , LEAD(subq_1.ds__day__first_value, 3) OVER (ORDER BY subq_1.ds__alien_day) AS ds__day__first_value__lead
+      , LEAD(subq_1.ds__day__last_value, 3) OVER (ORDER BY subq_1.ds__alien_day) AS ds__day__last_value__lead
     FROM (
       -- Get Unique Rows for Custom Granularity Bounds
       SELECT
-        cte_0.ds__martian_day
+        cte_0.ds__alien_day
         , cte_0.ds__day__first_value
         , cte_0.ds__day__last_value
       FROM cte_0 cte_0
       GROUP BY
-        cte_0.ds__martian_day
+        cte_0.ds__alien_day
         , cte_0.ds__day__first_value
         , cte_0.ds__day__last_value
     ) subq_1
   ) subq_2
   ON
-    cte_0.ds__martian_day = subq_2.ds__martian_day
+    cte_0.ds__alien_day = subq_2.ds__alien_day
 ) subq_3
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node__plan0_optimized.sql
index 0c7a2b4d28..9730940f2d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node__plan0_optimized.sql
@@ -13,19 +13,19 @@ FROM (
     -- Get Custom Granularity Bounds
     SELECT
       ds AS ds__day
-      , martian_day AS ds__martian_day
+      , alien_day AS ds__alien_day
       , FIRST_VALUE(ds) OVER (
-        PARTITION BY martian_day
+        PARTITION BY alien_day
         ORDER BY ds
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS ds__day__first_value
       , LAST_VALUE(ds) OVER (
-        PARTITION BY martian_day
+        PARTITION BY alien_day
         ORDER BY ds
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS ds__day__last_value
       , ROW_NUMBER() OVER (
-        PARTITION BY martian_day
+        PARTITION BY alien_day
         ORDER BY ds
       ) AS ds__day__row_number
     FROM ***************************.mf_time_spine time_spine_src_28006
@@ -42,22 +42,22 @@ FROM (
   INNER JOIN (
     -- Offset Custom Granularity Bounds
     SELECT
-      ds__martian_day
-      , LEAD(ds__day__first_value, 3) OVER (ORDER BY ds__martian_day) AS ds__day__first_value__lead
-      , LEAD(ds__day__last_value, 3) OVER (ORDER BY ds__martian_day) AS ds__day__last_value__lead
+      ds__alien_day
+      , LEAD(ds__day__first_value, 3) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
+      , LEAD(ds__day__last_value, 3) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
     FROM (
       -- Get Unique Rows for Custom Granularity Bounds
       SELECT
-        ds__martian_day
+        ds__alien_day
         , ds__day__first_value
         , ds__day__last_value
       FROM cte_2 cte_2
       GROUP BY
-        ds__martian_day
+        ds__alien_day
         , ds__day__first_value
         , ds__day__last_value
     ) subq_5
   ) subq_6
   ON
-    cte_2.ds__martian_day = subq_6.ds__martian_day
+    cte_2.ds__alien_day = subq_6.ds__alien_day
 ) subq_7
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node_with_smaller_grain__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node_with_smaller_grain__plan0.sql
index 4bc1d1a887..9e1e4460df 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node_with_smaller_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node_with_smaller_grain__plan0.sql
@@ -12,19 +12,19 @@ FROM (
     -- Get Custom Granularity Bounds
     SELECT
       subq_1.ts__hour AS ts__hour
-      , subq_0.ds__martian_day AS ds__martian_day
+      , subq_0.ds__alien_day AS ds__alien_day
       , FIRST_VALUE(subq_1.ts__hour) OVER (
-        PARTITION BY subq_0.ds__martian_day
+        PARTITION BY subq_0.ds__alien_day
         ORDER BY subq_1.ts__hour
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS ts__hour__first_value
       , LAST_VALUE(subq_1.ts__hour) OVER (
-        PARTITION BY subq_0.ds__martian_day
+        PARTITION BY subq_0.ds__alien_day
         ORDER BY subq_1.ts__hour
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS ts__hour__last_value
       , ROW_NUMBER() OVER (
-        PARTITION BY subq_0.ds__martian_day
+        PARTITION BY subq_0.ds__alien_day
         ORDER BY subq_1.ts__hour
       ) AS ts__hour__row_number
     FROM (
@@ -41,7 +41,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
     INNER JOIN (
@@ -76,22 +76,22 @@ FROM (
   INNER JOIN (
     -- Offset Custom Granularity Bounds
     SELECT
-      subq_2.ds__martian_day
-      , LEAD(subq_2.ts__hour__first_value, 5) OVER (ORDER BY subq_2.ds__martian_day) AS ts__hour__first_value__lead
-      , LEAD(subq_2.ts__hour__last_value, 5) OVER (ORDER BY subq_2.ds__martian_day) AS ts__hour__last_value__lead
+      subq_2.ds__alien_day
+      , LEAD(subq_2.ts__hour__first_value, 5) OVER (ORDER BY subq_2.ds__alien_day) AS ts__hour__first_value__lead
+      , LEAD(subq_2.ts__hour__last_value, 5) OVER (ORDER BY subq_2.ds__alien_day) AS ts__hour__last_value__lead
     FROM (
       -- Get Unique Rows for Custom Granularity Bounds
       SELECT
-        cte_0.ds__martian_day
+        cte_0.ds__alien_day
         , cte_0.ts__hour__first_value
         , cte_0.ts__hour__last_value
       FROM cte_0 cte_0
       GROUP BY
-        cte_0.ds__martian_day
+        cte_0.ds__alien_day
         , cte_0.ts__hour__first_value
         , cte_0.ts__hour__last_value
     ) subq_2
   ) subq_3
   ON
-    cte_0.ds__martian_day = subq_3.ds__martian_day
+    cte_0.ds__alien_day = subq_3.ds__alien_day
 ) subq_4
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node_with_smaller_grain__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node_with_smaller_grain__plan0_optimized.sql
index f7694e3e8d..f80d92473c 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node_with_smaller_grain__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_by_custom_granularity_node_with_smaller_grain__plan0_optimized.sql
@@ -12,19 +12,19 @@ FROM (
     -- Get Custom Granularity Bounds
     SELECT
       time_spine_src_28005.ts AS ts__hour
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
       , FIRST_VALUE(time_spine_src_28005.ts) OVER (
-        PARTITION BY time_spine_src_28006.martian_day
+        PARTITION BY time_spine_src_28006.alien_day
         ORDER BY time_spine_src_28005.ts
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS ts__hour__first_value
       , LAST_VALUE(time_spine_src_28005.ts) OVER (
-        PARTITION BY time_spine_src_28006.martian_day
+        PARTITION BY time_spine_src_28006.alien_day
         ORDER BY time_spine_src_28005.ts
         ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
       ) AS ts__hour__last_value
       , ROW_NUMBER() OVER (
-        PARTITION BY time_spine_src_28006.martian_day
+        PARTITION BY time_spine_src_28006.alien_day
         ORDER BY time_spine_src_28005.ts
       ) AS ts__hour__row_number
     FROM ***************************.mf_time_spine time_spine_src_28006
@@ -45,22 +45,22 @@ FROM (
   INNER JOIN (
     -- Offset Custom Granularity Bounds
     SELECT
-      ds__martian_day
-      , LEAD(ts__hour__first_value, 5) OVER (ORDER BY ds__martian_day) AS ts__hour__first_value__lead
-      , LEAD(ts__hour__last_value, 5) OVER (ORDER BY ds__martian_day) AS ts__hour__last_value__lead
+      ds__alien_day
+      , LEAD(ts__hour__first_value, 5) OVER (ORDER BY ds__alien_day) AS ts__hour__first_value__lead
+      , LEAD(ts__hour__last_value, 5) OVER (ORDER BY ds__alien_day) AS ts__hour__last_value__lead
     FROM (
       -- Get Unique Rows for Custom Granularity Bounds
       SELECT
-        ds__martian_day
+        ds__alien_day
         , ts__hour__first_value
         , ts__hour__last_value
       FROM cte_2 cte_2
       GROUP BY
-        ds__martian_day
+        ds__alien_day
         , ts__hour__first_value
         , ts__hour__last_value
     ) subq_7
   ) subq_8
   ON
-    cte_2.ds__martian_day = subq_8.ds__martian_day
+    cte_2.ds__alien_day = subq_8.ds__alien_day
 ) subq_9
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_custom_granularity_node__plan0.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_custom_granularity_node__plan0.sql
index 0149b61520..0eb9aff399 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_custom_granularity_node__plan0.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_custom_granularity_node__plan0.sql
@@ -17,22 +17,22 @@ WITH cte_0 AS (
     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-    , time_spine_src_28006.martian_day AS ds__martian_day
+    , time_spine_src_28006.alien_day AS ds__alien_day
   FROM ***************************.mf_time_spine time_spine_src_28006
 )
 
 SELECT
   cte_0.ds__day AS ds__day
-  , subq_0.ds__martian_day__lead AS metric_time__martian_day
+  , subq_0.ds__alien_day__lead AS metric_time__alien_day
 FROM cte_0 cte_0
 INNER JOIN (
   -- Offset Custom Granularity
   SELECT
-    cte_0.ds__martian_day
-    , LEAD(cte_0.ds__martian_day, 3) OVER (ORDER BY cte_0.ds__martian_day) AS ds__martian_day__lead
+    cte_0.ds__alien_day
+    , LEAD(cte_0.ds__alien_day, 3) OVER (ORDER BY cte_0.ds__alien_day) AS ds__alien_day__lead
   FROM cte_0 cte_0
   GROUP BY
-    cte_0.ds__martian_day
+    cte_0.ds__alien_day
 ) subq_0
 ON
-  cte_0.ds__martian_day = subq_0.ds__martian_day
+  cte_0.ds__alien_day = subq_0.ds__alien_day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_custom_granularity_node__plan0_optimized.sql b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_custom_granularity_node__plan0_optimized.sql
index ec57643ef8..e5f352480a 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_custom_granularity_node__plan0_optimized.sql
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/DuckDB/test_offset_custom_granularity_node__plan0_optimized.sql
@@ -7,22 +7,22 @@ WITH cte_2 AS (
   -- Read From Time Spine 'mf_time_spine'
   SELECT
     ds AS ds__day
-    , martian_day AS ds__martian_day
+    , alien_day AS ds__alien_day
   FROM ***************************.mf_time_spine time_spine_src_28006
 )
 
 SELECT
   cte_2.ds__day AS ds__day
-  , subq_1.ds__martian_day__lead AS metric_time__martian_day
+  , subq_1.ds__alien_day__lead AS metric_time__alien_day
 FROM cte_2 cte_2
 INNER JOIN (
   -- Offset Custom Granularity
   SELECT
-    ds__martian_day
-    , LEAD(ds__martian_day, 3) OVER (ORDER BY ds__martian_day) AS ds__martian_day__lead
+    ds__alien_day
+    , LEAD(ds__alien_day, 3) OVER (ORDER BY ds__alien_day) AS ds__alien_day__lead
   FROM cte_2 cte_2
   GROUP BY
-    ds__martian_day
+    ds__alien_day
 ) subq_1
 ON
-  cte_2.ds__martian_day = subq_1.ds__martian_day
+  cte_2.ds__alien_day = subq_1.ds__alien_day
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_by_custom_granularity_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_by_custom_granularity_node__plan0.xml
index 777c570815..a10015605d 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_by_custom_granularity_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_by_custom_granularity_node__plan0.xml
@@ -34,7 +34,7 @@ test_filename: test_dataflow_to_sql_plan.py
                 <!-- description = 'Offset Custom Granularity Bounds' -->
                 <!-- node_id = NodeId(id_str='ss_4') -->
                 <!-- col0 =                                                                                             -->
-                <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_5), column_alias='ds__martian_day') -->
+                <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_5), column_alias='ds__alien_day') -->
                 <!-- col1 =                                                                   -->
                 <!--   SqlSelectColumn(                                                       -->
                 <!--     expr=SqlWindowFunctionExpression(node_id=wfnc_3, sql_function=LEAD), -->
@@ -54,7 +54,7 @@ test_filename: test_dataflow_to_sql_plan.py
                     <!-- col0 =                                               -->
                     <!--   SqlSelectColumn(                                   -->
                     <!--     expr=SqlColumnReferenceExpression(node_id=cr_2), -->
-                    <!--     column_alias='ds__martian_day',                  -->
+                    <!--     column_alias='ds__alien_day',                  -->
                     <!--   )                                                  -->
                     <!-- col1 =                                               -->
                     <!--   SqlSelectColumn(                                   -->
@@ -70,7 +70,7 @@ test_filename: test_dataflow_to_sql_plan.py
                     <!-- group_by0 =                                          -->
                     <!--   SqlSelectColumn(                                   -->
                     <!--     expr=SqlColumnReferenceExpression(node_id=cr_2), -->
-                    <!--     column_alias='ds__martian_day',                  -->
+                    <!--     column_alias='ds__alien_day',                  -->
                     <!--   )                                                  -->
                     <!-- group_by1 =                                          -->
                     <!--   SqlSelectColumn(                                   -->
@@ -101,7 +101,7 @@ test_filename: test_dataflow_to_sql_plan.py
                     <!-- col1 =                                               -->
                     <!--   SqlSelectColumn(                                   -->
                     <!--     expr=SqlColumnReferenceExpression(node_id=cr_0), -->
-                    <!--     column_alias='ds__martian_day',                  -->
+                    <!--     column_alias='ds__alien_day',                  -->
                     <!--   )                                                  -->
                     <!-- col2 =                                                                          -->
                     <!--   SqlSelectColumn(                                                              -->
@@ -170,7 +170,7 @@ test_filename: test_dataflow_to_sql_plan.py
                         <!-- col11 =                                                  -->
                         <!--   SqlSelectColumn(                                       -->
                         <!--     expr=SqlColumnReferenceExpression(node_id=cr_28131), -->
-                        <!--     column_alias='ds__martian_day',                      -->
+                        <!--     column_alias='ds__alien_day',                      -->
                         <!--   )                                                      -->
                         <!-- from_source = SqlTableNode(node_id=tfc_28018) -->
                         <!-- where = None -->
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_by_custom_granularity_node_with_smaller_grain__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_by_custom_granularity_node_with_smaller_grain__plan0.xml
index 3cfdaf407f..d844b40870 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_by_custom_granularity_node_with_smaller_grain__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_by_custom_granularity_node_with_smaller_grain__plan0.xml
@@ -34,7 +34,7 @@ test_filename: test_dataflow_to_sql_plan.py
                 <!-- description = 'Offset Custom Granularity Bounds' -->
                 <!-- node_id = NodeId(id_str='ss_6') -->
                 <!-- col0 =                                                                                             -->
-                <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_7), column_alias='ds__martian_day') -->
+                <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_7), column_alias='ds__alien_day') -->
                 <!-- col1 =                                                                   -->
                 <!--   SqlSelectColumn(                                                       -->
                 <!--     expr=SqlWindowFunctionExpression(node_id=wfnc_3, sql_function=LEAD), -->
@@ -54,7 +54,7 @@ test_filename: test_dataflow_to_sql_plan.py
                     <!-- col0 =                                               -->
                     <!--   SqlSelectColumn(                                   -->
                     <!--     expr=SqlColumnReferenceExpression(node_id=cr_4), -->
-                    <!--     column_alias='ds__martian_day',                  -->
+                    <!--     column_alias='ds__alien_day',                  -->
                     <!--   )                                                  -->
                     <!-- col1 =                                               -->
                     <!--   SqlSelectColumn(                                   -->
@@ -70,7 +70,7 @@ test_filename: test_dataflow_to_sql_plan.py
                     <!-- group_by0 =                                          -->
                     <!--   SqlSelectColumn(                                   -->
                     <!--     expr=SqlColumnReferenceExpression(node_id=cr_4), -->
-                    <!--     column_alias='ds__martian_day',                  -->
+                    <!--     column_alias='ds__alien_day',                  -->
                     <!--   )                                                  -->
                     <!-- group_by1 =                                          -->
                     <!--   SqlSelectColumn(                                   -->
@@ -102,7 +102,7 @@ test_filename: test_dataflow_to_sql_plan.py
                     <!-- col1 =                                               -->
                     <!--   SqlSelectColumn(                                   -->
                     <!--     expr=SqlColumnReferenceExpression(node_id=cr_2), -->
-                    <!--     column_alias='ds__martian_day',                  -->
+                    <!--     column_alias='ds__alien_day',                  -->
                     <!--   )                                                  -->
                     <!-- col2 =                                                                          -->
                     <!--   SqlSelectColumn(                                                              -->
@@ -178,7 +178,7 @@ test_filename: test_dataflow_to_sql_plan.py
                         <!-- col11 =                                                  -->
                         <!--   SqlSelectColumn(                                       -->
                         <!--     expr=SqlColumnReferenceExpression(node_id=cr_28131), -->
-                        <!--     column_alias='ds__martian_day',                      -->
+                        <!--     column_alias='ds__alien_day',                      -->
                         <!--   )                                                      -->
                         <!-- from_source = SqlTableNode(node_id=tfc_28018) -->
                         <!-- where = None -->
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_custom_granularity_node__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_custom_granularity_node__plan0.xml
index 9efcd32cff..ec879de4fb 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_custom_granularity_node__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/SqlPlan/test_offset_custom_granularity_node__plan0.xml
@@ -7,7 +7,7 @@ test_filename: test_dataflow_to_sql_plan.py
         <!-- node_id = NodeId(id_str='ss_4') -->
         <!-- col0 = SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_2), column_alias='ds__day') -->
         <!-- col1 =                                                                                                      -->
-        <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_3), column_alias='metric_time__martian_day') -->
+        <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_3), column_alias='metric_time__alien_day') -->
         <!-- from_source = SqlTableNode(node_id=tfc_1) -->
         <!-- join_0 =                                                 -->
         <!--   SqlJoinDescription(                                    -->
@@ -26,15 +26,15 @@ test_filename: test_dataflow_to_sql_plan.py
         <SqlSelectStatementNode>
             <!-- description = 'Offset Custom Granularity' -->
             <!-- node_id = NodeId(id_str='ss_2') -->
-            <!-- col0 = SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_0), column_alias='ds__martian_day') -->
+            <!-- col0 = SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_0), column_alias='ds__alien_day') -->
             <!-- col1 =                                                                   -->
             <!--   SqlSelectColumn(                                                       -->
             <!--     expr=SqlWindowFunctionExpression(node_id=wfnc_0, sql_function=LEAD), -->
-            <!--     column_alias='ds__martian_day__lead',                                -->
+            <!--     column_alias='ds__alien_day__lead',                                -->
             <!--   )                                                                      -->
             <!-- from_source = SqlTableNode(node_id=tfc_0) -->
             <!-- group_by0 =                                                                                        -->
-            <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_0), column_alias='ds__martian_day') -->
+            <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_0), column_alias='ds__alien_day') -->
             <!-- where = None -->
             <!-- distinct = False -->
             <SqlTableNode>
@@ -67,7 +67,7 @@ test_filename: test_dataflow_to_sql_plan.py
                 <!-- col11 =                                                  -->
                 <!--   SqlSelectColumn(                                       -->
                 <!--     expr=SqlColumnReferenceExpression(node_id=cr_28131), -->
-                <!--     column_alias='ds__martian_day',                      -->
+                <!--     column_alias='ds__alien_day',                      -->
                 <!--   )                                                      -->
                 <!-- from_source = SqlTableNode(node_id=tfc_28018) -->
                 <!-- where = None -->
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index 09269ed40f..4bff2f0767 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_5.ds__extract_day
                 , subq_5.ds__extract_dow
                 , subq_5.ds__extract_doy
-                , subq_5.ds__martian_day
+                , subq_5.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_5
             ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index db21d2a702..3ea4725b3f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -63,7 +63,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -78,7 +78,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_16006.ds) AS ds__extract_day
                 , IF(EXTRACT(dayofweek FROM time_spine_src_16006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_16006.ds) - 1) AS ds__extract_dow
                 , EXTRACT(dayofyear FROM time_spine_src_16006.ds) AS ds__extract_doy
-                , time_spine_src_16006.martian_day AS ds__martian_day
+                , time_spine_src_16006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_16006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
index 2f909c4c5d..56568c02fb 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 4cf625165d..f24a28a2e5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
index 2936fa3372..66bcba8970 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 831a31155d..7c98978e85 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 67f3678959..47a57643e4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -503,7 +503,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -518,7 +518,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 22197372dd..b7b084e4d8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -147,7 +147,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -162,7 +162,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -506,7 +506,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -521,7 +521,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index 156407ab91..e9fd9ccee2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -565,7 +565,7 @@ FROM (
                   , subq_7.ds__extract_day
                   , subq_7.ds__extract_dow
                   , subq_7.ds__extract_doy
-                  , subq_7.ds__martian_day
+                  , subq_7.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -580,7 +580,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                     , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
               ) subq_8
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
index 7919ef7179..2fe8ae1f44 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_cumulative_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_5.ds__extract_day
               , subq_5.ds__extract_dow
               , subq_5.ds__extract_doy
-              , subq_5.ds__martian_day
+              , subq_5.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                 , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_5
           ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index cd8e28f702..fed7268897 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
index a2ec9c5837..fab0795b70 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                 , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index 579dd6bf94..fc88e2ed11 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -41,7 +41,7 @@ FROM (
             , subq_10.ds__extract_day
             , subq_10.ds__extract_dow
             , subq_10.ds__extract_doy
-            , subq_10.ds__martian_day
+            , subq_10.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -56,7 +56,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
               , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_10
         ) subq_11
@@ -204,7 +204,7 @@ FROM (
                       , subq_2.ds__extract_day
                       , subq_2.ds__extract_dow
                       , subq_2.ds__extract_doy
-                      , subq_2.ds__martian_day
+                      , subq_2.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -219,7 +219,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                         , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_2
                   ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index 6b4a5570c2..084a56509f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -35,7 +35,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day
+          , subq_6.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -50,7 +50,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets__plan0.sql
index 0d3c836694..c672d8075f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_10.ds__extract_day
         , subq_10.ds__extract_dow
         , subq_10.ds__extract_doy
-        , subq_10.ds__martian_day
+        , subq_10.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
           , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_10
     ) subq_11
@@ -188,7 +188,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -203,7 +203,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                     , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql
index c812b48ded..6d0aca7419 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_time_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                       , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql
index c5a057424f..7a1da4b5c2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_nested_offsets_with_where_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                       , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index a7c808f471..770c8d32b1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index e658613c6d..0de1f9ce0a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -152,7 +152,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -167,7 +167,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                 , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql
index f2c57ddf95..918ef40809 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index 30754e39e6..13b0b2b702 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -250,7 +250,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -265,7 +265,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                     , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql
index 33375ae0a2..bcc364c6d5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -160,7 +160,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -175,7 +175,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql
index d81af9ae4d..75ba5a88f4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_offset_window_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql
index 8f6223899f..d9e5726d4b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/BigQuery/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index 48eaeb31a0..186dd195ad 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_5.ds__extract_day
                 , subq_5.ds__extract_dow
                 , subq_5.ds__extract_doy
-                , subq_5.ds__martian_day
+                , subq_5.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_5
             ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index 39f65189db..083786863f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -63,7 +63,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -78,7 +78,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_16006.ds) AS ds__extract_day
                 , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_16006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_16006.ds) AS ds__extract_doy
-                , time_spine_src_16006.martian_day AS ds__martian_day
+                , time_spine_src_16006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_16006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
index b05de1def0..f9baa49f26 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index db09c694a3..97d86da59c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
index e0d06bd0d8..dc95d47608 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 1431c1ad7e..a50ffe0111 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index d496b4ae02..232249a0c1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -503,7 +503,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -518,7 +518,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 98cd43edc3..983dad3b5f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -147,7 +147,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -162,7 +162,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -506,7 +506,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -521,7 +521,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index a5d4cbf2b2..7d54b8ff55 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -565,7 +565,7 @@ FROM (
                   , subq_7.ds__extract_day
                   , subq_7.ds__extract_dow
                   , subq_7.ds__extract_doy
-                  , subq_7.ds__martian_day
+                  , subq_7.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -580,7 +580,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
               ) subq_8
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
index a03956f3e1..c583cd4fe1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_cumulative_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_5.ds__extract_day
               , subq_5.ds__extract_dow
               , subq_5.ds__extract_doy
-              , subq_5.ds__martian_day
+              , subq_5.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_5
           ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index 32dc9bbe00..e180ae7e8b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
index ddd79e43c0..e6884f8bac 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index 0daa6c99e6..53be811cf2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -41,7 +41,7 @@ FROM (
             , subq_10.ds__extract_day
             , subq_10.ds__extract_dow
             , subq_10.ds__extract_doy
-            , subq_10.ds__martian_day
+            , subq_10.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -56,7 +56,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_10
         ) subq_11
@@ -204,7 +204,7 @@ FROM (
                       , subq_2.ds__extract_day
                       , subq_2.ds__extract_dow
                       , subq_2.ds__extract_doy
-                      , subq_2.ds__martian_day
+                      , subq_2.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -219,7 +219,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_2
                   ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index 3f73308ae7..0ec273430e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -35,7 +35,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day
+          , subq_6.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -50,7 +50,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets__plan0.sql
index 50cf0c375c..e3bc0c90d2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_10.ds__extract_day
         , subq_10.ds__extract_dow
         , subq_10.ds__extract_doy
-        , subq_10.ds__martian_day
+        , subq_10.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_10
     ) subq_11
@@ -188,7 +188,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -203,7 +203,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql
index d96dfcae5c..f47eaebba0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_time_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql
index 61149d7609..bdbf615113 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_nested_offsets_with_where_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index 04f6b8a1c1..b41eddaed2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index a52305d4db..21ec5ebb05 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -152,7 +152,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -167,7 +167,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql
index 765c242afe..2b359a860b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index 098c2c7b84..0e69798fb8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -250,7 +250,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -265,7 +265,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql
index d4b88f5ce2..defaeafec8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -160,7 +160,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -175,7 +175,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql
index 54f2899515..f01df9ff25 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_offset_window_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql
index 93747569df..f8aa660237 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Databricks/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index 11ebd4ee2a..f2e43f4307 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_5.ds__extract_day
                 , subq_5.ds__extract_dow
                 , subq_5.ds__extract_doy
-                , subq_5.ds__martian_day
+                , subq_5.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_5
             ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index 53a0c82c9e..5cd6a74ad1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -63,7 +63,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -78,7 +78,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_16006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_16006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_16006.ds) AS ds__extract_doy
-                , time_spine_src_16006.martian_day AS ds__martian_day
+                , time_spine_src_16006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_16006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
index 0561596c97..375fc348e9 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index cab5170cc3..69823fb9c3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
index 1fe5fdd5c6..504c1578a8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 3a694addc8..5218abe512 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 236e1fd84a..ceae2fd545 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -503,7 +503,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -518,7 +518,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 8a65dc2aac..0fff052ba9 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -147,7 +147,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -162,7 +162,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -506,7 +506,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -521,7 +521,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index b988daab42..b09c54bda0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -565,7 +565,7 @@ FROM (
                   , subq_7.ds__extract_day
                   , subq_7.ds__extract_dow
                   , subq_7.ds__extract_doy
-                  , subq_7.ds__martian_day
+                  , subq_7.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -580,7 +580,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
               ) subq_8
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
index adf124e749..617fcfd8a8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_cumulative_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_5.ds__extract_day
               , subq_5.ds__extract_dow
               , subq_5.ds__extract_doy
-              , subq_5.ds__martian_day
+              , subq_5.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_5
           ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index 951c440ae5..fcf00c6483 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 3e703cabcd..9a90935adf 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index 9e8dbfde1f..9de37c3489 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -41,7 +41,7 @@ FROM (
             , subq_10.ds__extract_day
             , subq_10.ds__extract_dow
             , subq_10.ds__extract_doy
-            , subq_10.ds__martian_day
+            , subq_10.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -56,7 +56,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_10
         ) subq_11
@@ -204,7 +204,7 @@ FROM (
                       , subq_2.ds__extract_day
                       , subq_2.ds__extract_dow
                       , subq_2.ds__extract_doy
-                      , subq_2.ds__martian_day
+                      , subq_2.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -219,7 +219,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_2
                   ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index 756f47d6dd..70206e22a0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -35,7 +35,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day
+          , subq_6.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -50,7 +50,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets__plan0.sql
index b0a57338b2..a7e84784b7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_10.ds__extract_day
         , subq_10.ds__extract_dow
         , subq_10.ds__extract_doy
-        , subq_10.ds__martian_day
+        , subq_10.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_10
     ) subq_11
@@ -188,7 +188,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -203,7 +203,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql
index 71a00693e1..0df8a4a5e9 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_time_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql
index 6701f6cd13..555e86aefc 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_nested_offsets_with_where_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index 808f6c2780..43ac0d3255 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index f2f5511190..7d577ad40c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -152,7 +152,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -167,7 +167,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql
index 7ffd8d9e5b..026a5fc864 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index 023db308cc..e98851dfff 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -250,7 +250,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -265,7 +265,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql
index f5feabbb98..584e2c7957 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -160,7 +160,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -175,7 +175,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql
index 035c30ce60..659e2fc374 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_offset_window_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql
index a3938a64db..eb1c688ad2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/DuckDB/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index 33cad9713c..7470e8e88a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_5.ds__extract_day
                 , subq_5.ds__extract_dow
                 , subq_5.ds__extract_doy
-                , subq_5.ds__martian_day
+                , subq_5.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_5
             ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index 9e3772c8cc..24df8b128d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -63,7 +63,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -78,7 +78,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_16006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_16006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_16006.ds) AS ds__extract_doy
-                , time_spine_src_16006.martian_day AS ds__martian_day
+                , time_spine_src_16006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_16006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
index c0289d996b..0cdd11b31e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index cde51e250d..c940f603ed 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
index 2f7e4314c8..a09a6c3f14 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 93443cadfd..9265e349dc 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 50fc973905..5d05a87ac2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -503,7 +503,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -518,7 +518,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 855649a406..b4ee806078 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -147,7 +147,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -162,7 +162,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -506,7 +506,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -521,7 +521,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index bd0716edc1..df3599ee79 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -565,7 +565,7 @@ FROM (
                   , subq_7.ds__extract_day
                   , subq_7.ds__extract_dow
                   , subq_7.ds__extract_doy
-                  , subq_7.ds__martian_day
+                  , subq_7.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -580,7 +580,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
               ) subq_8
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
index feb8c841f3..41af0fe6cf 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_cumulative_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_5.ds__extract_day
               , subq_5.ds__extract_dow
               , subq_5.ds__extract_doy
-              , subq_5.ds__martian_day
+              , subq_5.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_5
           ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index 7666b2e8f7..75aa16d649 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 08135a9abe..df89572c82 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index 72662ef8de..4587268f61 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -41,7 +41,7 @@ FROM (
             , subq_10.ds__extract_day
             , subq_10.ds__extract_dow
             , subq_10.ds__extract_doy
-            , subq_10.ds__martian_day
+            , subq_10.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -56,7 +56,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_10
         ) subq_11
@@ -204,7 +204,7 @@ FROM (
                       , subq_2.ds__extract_day
                       , subq_2.ds__extract_dow
                       , subq_2.ds__extract_doy
-                      , subq_2.ds__martian_day
+                      , subq_2.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -219,7 +219,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_2
                   ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index f21543003f..dadb8b4296 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -35,7 +35,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day
+          , subq_6.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -50,7 +50,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets__plan0.sql
index acbd8c3716..72df13fb18 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_10.ds__extract_day
         , subq_10.ds__extract_dow
         , subq_10.ds__extract_doy
-        , subq_10.ds__martian_day
+        , subq_10.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_10
     ) subq_11
@@ -188,7 +188,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -203,7 +203,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql
index eccaeb110f..2d8618ac39 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_time_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql
index c22e27b969..403778bcf8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_nested_offsets_with_where_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index 2948db8845..8b4c08ae67 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index 39283e5cb3..aa37b17858 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -152,7 +152,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -167,7 +167,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql
index 76d4234f72..a0bd143e39 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index 9544ad9a0f..35b2568a4c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -250,7 +250,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -265,7 +265,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql
index 01216b6d17..1fce94770b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -160,7 +160,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -175,7 +175,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql
index 56ac3ee073..22e622abe1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_offset_window_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql
index 2cd16181db..632d0854f0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Postgres/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index d154799b3c..c6c91c5ee1 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_5.ds__extract_day
                 , subq_5.ds__extract_dow
                 , subq_5.ds__extract_doy
-                , subq_5.ds__martian_day
+                , subq_5.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_5
             ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index 3277465bf4..7b5b36b558 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -63,7 +63,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -78,7 +78,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_16006.ds) AS ds__extract_day
                 , CASE WHEN EXTRACT(dow FROM time_spine_src_16006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_16006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_16006.ds) END AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_16006.ds) AS ds__extract_doy
-                , time_spine_src_16006.martian_day AS ds__martian_day
+                , time_spine_src_16006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_16006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
index cb136df293..21f3c31f34 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 42cda10bf6..20314b6a42 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
index ee94869305..96d9650538 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index f2945db9bf..1d129615c5 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index e0afeb0ad2..c4af075aaf 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -503,7 +503,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -518,7 +518,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 46ebc57a98..613d22b80d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -147,7 +147,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -162,7 +162,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -506,7 +506,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -521,7 +521,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index cd0faa42ae..405cb6fb43 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -565,7 +565,7 @@ FROM (
                   , subq_7.ds__extract_day
                   , subq_7.ds__extract_dow
                   , subq_7.ds__extract_doy
-                  , subq_7.ds__martian_day
+                  , subq_7.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -580,7 +580,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
               ) subq_8
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
index 91579076df..d6649446de 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_cumulative_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_5.ds__extract_day
               , subq_5.ds__extract_dow
               , subq_5.ds__extract_doy
-              , subq_5.ds__martian_day
+              , subq_5.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_5
           ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index 02a9c7cdf1..d8cb4b85c3 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
index 44509ef542..1ac84f923d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index 6afb947d60..3924c750c4 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -41,7 +41,7 @@ FROM (
             , subq_10.ds__extract_day
             , subq_10.ds__extract_dow
             , subq_10.ds__extract_doy
-            , subq_10.ds__martian_day
+            , subq_10.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -56,7 +56,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_10
         ) subq_11
@@ -204,7 +204,7 @@ FROM (
                       , subq_2.ds__extract_day
                       , subq_2.ds__extract_dow
                       , subq_2.ds__extract_doy
-                      , subq_2.ds__martian_day
+                      , subq_2.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -219,7 +219,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_2
                   ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index 42ca1d411f..723f310e3b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -35,7 +35,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day
+          , subq_6.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -50,7 +50,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets__plan0.sql
index 340f576ebd..d5473abf43 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_10.ds__extract_day
         , subq_10.ds__extract_dow
         , subq_10.ds__extract_doy
-        , subq_10.ds__martian_day
+        , subq_10.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_10
     ) subq_11
@@ -188,7 +188,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -203,7 +203,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql
index 55dc56531c..24cf5df8e6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_time_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql
index ad34c6b859..39a3e2b560 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_nested_offsets_with_where_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index 286c7cf601..0cf265cce7 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index e61bcf185b..8cc21bc83f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -152,7 +152,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -167,7 +167,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql
index ddd5765176..351c5586a6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index 396bb3c6c5..65fe3bae68 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -250,7 +250,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -265,7 +265,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql
index 4b640e5ba4..a015bde540 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -160,7 +160,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -175,7 +175,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql
index 5badce78bb..8fc5427587 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_offset_window_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql
index 438888dc1d..f7fb10a0b6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Redshift/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index b327b99be6..e981ac026f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_5.ds__extract_day
                 , subq_5.ds__extract_dow
                 , subq_5.ds__extract_doy
-                , subq_5.ds__martian_day
+                , subq_5.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_5
             ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index 1d864a23b2..c272d98b74 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -63,7 +63,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -78,7 +78,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_16006.ds) AS ds__extract_day
                 , EXTRACT(dayofweekiso FROM time_spine_src_16006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_16006.ds) AS ds__extract_doy
-                , time_spine_src_16006.martian_day AS ds__martian_day
+                , time_spine_src_16006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_16006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
index 1c7ecf9901..c634f1cbf2 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 00f2915fad..55ff6d828c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
index 935ae28a82..f7939e4b61 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index a84531ec6d..bcd9cd42c6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index 0879910f85..10b38df387 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -503,7 +503,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -518,7 +518,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 1b349ccd6f..1976c632fb 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -147,7 +147,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -162,7 +162,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -506,7 +506,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -521,7 +521,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index d926420af2..36c1ac5207 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -565,7 +565,7 @@ FROM (
                   , subq_7.ds__extract_day
                   , subq_7.ds__extract_dow
                   , subq_7.ds__extract_doy
-                  , subq_7.ds__martian_day
+                  , subq_7.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -580,7 +580,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
               ) subq_8
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
index a8e8ebe3bc..c87c32b667 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_cumulative_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_5.ds__extract_day
               , subq_5.ds__extract_dow
               , subq_5.ds__extract_doy
-              , subq_5.ds__martian_day
+              , subq_5.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_5
           ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index 72530edfff..8795b28349 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
index f357331ae9..ffb36c50dc 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index fa051fc831..dc306447e9 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -41,7 +41,7 @@ FROM (
             , subq_10.ds__extract_day
             , subq_10.ds__extract_dow
             , subq_10.ds__extract_doy
-            , subq_10.ds__martian_day
+            , subq_10.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -56,7 +56,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_10
         ) subq_11
@@ -204,7 +204,7 @@ FROM (
                       , subq_2.ds__extract_day
                       , subq_2.ds__extract_dow
                       , subq_2.ds__extract_doy
-                      , subq_2.ds__martian_day
+                      , subq_2.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -219,7 +219,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_2
                   ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index 5e603c3bd0..94c517eae9 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -35,7 +35,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day
+          , subq_6.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -50,7 +50,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets__plan0.sql
index 19f6e227c5..730aa4992c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_10.ds__extract_day
         , subq_10.ds__extract_dow
         , subq_10.ds__extract_doy
-        , subq_10.ds__martian_day
+        , subq_10.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_10
     ) subq_11
@@ -188,7 +188,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -203,7 +203,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql
index c757c67664..c9da0edd9b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_time_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql
index f28405cf51..3a1197dbaa 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_nested_offsets_with_where_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index 1db1539c94..bd2f043f53 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index 8775c75c16..d142f771c0 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -152,7 +152,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -167,7 +167,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql
index 14e85b2963..f93bc70027 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index f9cbd3150a..e7151eaf0c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -250,7 +250,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -265,7 +265,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql
index 4613d3e984..fcebc230c9 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -160,7 +160,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -175,7 +175,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql
index 3fbcf5bd15..08cae28b5c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_offset_window_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql
index 2fb429a943..baab5a3c3b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Snowflake/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
index 703519671a..a74406ba1f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_cumulative_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_5.ds__extract_day
                 , subq_5.ds__extract_dow
                 , subq_5.ds__extract_doy
-                , subq_5.ds__martian_day
+                , subq_5.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_5
             ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
index d442ebd253..a862fb9f16 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_month_dimension_and_offset_window__plan0.sql
@@ -63,7 +63,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -78,7 +78,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_16006.ds) AS ds__extract_day
                 , EXTRACT(DAY_OF_WEEK FROM time_spine_src_16006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_16006.ds) AS ds__extract_doy
-                , time_spine_src_16006.martian_day AS ds__martian_day
+                , time_spine_src_16006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_16006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql
index ce5ab1cfc6..d03575f64c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
index 7bb83759ac..33e9c6c2db 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_to_grain_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window__plan0.sql
index 4c7650fe42..347bf5846e 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql
index 184d90cea0..1ee5054b6a 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_granularity__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
index e84001b21c..c1f3ff0880 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -503,7 +503,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -518,7 +518,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
index 5e12e1e8ca..a78ee22831 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_offset_to_grain_and_granularity__plan0.sql
@@ -147,7 +147,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -162,7 +162,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
@@ -506,7 +506,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -521,7 +521,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
index e9dcb18c0c..1a35d069f6 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_metric_with_offset_window_and_time_filter__plan0.sql
@@ -565,7 +565,7 @@ FROM (
                   , subq_7.ds__extract_day
                   , subq_7.ds__extract_dow
                   , subq_7.ds__extract_doy
-                  , subq_7.ds__martian_day
+                  , subq_7.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -580,7 +580,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_7
               ) subq_8
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql
index 15f8d38c7e..ca633d457f 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_cumulative_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_5.ds__extract_day
               , subq_5.ds__extract_dow
               , subq_5.ds__extract_doy
-              , subq_5.ds__martian_day
+              , subq_5.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_5
           ) subq_6
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql
index 8c65e7fa01..3e12c59a41 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_agg_time_dim__plan0.sql
@@ -146,7 +146,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -161,7 +161,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql
index eceb4b028f..23ba4a3d2b 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_derived_offset_metric_with_one_input_metric__plan0.sql
@@ -140,7 +140,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -155,7 +155,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
index 1de55569fd..e99437a3e9 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_offset_with_joined_where_constraint_not_selected__plan0.sql
@@ -41,7 +41,7 @@ FROM (
             , subq_10.ds__extract_day
             , subq_10.ds__extract_dow
             , subq_10.ds__extract_doy
-            , subq_10.ds__martian_day
+            , subq_10.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -56,7 +56,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_10
         ) subq_11
@@ -204,7 +204,7 @@ FROM (
                       , subq_2.ds__extract_day
                       , subq_2.ds__extract_dow
                       , subq_2.ds__extract_doy
-                      , subq_2.ds__martian_day
+                      , subq_2.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -219,7 +219,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_2
                   ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
index 8f326e28e5..5299aad25d 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_derived_metric_with_offset_multiple_input_metrics__plan0.sql
@@ -35,7 +35,7 @@ FROM (
           , subq_6.ds__extract_day
           , subq_6.ds__extract_dow
           , subq_6.ds__extract_doy
-          , subq_6.ds__martian_day
+          , subq_6.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -50,7 +50,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_6
       ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets__plan0.sql
index 86b18355c2..64c93bfc51 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_10.ds__extract_day
         , subq_10.ds__extract_dow
         , subq_10.ds__extract_doy
-        , subq_10.ds__martian_day
+        , subq_10.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_10
     ) subq_11
@@ -188,7 +188,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -203,7 +203,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql
index 32bcafab1f..35c8584121 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_time_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql
index ed78c4e4fb..61940d5834 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_nested_offsets_with_where_constraint__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_10.ds__extract_day
           , subq_10.ds__extract_dow
           , subq_10.ds__extract_doy
-          , subq_10.ds__martian_day
+          , subq_10.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_10
       ) subq_11
@@ -193,7 +193,7 @@ FROM (
                     , subq_2.ds__extract_day
                     , subq_2.ds__extract_dow
                     , subq_2.ds__extract_doy
-                    , subq_2.ds__martian_day
+                    , subq_2.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -208,7 +208,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_2
                 ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
index c644e724d8..401da15f78 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -244,7 +244,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -259,7 +259,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql
index 5f4bbedb18..3d09bb6967 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_metric_multiple_granularities__plan0.sql
@@ -152,7 +152,7 @@ FROM (
               , subq_2.ds__extract_day
               , subq_2.ds__extract_dow
               , subq_2.ds__extract_doy
-              , subq_2.ds__martian_day
+              , subq_2.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -167,7 +167,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_2
           ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql
index b06e2c918a..a1df7c3622 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_to_grain_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
index 9c1e5ec540..22ca14393c 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_filter_and_query_have_different_granularities__plan0.sql
@@ -250,7 +250,7 @@ FROM (
                   , subq_2.ds__extract_day
                   , subq_2.ds__extract_dow
                   , subq_2.ds__extract_doy
-                  , subq_2.ds__martian_day
+                  , subq_2.ds__alien_day
                 FROM (
                   -- Read From Time Spine 'mf_time_spine'
                   SELECT
@@ -265,7 +265,7 @@ FROM (
                     , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                     , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                     , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                    , time_spine_src_28006.martian_day AS ds__martian_day
+                    , time_spine_src_28006.alien_day AS ds__alien_day
                   FROM ***************************.mf_time_spine time_spine_src_28006
                 ) subq_2
               ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql
index a79092a357..ef167f4f63 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_metric_multiple_granularities__plan0.sql
@@ -160,7 +160,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -175,7 +175,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql
index cd6f662ecc..cb77477116 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_offset_window_with_agg_time_dim__plan0.sql
@@ -361,7 +361,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -376,7 +376,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql
index 676939def9..ca1efb27a8 100644
--- a/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_derived_metric_rendering.py/SqlPlan/Trino/test_time_offset_metric_with_time_constraint__plan0.sql
@@ -241,7 +241,7 @@ FROM (
                 , subq_2.ds__extract_day
                 , subq_2.ds__extract_dow
                 , subq_2.ds__extract_doy
-                , subq_2.ds__martian_day
+                , subq_2.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -256,7 +256,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_2
             ) subq_3
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/BigQuery/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/BigQuery/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
index 9aede58d6c..07cd969368 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/BigQuery/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/BigQuery/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_join_to_time_spine_with_custom_grain_in_group_by
 test_filename: test_fill_nulls_with_0.py
 ---
-booking__ds__martian_day    bookings_join_to_time_spine
+booking__ds__alien_day    bookings_join_to_time_spine
 --------------------------  -----------------------------
 2020-01-01T00:00:00         None
 2020-01-02T00:00:00         31
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
index 21c8ca17a6..1faf315752 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/BigQuery/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
@@ -1,5 +1,5 @@
 test_name: test_join_to_timespine_metric_with_custom_granularity_filter
 test_filename: test_fill_nulls_with_0.py
 ---
-metric_time__martian_day    bookings_join_to_time_spine
+metric_time__alien_day    bookings_join_to_time_spine
 --------------------------  -----------------------------
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Databricks/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Databricks/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
index 9aede58d6c..07cd969368 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Databricks/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Databricks/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_join_to_time_spine_with_custom_grain_in_group_by
 test_filename: test_fill_nulls_with_0.py
 ---
-booking__ds__martian_day    bookings_join_to_time_spine
+booking__ds__alien_day    bookings_join_to_time_spine
 --------------------------  -----------------------------
 2020-01-01T00:00:00         None
 2020-01-02T00:00:00         31
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
index 21c8ca17a6..1faf315752 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Databricks/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
@@ -1,5 +1,5 @@
 test_name: test_join_to_timespine_metric_with_custom_granularity_filter
 test_filename: test_fill_nulls_with_0.py
 ---
-metric_time__martian_day    bookings_join_to_time_spine
+metric_time__alien_day    bookings_join_to_time_spine
 --------------------------  -----------------------------
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/DuckDB/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/DuckDB/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
index 9aede58d6c..07cd969368 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/DuckDB/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/DuckDB/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_join_to_time_spine_with_custom_grain_in_group_by
 test_filename: test_fill_nulls_with_0.py
 ---
-booking__ds__martian_day    bookings_join_to_time_spine
+booking__ds__alien_day    bookings_join_to_time_spine
 --------------------------  -----------------------------
 2020-01-01T00:00:00         None
 2020-01-02T00:00:00         31
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
index 21c8ca17a6..1faf315752 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/DuckDB/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
@@ -1,5 +1,5 @@
 test_name: test_join_to_timespine_metric_with_custom_granularity_filter
 test_filename: test_fill_nulls_with_0.py
 ---
-metric_time__martian_day    bookings_join_to_time_spine
+metric_time__alien_day    bookings_join_to_time_spine
 --------------------------  -----------------------------
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Postgres/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Postgres/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
index 9aede58d6c..07cd969368 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Postgres/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Postgres/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_join_to_time_spine_with_custom_grain_in_group_by
 test_filename: test_fill_nulls_with_0.py
 ---
-booking__ds__martian_day    bookings_join_to_time_spine
+booking__ds__alien_day    bookings_join_to_time_spine
 --------------------------  -----------------------------
 2020-01-01T00:00:00         None
 2020-01-02T00:00:00         31
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
index 21c8ca17a6..1faf315752 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Postgres/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
@@ -1,5 +1,5 @@
 test_name: test_join_to_timespine_metric_with_custom_granularity_filter
 test_filename: test_fill_nulls_with_0.py
 ---
-metric_time__martian_day    bookings_join_to_time_spine
+metric_time__alien_day    bookings_join_to_time_spine
 --------------------------  -----------------------------
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Redshift/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Redshift/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
index 9aede58d6c..07cd969368 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Redshift/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Redshift/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_join_to_time_spine_with_custom_grain_in_group_by
 test_filename: test_fill_nulls_with_0.py
 ---
-booking__ds__martian_day    bookings_join_to_time_spine
+booking__ds__alien_day    bookings_join_to_time_spine
 --------------------------  -----------------------------
 2020-01-01T00:00:00         None
 2020-01-02T00:00:00         31
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
index 21c8ca17a6..1faf315752 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Redshift/test_join_to_timespine_metric_with_custom_granularity_filter__query_output.txt
@@ -1,5 +1,5 @@
 test_name: test_join_to_timespine_metric_with_custom_granularity_filter
 test_filename: test_fill_nulls_with_0.py
 ---
-metric_time__martian_day    bookings_join_to_time_spine
+metric_time__alien_day    bookings_join_to_time_spine
 --------------------------  -----------------------------
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Trino/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Trino/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
index 9aede58d6c..07cd969368 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Trino/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_0.py/str/Trino/test_join_to_time_spine_with_custom_grain_in_group_by__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_join_to_time_spine_with_custom_grain_in_group_by
 test_filename: test_fill_nulls_with_0.py
 ---
-booking__ds__martian_day    bookings_join_to_time_spine
+booking__ds__alien_day    bookings_join_to_time_spine
 --------------------------  -----------------------------
 2020-01-01T00:00:00         None
 2020-01-02T00:00:00         31
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql
index 545bb98eb4..bd9601a16a 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_cumulative_fill_nulls__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.ds__martian_day
+        , subq_7.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
           , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_7
     ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index 0bd0f4e43c..75e75ca281 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -40,7 +40,7 @@ FROM (
             , subq_4.ds__extract_day
             , subq_4.ds__extract_dow
             , subq_4.ds__extract_doy
-            , subq_4.ds__martian_day
+            , subq_4.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -55,7 +55,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
               , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_4
         ) subq_5
@@ -407,7 +407,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -422,7 +422,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index 3b4d330573..97fe0bdc52 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index 542d034781..216c10e006 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -30,7 +30,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -61,7 +61,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index ec0cb9e0da..26758d6859 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql
index 500b3c6d0a..07513f3e62 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_filters__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_9.ds__extract_day
           , subq_9.ds__extract_dow
           , subq_9.ds__extract_doy
-          , subq_9.ds__martian_day
+          , subq_9.ds__alien_day
         FROM (
           -- Constrain Output with WHERE
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , subq_8.ds__extract_day
             , subq_8.ds__extract_dow
             , subq_8.ds__extract_doy
-            , subq_8.ds__martian_day
+            , subq_8.ds__alien_day
           FROM (
             -- Change Column Aliases
             SELECT
@@ -64,7 +64,7 @@ FROM (
               , subq_7.ds__extract_day
               , subq_7.ds__extract_dow
               , subq_7.ds__extract_doy
-              , subq_7.ds__martian_day
+              , subq_7.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -79,7 +79,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                 , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_7
           ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index 642096615d..9d7fd80fb7 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
           , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql
index aa0e75701e..e3cc43ab2b 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/BigQuery/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
           , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_cumulative_fill_nulls__plan0.sql
index 18a389f582..61dff719de 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_cumulative_fill_nulls__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.ds__martian_day
+        , subq_7.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_7
     ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index b6b2b91489..9c56915b1c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -40,7 +40,7 @@ FROM (
             , subq_4.ds__extract_day
             , subq_4.ds__extract_dow
             , subq_4.ds__extract_doy
-            , subq_4.ds__martian_day
+            , subq_4.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -55,7 +55,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_4
         ) subq_5
@@ -407,7 +407,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -422,7 +422,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index e1af9aeb58..d7597ed9b9 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index 3f0af2107b..1664255b13 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -30,7 +30,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -61,7 +61,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index ce41018eee..b5064a6384 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql
index 939973879a..a09461ee92 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_filters__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_9.ds__extract_day
           , subq_9.ds__extract_dow
           , subq_9.ds__extract_doy
-          , subq_9.ds__martian_day
+          , subq_9.ds__alien_day
         FROM (
           -- Constrain Output with WHERE
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , subq_8.ds__extract_day
             , subq_8.ds__extract_dow
             , subq_8.ds__extract_doy
-            , subq_8.ds__martian_day
+            , subq_8.ds__alien_day
           FROM (
             -- Change Column Aliases
             SELECT
@@ -64,7 +64,7 @@ FROM (
               , subq_7.ds__extract_day
               , subq_7.ds__extract_dow
               , subq_7.ds__extract_doy
-              , subq_7.ds__martian_day
+              , subq_7.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -79,7 +79,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_7
           ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index cdc375cf9a..d577309ff8 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql
index 8170944d86..3474a5842d 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Databricks/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql
index 5a2f53708e..d326089575 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_cumulative_fill_nulls__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.ds__martian_day
+        , subq_7.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_7
     ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index d23fc3f4a8..355237bb84 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -40,7 +40,7 @@ FROM (
             , subq_4.ds__extract_day
             , subq_4.ds__extract_dow
             , subq_4.ds__extract_doy
-            , subq_4.ds__martian_day
+            , subq_4.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -55,7 +55,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_4
         ) subq_5
@@ -407,7 +407,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -422,7 +422,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index d3cd92a43f..80af390e9f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index 0180ffe119..3b911f3c5f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -30,7 +30,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -61,7 +61,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index e13ab88256..43c5cf0bbc 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql
index 4726764c15..72dfe9b237 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_filters__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_9.ds__extract_day
           , subq_9.ds__extract_dow
           , subq_9.ds__extract_doy
-          , subq_9.ds__martian_day
+          , subq_9.ds__alien_day
         FROM (
           -- Constrain Output with WHERE
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , subq_8.ds__extract_day
             , subq_8.ds__extract_dow
             , subq_8.ds__extract_doy
-            , subq_8.ds__martian_day
+            , subq_8.ds__alien_day
           FROM (
             -- Change Column Aliases
             SELECT
@@ -64,7 +64,7 @@ FROM (
               , subq_7.ds__extract_day
               , subq_7.ds__extract_dow
               , subq_7.ds__extract_doy
-              , subq_7.ds__martian_day
+              , subq_7.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -79,7 +79,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_7
           ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index fb928a6fe2..7a3d2e119c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql
index d3a38d45fd..2f6c47f759 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/DuckDB/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_cumulative_fill_nulls__plan0.sql
index a465512bc9..77aba42862 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_cumulative_fill_nulls__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.ds__martian_day
+        , subq_7.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_7
     ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index a9776f2c07..78105f2745 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -40,7 +40,7 @@ FROM (
             , subq_4.ds__extract_day
             , subq_4.ds__extract_dow
             , subq_4.ds__extract_doy
-            , subq_4.ds__martian_day
+            , subq_4.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -55,7 +55,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_4
         ) subq_5
@@ -407,7 +407,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -422,7 +422,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index 25971a0351..a85d4f9495 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index cb94b85045..6238b9230f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -30,7 +30,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -61,7 +61,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index 024bfed62d..78d29e9554 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql
index 467dfcc709..a98e69ebf7 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_filters__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_9.ds__extract_day
           , subq_9.ds__extract_dow
           , subq_9.ds__extract_doy
-          , subq_9.ds__martian_day
+          , subq_9.ds__alien_day
         FROM (
           -- Constrain Output with WHERE
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , subq_8.ds__extract_day
             , subq_8.ds__extract_dow
             , subq_8.ds__extract_doy
-            , subq_8.ds__martian_day
+            , subq_8.ds__alien_day
           FROM (
             -- Change Column Aliases
             SELECT
@@ -64,7 +64,7 @@ FROM (
               , subq_7.ds__extract_day
               , subq_7.ds__extract_dow
               , subq_7.ds__extract_doy
-              , subq_7.ds__martian_day
+              , subq_7.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -79,7 +79,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_7
           ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index 523269744a..a13cfc8244 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql
index 8e5e82a756..84ba06729f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Postgres/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_cumulative_fill_nulls__plan0.sql
index 644c9d4b85..b44f494dcd 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_cumulative_fill_nulls__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.ds__martian_day
+        , subq_7.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_7
     ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index 61d82df197..31b7ca5375 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -40,7 +40,7 @@ FROM (
             , subq_4.ds__extract_day
             , subq_4.ds__extract_dow
             , subq_4.ds__extract_doy
-            , subq_4.ds__martian_day
+            , subq_4.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -55,7 +55,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_4
         ) subq_5
@@ -407,7 +407,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -422,7 +422,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index 756c463784..9723e67a85 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index 3a0e305f72..476456b2d2 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -30,7 +30,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -61,7 +61,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index d7944f7332..9615f32a63 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql
index eec483afbe..b94a514efe 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_filters__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_9.ds__extract_day
           , subq_9.ds__extract_dow
           , subq_9.ds__extract_doy
-          , subq_9.ds__martian_day
+          , subq_9.ds__alien_day
         FROM (
           -- Constrain Output with WHERE
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , subq_8.ds__extract_day
             , subq_8.ds__extract_dow
             , subq_8.ds__extract_doy
-            , subq_8.ds__martian_day
+            , subq_8.ds__alien_day
           FROM (
             -- Change Column Aliases
             SELECT
@@ -64,7 +64,7 @@ FROM (
               , subq_7.ds__extract_day
               , subq_7.ds__extract_dow
               , subq_7.ds__extract_doy
-              , subq_7.ds__martian_day
+              , subq_7.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -79,7 +79,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_7
           ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index 211ed339c6..83c1323091 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql
index bfc6f4027f..58f4542b2c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Redshift/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql
index fd254f44a9..3940c9b903 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_cumulative_fill_nulls__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.ds__martian_day
+        , subq_7.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_7
     ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index 02d67f383e..afa150c06c 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -40,7 +40,7 @@ FROM (
             , subq_4.ds__extract_day
             , subq_4.ds__extract_dow
             , subq_4.ds__extract_doy
-            , subq_4.ds__martian_day
+            , subq_4.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -55,7 +55,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_4
         ) subq_5
@@ -407,7 +407,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -422,7 +422,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index aa655a7880..f7c05b6243 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index 02ae18658b..b83fa5eeba 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -30,7 +30,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -61,7 +61,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index e769c3f01c..410e495200 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql
index 6521f69a78..bc2cc2d23e 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_filters__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_9.ds__extract_day
           , subq_9.ds__extract_dow
           , subq_9.ds__extract_doy
-          , subq_9.ds__martian_day
+          , subq_9.ds__alien_day
         FROM (
           -- Constrain Output with WHERE
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , subq_8.ds__extract_day
             , subq_8.ds__extract_dow
             , subq_8.ds__extract_doy
-            , subq_8.ds__martian_day
+            , subq_8.ds__alien_day
           FROM (
             -- Change Column Aliases
             SELECT
@@ -64,7 +64,7 @@ FROM (
               , subq_7.ds__extract_day
               , subq_7.ds__extract_dow
               , subq_7.ds__extract_doy
-              , subq_7.ds__martian_day
+              , subq_7.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -79,7 +79,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_7
           ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index 9223480387..55e2c530a1 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql
index 0aabe553b7..fe788aa61b 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Snowflake/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_cumulative_fill_nulls__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_cumulative_fill_nulls__plan0.sql
index 7ef865378e..f477baeaab 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_cumulative_fill_nulls__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_cumulative_fill_nulls__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_7.ds__extract_day
         , subq_7.ds__extract_dow
         , subq_7.ds__extract_doy
-        , subq_7.ds__martian_day
+        , subq_7.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_7
     ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql
index c0b743aa35..a0f5a936a5 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_derived_fill_nulls_for_one_input_metric__plan0.sql
@@ -40,7 +40,7 @@ FROM (
             , subq_4.ds__extract_day
             , subq_4.ds__extract_dow
             , subq_4.ds__extract_doy
-            , subq_4.ds__martian_day
+            , subq_4.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -55,7 +55,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_4
         ) subq_5
@@ -407,7 +407,7 @@ FROM (
                 , subq_10.ds__extract_day
                 , subq_10.ds__extract_dow
                 , subq_10.ds__extract_doy
-                , subq_10.ds__martian_day
+                , subq_10.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -422,7 +422,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_10
             ) subq_11
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
index 63cbb01169..e6a2ac5257 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
index 5ce2d0995e..891842c453 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time__plan0.sql
@@ -30,7 +30,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -61,7 +61,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
index 444b052eac..4c91dd941f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filter_not_in_group_by_using_agg_time_and_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -59,7 +59,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql
index bc3bfe77a2..f15bc9292f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_filters__plan0.sql
@@ -34,7 +34,7 @@ FROM (
           , subq_9.ds__extract_day
           , subq_9.ds__extract_dow
           , subq_9.ds__extract_doy
-          , subq_9.ds__martian_day
+          , subq_9.ds__alien_day
         FROM (
           -- Constrain Output with WHERE
           SELECT
@@ -49,7 +49,7 @@ FROM (
             , subq_8.ds__extract_day
             , subq_8.ds__extract_dow
             , subq_8.ds__extract_doy
-            , subq_8.ds__martian_day
+            , subq_8.ds__alien_day
           FROM (
             -- Change Column Aliases
             SELECT
@@ -64,7 +64,7 @@ FROM (
               , subq_7.ds__extract_day
               , subq_7.ds__extract_dow
               , subq_7.ds__extract_doy
-              , subq_7.ds__martian_day
+              , subq_7.ds__alien_day
             FROM (
               -- Read From Time Spine 'mf_time_spine'
               SELECT
@@ -79,7 +79,7 @@ FROM (
                 , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                 , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                 , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                , time_spine_src_28006.martian_day AS ds__martian_day
+                , time_spine_src_28006.alien_day AS ds__alien_day
               FROM ***************************.mf_time_spine time_spine_src_28006
             ) subq_7
           ) subq_8
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql
index 6e481bf60d..4569d8275f 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_metric_time__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql
index 7fb571d0a2..f0dd00d4bf 100644
--- a/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql
+++ b/tests_metricflow/snapshots/test_fill_nulls_with_rendering.py/SqlPlan/Trino/test_simple_fill_nulls_with_0_month__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_metric_time_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_metric_time_date_part__plan0.sql
index 1e89d710f7..00ab3c6d2b 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_metric_time_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_metric_time_date_part__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
       , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
index d661cebe23..48868cdadb 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/BigQuery/test_offset_window_with_date_part__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow AS metric_time__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                   , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_metric_time_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_metric_time_date_part__plan0.sql
index b817559faf..1f718d4efd 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_metric_time_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_metric_time_date_part__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_offset_window_with_date_part__plan0.sql
index 54a9881ec8..d57bf8e9df 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Databricks/test_offset_window_with_date_part__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow AS metric_time__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_metric_time_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_metric_time_date_part__plan0.sql
index eea1d8ead5..a118ac69ea 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_metric_time_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_metric_time_date_part__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
index 7cc2aba975..b42e46e136 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/DuckDB/test_offset_window_with_date_part__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow AS metric_time__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_metric_time_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_metric_time_date_part__plan0.sql
index 4e3f9dcd59..0df4e1bd99 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_metric_time_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_metric_time_date_part__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_offset_window_with_date_part__plan0.sql
index 0ddad31f69..27e1899aca 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Postgres/test_offset_window_with_date_part__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow AS metric_time__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_metric_time_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_metric_time_date_part__plan0.sql
index 6ffd58aa46..4f7f840b6a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_metric_time_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_metric_time_date_part__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_offset_window_with_date_part__plan0.sql
index a4b6c639a3..b8c4959ba4 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Redshift/test_offset_window_with_date_part__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow AS metric_time__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_metric_time_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_metric_time_date_part__plan0.sql
index cadec4b108..3bda86476a 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_metric_time_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_metric_time_date_part__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
index 6ca9b11b8e..ab661d2196 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Snowflake/test_offset_window_with_date_part__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow AS metric_time__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_metric_time_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_metric_time_date_part__plan0.sql
index 7a017fe4eb..a8eb71dceb 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_metric_time_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_metric_time_date_part__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_offset_window_with_date_part__plan0.sql b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_offset_window_with_date_part__plan0.sql
index d43de7ff8b..ea07b73ef2 100644
--- a/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_offset_window_with_date_part__plan0.sql
+++ b/tests_metricflow/snapshots/test_granularity_date_part_rendering.py/SqlPlan/Trino/test_offset_window_with_date_part__plan0.sql
@@ -362,7 +362,7 @@ FROM (
                 , subq_6.ds__extract_day
                 , subq_6.ds__extract_dow AS metric_time__extract_dow
                 , subq_6.ds__extract_doy
-                , subq_6.ds__martian_day
+                , subq_6.ds__alien_day
               FROM (
                 -- Read From Time Spine 'mf_time_spine'
                 SELECT
@@ -377,7 +377,7 @@ FROM (
                   , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                   , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                   , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                  , time_spine_src_28006.martian_day AS ds__martian_day
+                  , time_spine_src_28006.alien_day AS ds__alien_day
                 FROM ***************************.mf_time_spine time_spine_src_28006
               ) subq_6
             ) subq_7
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql
index 204fa0945b..5b50c1d982 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_dimensions_with_time_constraint__plan0.sql
@@ -208,7 +208,7 @@ FROM (
           , subq_1.ds__extract_day
           , subq_1.ds__extract_dow
           , subq_1.ds__extract_doy
-          , subq_1.ds__martian_day
+          , subq_1.ds__alien_day
           , subq_1.ds__day AS metric_time__day
           , subq_1.ds__week AS metric_time__week
           , subq_1.ds__month AS metric_time__month
@@ -220,7 +220,7 @@ FROM (
           , subq_1.ds__extract_day AS metric_time__extract_day
           , subq_1.ds__extract_dow AS metric_time__extract_dow
           , subq_1.ds__extract_doy AS metric_time__extract_doy
-          , subq_1.ds__martian_day AS metric_time__martian_day
+          , subq_1.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -235,7 +235,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_1
       ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_only__plan0.sql
index db2e1ba1ee..e64174d00e 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_only__plan0.sql
@@ -21,7 +21,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -33,7 +33,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
       , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql
index 8f232846b8..7d80e08239 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_quarter_alone__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
       , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql
index 7763a36b20..c21a718005 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/BigQuery/test_metric_time_with_other_dimensions__plan0.sql
@@ -147,7 +147,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -159,7 +159,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -174,7 +174,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
           , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql
index f67b139ba8..a00c3b748b 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_dimensions_with_time_constraint__plan0.sql
@@ -208,7 +208,7 @@ FROM (
           , subq_1.ds__extract_day
           , subq_1.ds__extract_dow
           , subq_1.ds__extract_doy
-          , subq_1.ds__martian_day
+          , subq_1.ds__alien_day
           , subq_1.ds__day AS metric_time__day
           , subq_1.ds__week AS metric_time__week
           , subq_1.ds__month AS metric_time__month
@@ -220,7 +220,7 @@ FROM (
           , subq_1.ds__extract_day AS metric_time__extract_day
           , subq_1.ds__extract_dow AS metric_time__extract_dow
           , subq_1.ds__extract_doy AS metric_time__extract_doy
-          , subq_1.ds__martian_day AS metric_time__martian_day
+          , subq_1.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -235,7 +235,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_1
       ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_only__plan0.sql
index df27d3f1c5..cde6af29c7 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_only__plan0.sql
@@ -21,7 +21,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -33,7 +33,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_quarter_alone__plan0.sql
index 88745af888..7e0eed9efe 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_quarter_alone__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql
index a8a94d8497..0d1ee12715 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Databricks/test_metric_time_with_other_dimensions__plan0.sql
@@ -147,7 +147,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -159,7 +159,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -174,7 +174,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql
index 4e6c37e317..ab0440b909 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_dimensions_with_time_constraint__plan0.sql
@@ -208,7 +208,7 @@ FROM (
           , subq_1.ds__extract_day
           , subq_1.ds__extract_dow
           , subq_1.ds__extract_doy
-          , subq_1.ds__martian_day
+          , subq_1.ds__alien_day
           , subq_1.ds__day AS metric_time__day
           , subq_1.ds__week AS metric_time__week
           , subq_1.ds__month AS metric_time__month
@@ -220,7 +220,7 @@ FROM (
           , subq_1.ds__extract_day AS metric_time__extract_day
           , subq_1.ds__extract_dow AS metric_time__extract_dow
           , subq_1.ds__extract_doy AS metric_time__extract_doy
-          , subq_1.ds__martian_day AS metric_time__martian_day
+          , subq_1.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -235,7 +235,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_1
       ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_only__plan0.sql
index 23d24347e3..b36548f564 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_only__plan0.sql
@@ -21,7 +21,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -33,7 +33,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql
index 3a6c104c9d..088e07ed55 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_quarter_alone__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql
index 73afc2b0c5..5443af740e 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/DuckDB/test_metric_time_with_other_dimensions__plan0.sql
@@ -147,7 +147,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -159,7 +159,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -174,7 +174,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql
index d2d6325aea..c7071b909c 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_dimensions_with_time_constraint__plan0.sql
@@ -208,7 +208,7 @@ FROM (
           , subq_1.ds__extract_day
           , subq_1.ds__extract_dow
           , subq_1.ds__extract_doy
-          , subq_1.ds__martian_day
+          , subq_1.ds__alien_day
           , subq_1.ds__day AS metric_time__day
           , subq_1.ds__week AS metric_time__week
           , subq_1.ds__month AS metric_time__month
@@ -220,7 +220,7 @@ FROM (
           , subq_1.ds__extract_day AS metric_time__extract_day
           , subq_1.ds__extract_dow AS metric_time__extract_dow
           , subq_1.ds__extract_doy AS metric_time__extract_doy
-          , subq_1.ds__martian_day AS metric_time__martian_day
+          , subq_1.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -235,7 +235,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_1
       ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_only__plan0.sql
index 5dac369396..078b17511c 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_only__plan0.sql
@@ -21,7 +21,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -33,7 +33,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_quarter_alone__plan0.sql
index 34046690bf..f92f27027b 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_quarter_alone__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql
index e79d804b42..91110f7e47 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Postgres/test_metric_time_with_other_dimensions__plan0.sql
@@ -147,7 +147,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -159,7 +159,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -174,7 +174,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql
index 5ca4d4e687..77aca47169 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_dimensions_with_time_constraint__plan0.sql
@@ -208,7 +208,7 @@ FROM (
           , subq_1.ds__extract_day
           , subq_1.ds__extract_dow
           , subq_1.ds__extract_doy
-          , subq_1.ds__martian_day
+          , subq_1.ds__alien_day
           , subq_1.ds__day AS metric_time__day
           , subq_1.ds__week AS metric_time__week
           , subq_1.ds__month AS metric_time__month
@@ -220,7 +220,7 @@ FROM (
           , subq_1.ds__extract_day AS metric_time__extract_day
           , subq_1.ds__extract_dow AS metric_time__extract_dow
           , subq_1.ds__extract_doy AS metric_time__extract_doy
-          , subq_1.ds__martian_day AS metric_time__martian_day
+          , subq_1.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -235,7 +235,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_1
       ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_only__plan0.sql
index 196f557bac..de84ee2303 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_only__plan0.sql
@@ -21,7 +21,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -33,7 +33,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_quarter_alone__plan0.sql
index fbdba485b6..2c68cf3570 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_quarter_alone__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql
index 6c1d358959..8fd0e2065d 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Redshift/test_metric_time_with_other_dimensions__plan0.sql
@@ -147,7 +147,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -159,7 +159,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -174,7 +174,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql
index b64d5e9ebc..f7a85b3669 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_dimensions_with_time_constraint__plan0.sql
@@ -208,7 +208,7 @@ FROM (
           , subq_1.ds__extract_day
           , subq_1.ds__extract_dow
           , subq_1.ds__extract_doy
-          , subq_1.ds__martian_day
+          , subq_1.ds__alien_day
           , subq_1.ds__day AS metric_time__day
           , subq_1.ds__week AS metric_time__week
           , subq_1.ds__month AS metric_time__month
@@ -220,7 +220,7 @@ FROM (
           , subq_1.ds__extract_day AS metric_time__extract_day
           , subq_1.ds__extract_dow AS metric_time__extract_dow
           , subq_1.ds__extract_doy AS metric_time__extract_doy
-          , subq_1.ds__martian_day AS metric_time__martian_day
+          , subq_1.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -235,7 +235,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_1
       ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_only__plan0.sql
index 3f15fa6420..729f825ce6 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_only__plan0.sql
@@ -21,7 +21,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -33,7 +33,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql
index 13fa2c8850..5308858587 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_quarter_alone__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql
index ef0c2368ac..4e0b9e3dbf 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Snowflake/test_metric_time_with_other_dimensions__plan0.sql
@@ -147,7 +147,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -159,7 +159,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -174,7 +174,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_dimensions_with_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_dimensions_with_time_constraint__plan0.sql
index 49e96f2ddf..a6f393fd55 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_dimensions_with_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_dimensions_with_time_constraint__plan0.sql
@@ -208,7 +208,7 @@ FROM (
           , subq_1.ds__extract_day
           , subq_1.ds__extract_dow
           , subq_1.ds__extract_doy
-          , subq_1.ds__martian_day
+          , subq_1.ds__alien_day
           , subq_1.ds__day AS metric_time__day
           , subq_1.ds__week AS metric_time__week
           , subq_1.ds__month AS metric_time__month
@@ -220,7 +220,7 @@ FROM (
           , subq_1.ds__extract_day AS metric_time__extract_day
           , subq_1.ds__extract_dow AS metric_time__extract_dow
           , subq_1.ds__extract_doy AS metric_time__extract_doy
-          , subq_1.ds__martian_day AS metric_time__martian_day
+          , subq_1.ds__alien_day AS metric_time__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -235,7 +235,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_1
       ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_only__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_only__plan0.sql
index dcdcb6c783..b05fabf942 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_only__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_only__plan0.sql
@@ -21,7 +21,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -33,7 +33,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -48,7 +48,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_quarter_alone__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_quarter_alone__plan0.sql
index bbe069fe20..15bd5b051d 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_quarter_alone__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_quarter_alone__plan0.sql
@@ -19,7 +19,7 @@ FROM (
     , subq_0.ds__extract_day
     , subq_0.ds__extract_dow
     , subq_0.ds__extract_doy
-    , subq_0.ds__martian_day
+    , subq_0.ds__alien_day
     , subq_0.ds__day AS metric_time__day
     , subq_0.ds__week AS metric_time__week
     , subq_0.ds__month AS metric_time__month
@@ -31,7 +31,7 @@ FROM (
     , subq_0.ds__extract_day AS metric_time__extract_day
     , subq_0.ds__extract_dow AS metric_time__extract_dow
     , subq_0.ds__extract_doy AS metric_time__extract_doy
-    , subq_0.ds__martian_day AS metric_time__martian_day
+    , subq_0.ds__alien_day AS metric_time__alien_day
   FROM (
     -- Read From Time Spine 'mf_time_spine'
     SELECT
@@ -46,7 +46,7 @@ FROM (
       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
       , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-      , time_spine_src_28006.martian_day AS ds__martian_day
+      , time_spine_src_28006.alien_day AS ds__alien_day
     FROM ***************************.mf_time_spine time_spine_src_28006
   ) subq_0
 ) subq_1
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql
index ab7805e1e0..00711f1e81 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/Trino/test_metric_time_with_other_dimensions__plan0.sql
@@ -147,7 +147,7 @@ FROM (
         , subq_1.ds__extract_day
         , subq_1.ds__extract_dow
         , subq_1.ds__extract_doy
-        , subq_1.ds__martian_day
+        , subq_1.ds__alien_day
         , subq_1.ds__day AS metric_time__day
         , subq_1.ds__week AS metric_time__week
         , subq_1.ds__month AS metric_time__month
@@ -159,7 +159,7 @@ FROM (
         , subq_1.ds__extract_day AS metric_time__extract_day
         , subq_1.ds__extract_dow AS metric_time__extract_dow
         , subq_1.ds__extract_doy AS metric_time__extract_doy
-        , subq_1.ds__martian_day AS metric_time__martian_day
+        , subq_1.ds__alien_day AS metric_time__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -174,7 +174,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_1
     ) subq_2
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_dimensions_with_time_constraint__plan0.xml b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_dimensions_with_time_constraint__plan0.xml
index 03b24f68a4..5169ea44f6 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_dimensions_with_time_constraint__plan0.xml
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_dimensions_with_time_constraint__plan0.xml
@@ -735,7 +735,7 @@ test_filename: test_metric_time_without_metrics.py
                         <!-- col11 =                                               -->
                         <!--   SqlSelectColumn(                                    -->
                         <!--     expr=SqlColumnReferenceExpression(node_id=cr_11), -->
-                        <!--     column_alias='ds__martian_day',                   -->
+                        <!--     column_alias='ds__alien_day',                   -->
                         <!--   )                                                   -->
                         <!-- col12 =                                               -->
                         <!--   SqlSelectColumn(                                    -->
@@ -795,7 +795,7 @@ test_filename: test_metric_time_without_metrics.py
                         <!-- col23 =                                               -->
                         <!--   SqlSelectColumn(                                    -->
                         <!--     expr=SqlColumnReferenceExpression(node_id=cr_23), -->
-                        <!--     column_alias='metric_time__martian_day',          -->
+                        <!--     column_alias='metric_time__alien_day',          -->
                         <!--   )                                                   -->
                         <!-- from_source = SqlSelectStatementNode(node_id=ss_89) -->
                         <!-- where = None -->
@@ -855,7 +855,7 @@ test_filename: test_metric_time_without_metrics.py
                             <!-- col11 =                                                  -->
                             <!--   SqlSelectColumn(                                       -->
                             <!--     expr=SqlColumnReferenceExpression(node_id=cr_28131), -->
-                            <!--     column_alias='ds__martian_day',                      -->
+                            <!--     column_alias='ds__alien_day',                      -->
                             <!--   )                                                      -->
                             <!-- from_source = SqlTableNode(node_id=tfc_28018) -->
                             <!-- where = None -->
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_only__plan0.xml b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_only__plan0.xml
index 7d655c5ffb..55b3b4de04 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_only__plan0.xml
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_only__plan0.xml
@@ -32,7 +32,7 @@ docstring:
             <!-- col10 =                                                                                             -->
             <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_10), column_alias='ds__extract_doy') -->
             <!-- col11 =                                                                                             -->
-            <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_11), column_alias='ds__martian_day') -->
+            <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_11), column_alias='ds__alien_day') -->
             <!-- col12 =                                                                                              -->
             <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_12), column_alias='metric_time__day') -->
             <!-- col13 =                                                                                               -->
@@ -76,7 +76,7 @@ docstring:
             <!-- col23 =                                               -->
             <!--   SqlSelectColumn(                                    -->
             <!--     expr=SqlColumnReferenceExpression(node_id=cr_23), -->
-            <!--     column_alias='metric_time__martian_day',          -->
+            <!--     column_alias='metric_time__alien_day',          -->
             <!--   )                                                   -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_31) -->
             <!-- where = None -->
@@ -102,7 +102,7 @@ docstring:
                 <!-- col11 =                                                  -->
                 <!--   SqlSelectColumn(                                       -->
                 <!--     expr=SqlColumnReferenceExpression(node_id=cr_28131), -->
-                <!--     column_alias='ds__martian_day',                      -->
+                <!--     column_alias='ds__alien_day',                      -->
                 <!--   )                                                      -->
                 <!-- from_source = SqlTableNode(node_id=tfc_28018) -->
                 <!-- where = None -->
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_quarter_alone__plan0.xml b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_quarter_alone__plan0.xml
index 8392266ef9..0efa015567 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_quarter_alone__plan0.xml
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_quarter_alone__plan0.xml
@@ -31,7 +31,7 @@ test_filename: test_metric_time_without_metrics.py
             <!-- col10 =                                                                                             -->
             <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_10), column_alias='ds__extract_doy') -->
             <!-- col11 =                                                                                             -->
-            <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_11), column_alias='ds__martian_day') -->
+            <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_11), column_alias='ds__alien_day') -->
             <!-- col12 =                                                                                              -->
             <!--   SqlSelectColumn(expr=SqlColumnReferenceExpression(node_id=cr_12), column_alias='metric_time__day') -->
             <!-- col13 =                                                                                               -->
@@ -75,7 +75,7 @@ test_filename: test_metric_time_without_metrics.py
             <!-- col23 =                                               -->
             <!--   SqlSelectColumn(                                    -->
             <!--     expr=SqlColumnReferenceExpression(node_id=cr_23), -->
-            <!--     column_alias='metric_time__martian_day',          -->
+            <!--     column_alias='metric_time__alien_day',          -->
             <!--   )                                                   -->
             <!-- from_source = SqlSelectStatementNode(node_id=ss_31) -->
             <!-- where = None -->
@@ -101,7 +101,7 @@ test_filename: test_metric_time_without_metrics.py
                 <!-- col11 =                                                  -->
                 <!--   SqlSelectColumn(                                       -->
                 <!--     expr=SqlColumnReferenceExpression(node_id=cr_28131), -->
-                <!--     column_alias='ds__martian_day',                      -->
+                <!--     column_alias='ds__alien_day',                      -->
                 <!--   )                                                      -->
                 <!-- from_source = SqlTableNode(node_id=tfc_28018) -->
                 <!-- where = None -->
diff --git a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_with_other_dimensions__plan0.xml b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_with_other_dimensions__plan0.xml
index ff82750016..9f60372d72 100644
--- a/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_with_other_dimensions__plan0.xml
+++ b/tests_metricflow/snapshots/test_metric_time_without_metrics.py/SqlPlan/test_metric_time_with_other_dimensions__plan0.xml
@@ -484,7 +484,7 @@ test_filename: test_metric_time_without_metrics.py
                     <!-- col11 =                                               -->
                     <!--   SqlSelectColumn(                                    -->
                     <!--     expr=SqlColumnReferenceExpression(node_id=cr_11), -->
-                    <!--     column_alias='ds__martian_day',                   -->
+                    <!--     column_alias='ds__alien_day',                   -->
                     <!--   )                                                   -->
                     <!-- col12 =                                               -->
                     <!--   SqlSelectColumn(                                    -->
@@ -544,7 +544,7 @@ test_filename: test_metric_time_without_metrics.py
                     <!-- col23 =                                               -->
                     <!--   SqlSelectColumn(                                    -->
                     <!--     expr=SqlColumnReferenceExpression(node_id=cr_23), -->
-                    <!--     column_alias='metric_time__martian_day',          -->
+                    <!--     column_alias='metric_time__alien_day',          -->
                     <!--   )                                                   -->
                     <!-- from_source = SqlSelectStatementNode(node_id=ss_89) -->
                     <!-- where = None -->
@@ -598,7 +598,7 @@ test_filename: test_metric_time_without_metrics.py
                         <!-- col11 =                                                  -->
                         <!--   SqlSelectColumn(                                       -->
                         <!--     expr=SqlColumnReferenceExpression(node_id=cr_28131), -->
-                        <!--     column_alias='ds__martian_day',                      -->
+                        <!--     column_alias='ds__alien_day',                      -->
                         <!--   )                                                      -->
                         <!-- from_source = SqlTableNode(node_id=tfc_28018) -->
                         <!-- where = None -->
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_base_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_base_grain__query_output.txt
index 26c7c1a8b3..908eff075d 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_base_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_base_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_base_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    metric_time__day     bookings    bookings_offset_one_martian_day
+metric_time__alien_day    metric_time__day     bookings    bookings_offset_one_alien_day
 --------------------------  -------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2019-12-01T00:00:00  1           None
 2020-01-02T00:00:00         2019-12-18T00:00:00  10          None
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_grains_and_date_part__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_grains_and_date_part__query_output.txt
index 1f9e5a7fdb..bafd1a4497 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_grains_and_date_part__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_grains_and_date_part__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_custom_offset_window_with_grains_and_date_part
 test_filename: test_offset_metrics.py
 ---
-metric_time__martian_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_alien_day
 --------------------------  --------------------  ---------------------------  ---------------------------------
 2020-01-03T00:00:00         2029-11-01T00:00:00                          2029                                  1
 2020-01-03T00:00:00         2029-12-01T00:00:00                          2029                                 30
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_matching_custom_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_matching_custom_grain__query_output.txt
index a7f2fef9fc..9d33f90cc2 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_matching_custom_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/BigQuery/test_custom_offset_window_with_matching_custom_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_matching_custom_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    booking__ds__martian_day    bookings    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__alien_day    bookings    bookings_offset_one_alien_day
 --------------------------  --------------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2020-01-02T00:00:00         31          None
 2020-01-03T00:00:00         2020-01-03T00:00:00         15          31
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_base_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_base_grain__query_output.txt
index 26c7c1a8b3..908eff075d 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_base_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_base_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_base_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    metric_time__day     bookings    bookings_offset_one_martian_day
+metric_time__alien_day    metric_time__day     bookings    bookings_offset_one_alien_day
 --------------------------  -------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2019-12-01T00:00:00  1           None
 2020-01-02T00:00:00         2019-12-18T00:00:00  10          None
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_grains_and_date_part__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_grains_and_date_part__query_output.txt
index 1f9e5a7fdb..bafd1a4497 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_grains_and_date_part__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_grains_and_date_part__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_custom_offset_window_with_grains_and_date_part
 test_filename: test_offset_metrics.py
 ---
-metric_time__martian_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_alien_day
 --------------------------  --------------------  ---------------------------  ---------------------------------
 2020-01-03T00:00:00         2029-11-01T00:00:00                          2029                                  1
 2020-01-03T00:00:00         2029-12-01T00:00:00                          2029                                 30
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_matching_custom_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_matching_custom_grain__query_output.txt
index a7f2fef9fc..9d33f90cc2 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_matching_custom_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Databricks/test_custom_offset_window_with_matching_custom_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_matching_custom_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    booking__ds__martian_day    bookings    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__alien_day    bookings    bookings_offset_one_alien_day
 --------------------------  --------------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2020-01-02T00:00:00         31          None
 2020-01-03T00:00:00         2020-01-03T00:00:00         15          31
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_base_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_base_grain__query_output.txt
index 26c7c1a8b3..908eff075d 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_base_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_base_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_base_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    metric_time__day     bookings    bookings_offset_one_martian_day
+metric_time__alien_day    metric_time__day     bookings    bookings_offset_one_alien_day
 --------------------------  -------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2019-12-01T00:00:00  1           None
 2020-01-02T00:00:00         2019-12-18T00:00:00  10          None
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_grains_and_date_part__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_grains_and_date_part__query_output.txt
index 1f9e5a7fdb..bafd1a4497 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_grains_and_date_part__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_grains_and_date_part__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_custom_offset_window_with_grains_and_date_part
 test_filename: test_offset_metrics.py
 ---
-metric_time__martian_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_alien_day
 --------------------------  --------------------  ---------------------------  ---------------------------------
 2020-01-03T00:00:00         2029-11-01T00:00:00                          2029                                  1
 2020-01-03T00:00:00         2029-12-01T00:00:00                          2029                                 30
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_matching_custom_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_matching_custom_grain__query_output.txt
index a7f2fef9fc..9d33f90cc2 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_matching_custom_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/DuckDB/test_custom_offset_window_with_matching_custom_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_matching_custom_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    booking__ds__martian_day    bookings    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__alien_day    bookings    bookings_offset_one_alien_day
 --------------------------  --------------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2020-01-02T00:00:00         31          None
 2020-01-03T00:00:00         2020-01-03T00:00:00         15          31
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_base_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_base_grain__query_output.txt
index 26c7c1a8b3..908eff075d 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_base_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_base_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_base_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    metric_time__day     bookings    bookings_offset_one_martian_day
+metric_time__alien_day    metric_time__day     bookings    bookings_offset_one_alien_day
 --------------------------  -------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2019-12-01T00:00:00  1           None
 2020-01-02T00:00:00         2019-12-18T00:00:00  10          None
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_grains_and_date_part__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_grains_and_date_part__query_output.txt
index 1f9e5a7fdb..bafd1a4497 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_grains_and_date_part__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_grains_and_date_part__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_custom_offset_window_with_grains_and_date_part
 test_filename: test_offset_metrics.py
 ---
-metric_time__martian_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_alien_day
 --------------------------  --------------------  ---------------------------  ---------------------------------
 2020-01-03T00:00:00         2029-11-01T00:00:00                          2029                                  1
 2020-01-03T00:00:00         2029-12-01T00:00:00                          2029                                 30
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_matching_custom_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_matching_custom_grain__query_output.txt
index a7f2fef9fc..9d33f90cc2 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_matching_custom_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Postgres/test_custom_offset_window_with_matching_custom_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_matching_custom_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    booking__ds__martian_day    bookings    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__alien_day    bookings    bookings_offset_one_alien_day
 --------------------------  --------------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2020-01-02T00:00:00         31          None
 2020-01-03T00:00:00         2020-01-03T00:00:00         15          31
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_base_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_base_grain__query_output.txt
index 26c7c1a8b3..908eff075d 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_base_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_base_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_base_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    metric_time__day     bookings    bookings_offset_one_martian_day
+metric_time__alien_day    metric_time__day     bookings    bookings_offset_one_alien_day
 --------------------------  -------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2019-12-01T00:00:00  1           None
 2020-01-02T00:00:00         2019-12-18T00:00:00  10          None
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_grains_and_date_part__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_grains_and_date_part__query_output.txt
index 1f9e5a7fdb..bafd1a4497 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_grains_and_date_part__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_grains_and_date_part__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_custom_offset_window_with_grains_and_date_part
 test_filename: test_offset_metrics.py
 ---
-metric_time__martian_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_alien_day
 --------------------------  --------------------  ---------------------------  ---------------------------------
 2020-01-03T00:00:00         2029-11-01T00:00:00                          2029                                  1
 2020-01-03T00:00:00         2029-12-01T00:00:00                          2029                                 30
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_matching_custom_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_matching_custom_grain__query_output.txt
index a7f2fef9fc..9d33f90cc2 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_matching_custom_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Redshift/test_custom_offset_window_with_matching_custom_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_matching_custom_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    booking__ds__martian_day    bookings    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__alien_day    bookings    bookings_offset_one_alien_day
 --------------------------  --------------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2020-01-02T00:00:00         31          None
 2020-01-03T00:00:00         2020-01-03T00:00:00         15          31
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Snowflake/test_custom_offset_window_with_base_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Snowflake/test_custom_offset_window_with_base_grain__query_output.txt
index 44d20eaa20..9b9cf2f30b 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Snowflake/test_custom_offset_window_with_base_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Snowflake/test_custom_offset_window_with_base_grain__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_custom_offset_window_with_base_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
 METRIC_TIME__MARTIAN_DAY    METRIC_TIME__DAY     BOOKINGS    BOOKINGS_OFFSET_ONE_MARTIAN_DAY
 --------------------------  -------------------  ----------  ---------------------------------
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Snowflake/test_custom_offset_window_with_matching_custom_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Snowflake/test_custom_offset_window_with_matching_custom_grain__query_output.txt
index c53c4aa00b..5f46746f9f 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Snowflake/test_custom_offset_window_with_matching_custom_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Snowflake/test_custom_offset_window_with_matching_custom_grain__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_custom_offset_window_with_matching_custom_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
 METRIC_TIME__MARTIAN_DAY    BOOKING__DS__MARTIAN_DAY    BOOKINGS    BOOKINGS_OFFSET_ONE_MARTIAN_DAY
 --------------------------  --------------------------  ----------  ---------------------------------
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_base_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_base_grain__query_output.txt
index 26c7c1a8b3..908eff075d 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_base_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_base_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_base_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    metric_time__day     bookings    bookings_offset_one_martian_day
+metric_time__alien_day    metric_time__day     bookings    bookings_offset_one_alien_day
 --------------------------  -------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2019-12-01T00:00:00  1           None
 2020-01-02T00:00:00         2019-12-18T00:00:00  10          None
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_grains_and_date_part__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_grains_and_date_part__query_output.txt
index 1f9e5a7fdb..bafd1a4497 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_grains_and_date_part__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_grains_and_date_part__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_custom_offset_window_with_grains_and_date_part
 test_filename: test_offset_metrics.py
 ---
-metric_time__martian_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__month      metric_time__extract_year    bookings_offset_one_alien_day
 --------------------------  --------------------  ---------------------------  ---------------------------------
 2020-01-03T00:00:00         2029-11-01T00:00:00                          2029                                  1
 2020-01-03T00:00:00         2029-12-01T00:00:00                          2029                                 30
diff --git a/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_matching_custom_grain__query_output.txt b/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_matching_custom_grain__query_output.txt
index a7f2fef9fc..9d33f90cc2 100644
--- a/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_matching_custom_grain__query_output.txt
+++ b/tests_metricflow/snapshots/test_offset_metrics.py/str/Trino/test_custom_offset_window_with_matching_custom_grain__query_output.txt
@@ -1,9 +1,9 @@
 test_name: test_custom_offset_window_with_matching_custom_grain
 test_filename: test_offset_metrics.py
 docstring:
-  Gives a side by side comparison of bookings and bookings_offset_one_martian_day.
+  Gives a side by side comparison of bookings and bookings_offset_one_alien_day.
 ---
-metric_time__martian_day    booking__ds__martian_day    bookings    bookings_offset_one_martian_day
+metric_time__alien_day    booking__ds__alien_day    bookings    bookings_offset_one_alien_day
 --------------------------  --------------------------  ----------  ---------------------------------
 2020-01-02T00:00:00         2020-01-02T00:00:00         31          None
 2020-01-03T00:00:00         2020-01-03T00:00:00         15          31
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index 195189513e..37cddb41e8 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -48,7 +48,7 @@ FROM (
             , subq_9.ds__extract_day
             , subq_9.ds__extract_dow
             , subq_9.ds__extract_doy
-            , subq_9.ds__martian_day
+            , subq_9.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -63,7 +63,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
               , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_9
         ) subq_10
@@ -661,7 +661,7 @@ FROM (
             , subq_25.ds__extract_day
             , subq_25.ds__extract_dow
             , subq_25.ds__extract_doy
-            , subq_25.ds__martian_day
+            , subq_25.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -676,7 +676,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
               , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_25
         ) subq_26
@@ -1016,7 +1016,7 @@ FROM (
                       , subq_15.ds__extract_day
                       , subq_15.ds__extract_dow
                       , subq_15.ds__extract_doy
-                      , subq_15.ds__martian_day
+                      , subq_15.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -1031,7 +1031,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                         , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_15
                   ) subq_16
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql
index 300a5e933e..3096727ba9 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_offset_metric_with_query_time_filters__plan0.sql
@@ -925,7 +925,7 @@ FROM (
                     , subq_11.ds__extract_day
                     , subq_11.ds__extract_dow
                     , subq_11.ds__extract_doy
-                    , subq_11.ds__martian_day
+                    , subq_11.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -940,7 +940,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
                       , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_11
                 ) subq_12
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 660a39f42a..655536928e 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -41,7 +41,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -56,7 +56,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index a9cbb5851a..1559b50077 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -48,7 +48,7 @@ FROM (
             , subq_9.ds__extract_day
             , subq_9.ds__extract_dow
             , subq_9.ds__extract_doy
-            , subq_9.ds__martian_day
+            , subq_9.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -63,7 +63,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_9
         ) subq_10
@@ -661,7 +661,7 @@ FROM (
             , subq_25.ds__extract_day
             , subq_25.ds__extract_dow
             , subq_25.ds__extract_doy
-            , subq_25.ds__martian_day
+            , subq_25.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -676,7 +676,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_25
         ) subq_26
@@ -1016,7 +1016,7 @@ FROM (
                       , subq_15.ds__extract_day
                       , subq_15.ds__extract_dow
                       , subq_15.ds__extract_doy
-                      , subq_15.ds__martian_day
+                      , subq_15.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -1031,7 +1031,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_15
                   ) subq_16
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql
index d106a2bc70..4fa24994e2 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_offset_metric_with_query_time_filters__plan0.sql
@@ -925,7 +925,7 @@ FROM (
                     , subq_11.ds__extract_day
                     , subq_11.ds__extract_dow
                     , subq_11.ds__extract_doy
-                    , subq_11.ds__martian_day
+                    , subq_11.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -940,7 +940,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_11
                 ) subq_12
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 3555ca0805..18cf2bd20b 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -41,7 +41,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -56,7 +56,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index abb1abcb3d..ec63233340 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -48,7 +48,7 @@ FROM (
             , subq_9.ds__extract_day
             , subq_9.ds__extract_dow
             , subq_9.ds__extract_doy
-            , subq_9.ds__martian_day
+            , subq_9.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -63,7 +63,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_9
         ) subq_10
@@ -661,7 +661,7 @@ FROM (
             , subq_25.ds__extract_day
             , subq_25.ds__extract_dow
             , subq_25.ds__extract_doy
-            , subq_25.ds__martian_day
+            , subq_25.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -676,7 +676,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_25
         ) subq_26
@@ -1016,7 +1016,7 @@ FROM (
                       , subq_15.ds__extract_day
                       , subq_15.ds__extract_dow
                       , subq_15.ds__extract_doy
-                      , subq_15.ds__martian_day
+                      , subq_15.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -1031,7 +1031,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_15
                   ) subq_16
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql
index bdfb5c8f39..add0a9e8e2 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_offset_metric_with_query_time_filters__plan0.sql
@@ -925,7 +925,7 @@ FROM (
                     , subq_11.ds__extract_day
                     , subq_11.ds__extract_dow
                     , subq_11.ds__extract_doy
-                    , subq_11.ds__martian_day
+                    , subq_11.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -940,7 +940,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_11
                 ) subq_12
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 6f3912a0f2..1c96ef158f 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -41,7 +41,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -56,7 +56,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index 7ef6e02176..287a1d422d 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -48,7 +48,7 @@ FROM (
             , subq_9.ds__extract_day
             , subq_9.ds__extract_dow
             , subq_9.ds__extract_doy
-            , subq_9.ds__martian_day
+            , subq_9.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -63,7 +63,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_9
         ) subq_10
@@ -661,7 +661,7 @@ FROM (
             , subq_25.ds__extract_day
             , subq_25.ds__extract_dow
             , subq_25.ds__extract_doy
-            , subq_25.ds__martian_day
+            , subq_25.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -676,7 +676,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_25
         ) subq_26
@@ -1016,7 +1016,7 @@ FROM (
                       , subq_15.ds__extract_day
                       , subq_15.ds__extract_dow
                       , subq_15.ds__extract_doy
-                      , subq_15.ds__martian_day
+                      , subq_15.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -1031,7 +1031,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_15
                   ) subq_16
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql
index 65e8578f15..e0569b351c 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_offset_metric_with_query_time_filters__plan0.sql
@@ -925,7 +925,7 @@ FROM (
                     , subq_11.ds__extract_day
                     , subq_11.ds__extract_dow
                     , subq_11.ds__extract_doy
-                    , subq_11.ds__martian_day
+                    , subq_11.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -940,7 +940,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_11
                 ) subq_12
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 3d9ba574c4..33e60927b2 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -41,7 +41,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -56,7 +56,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index 3047adac44..32754e6322 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -48,7 +48,7 @@ FROM (
             , subq_9.ds__extract_day
             , subq_9.ds__extract_dow
             , subq_9.ds__extract_doy
-            , subq_9.ds__martian_day
+            , subq_9.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -63,7 +63,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_9
         ) subq_10
@@ -661,7 +661,7 @@ FROM (
             , subq_25.ds__extract_day
             , subq_25.ds__extract_dow
             , subq_25.ds__extract_doy
-            , subq_25.ds__martian_day
+            , subq_25.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -676,7 +676,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_25
         ) subq_26
@@ -1016,7 +1016,7 @@ FROM (
                       , subq_15.ds__extract_day
                       , subq_15.ds__extract_dow
                       , subq_15.ds__extract_doy
-                      , subq_15.ds__martian_day
+                      , subq_15.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -1031,7 +1031,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_15
                   ) subq_16
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql
index b15668749b..9d5970a479 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_offset_metric_with_query_time_filters__plan0.sql
@@ -925,7 +925,7 @@ FROM (
                     , subq_11.ds__extract_day
                     , subq_11.ds__extract_dow
                     , subq_11.ds__extract_doy
-                    , subq_11.ds__martian_day
+                    , subq_11.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -940,7 +940,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_11
                 ) subq_12
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 1c297a859a..89f9103d53 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -41,7 +41,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -56,7 +56,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index 460e7f9eb0..3f2af8472e 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -48,7 +48,7 @@ FROM (
             , subq_9.ds__extract_day
             , subq_9.ds__extract_dow
             , subq_9.ds__extract_doy
-            , subq_9.ds__martian_day
+            , subq_9.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -63,7 +63,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_9
         ) subq_10
@@ -661,7 +661,7 @@ FROM (
             , subq_25.ds__extract_day
             , subq_25.ds__extract_dow
             , subq_25.ds__extract_doy
-            , subq_25.ds__martian_day
+            , subq_25.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -676,7 +676,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_25
         ) subq_26
@@ -1016,7 +1016,7 @@ FROM (
                       , subq_15.ds__extract_day
                       , subq_15.ds__extract_dow
                       , subq_15.ds__extract_doy
-                      , subq_15.ds__martian_day
+                      , subq_15.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -1031,7 +1031,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_15
                   ) subq_16
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql
index 1968e60dfe..8aec15bdf9 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_offset_metric_with_query_time_filters__plan0.sql
@@ -925,7 +925,7 @@ FROM (
                     , subq_11.ds__extract_day
                     , subq_11.ds__extract_dow
                     , subq_11.ds__extract_doy
-                    , subq_11.ds__martian_day
+                    , subq_11.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -940,7 +940,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_11
                 ) subq_12
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 14fca44e7d..9e9a2966f3 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -41,7 +41,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -56,7 +56,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
index 4777e348a3..b768460bce 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_fill_nulls_time_spine_metric_predicate_pushdown__plan0.sql
@@ -48,7 +48,7 @@ FROM (
             , subq_9.ds__extract_day
             , subq_9.ds__extract_dow
             , subq_9.ds__extract_doy
-            , subq_9.ds__martian_day
+            , subq_9.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -63,7 +63,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_9
         ) subq_10
@@ -661,7 +661,7 @@ FROM (
             , subq_25.ds__extract_day
             , subq_25.ds__extract_dow
             , subq_25.ds__extract_doy
-            , subq_25.ds__martian_day
+            , subq_25.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -676,7 +676,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_25
         ) subq_26
@@ -1016,7 +1016,7 @@ FROM (
                       , subq_15.ds__extract_day
                       , subq_15.ds__extract_dow
                       , subq_15.ds__extract_doy
-                      , subq_15.ds__martian_day
+                      , subq_15.ds__alien_day
                     FROM (
                       -- Read From Time Spine 'mf_time_spine'
                       SELECT
@@ -1031,7 +1031,7 @@ FROM (
                         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                         , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                        , time_spine_src_28006.martian_day AS ds__martian_day
+                        , time_spine_src_28006.alien_day AS ds__alien_day
                       FROM ***************************.mf_time_spine time_spine_src_28006
                     ) subq_15
                   ) subq_16
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql
index c97963738c..a4cf73bcb5 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_offset_metric_with_query_time_filters__plan0.sql
@@ -925,7 +925,7 @@ FROM (
                     , subq_11.ds__extract_day
                     , subq_11.ds__extract_dow
                     , subq_11.ds__extract_doy
-                    , subq_11.ds__martian_day
+                    , subq_11.ds__alien_day
                   FROM (
                     -- Read From Time Spine 'mf_time_spine'
                     SELECT
@@ -940,7 +940,7 @@ FROM (
                       , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
                       , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
                       , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-                      , time_spine_src_28006.martian_day AS ds__martian_day
+                      , time_spine_src_28006.alien_day AS ds__alien_day
                     FROM ***************************.mf_time_spine time_spine_src_28006
                   ) subq_11
                 ) subq_12
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
index 76d4c88286..485ca4b649 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_pushdown_filter_application__plan0.sql
@@ -41,7 +41,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -56,7 +56,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_query_output.py/str/DuckDB/test_multiple_time_spines__query_output.txt b/tests_metricflow/snapshots/test_query_output.py/str/DuckDB/test_multiple_time_spines__query_output.txt
index c16b8cd25b..f55f22dab1 100644
--- a/tests_metricflow/snapshots/test_query_output.py/str/DuckDB/test_multiple_time_spines__query_output.txt
+++ b/tests_metricflow/snapshots/test_query_output.py/str/DuckDB/test_multiple_time_spines__query_output.txt
@@ -1,7 +1,7 @@
 test_name: test_multiple_time_spines
 test_filename: test_query_output.py
 ---
-metric_time__martian_day    metric_time__hour    subdaily_join_to_time_spine_metric    subdaily_cumulative_window_metric    archived_users_offset_1_martian_day
+metric_time__alien_day    metric_time__hour    subdaily_join_to_time_spine_metric    subdaily_cumulative_window_metric    archived_users_offset_1_alien_day
 --------------------------  -------------------  ------------------------------------  -----------------------------------  -------------------------------------
 2020-01-02T00:00:00         2019-12-28T00:00:00  None                                  None                                 None
 2020-01-02T00:00:00         2019-12-28T01:00:00  None                                  None                                 None
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time__plan0.sql
index c5a238d466..56f2ab4f29 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
         , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time_week__plan0.sql
index 99fb54f888..d5418ea0f0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/BigQuery/test_min_max_metric_time_week__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
         , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time__plan0.sql
index 68327fbec9..8f299ca4d0 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time_week__plan0.sql
index 7b4f927116..839faf366a 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Databricks/test_min_max_metric_time_week__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time__plan0.sql
index 5ae9455a2d..33eae4250d 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time_week__plan0.sql
index 3fed88edb1..e9842a9aec 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/DuckDB/test_min_max_metric_time_week__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time__plan0.sql
index 41e1db11dc..c2260a0fd9 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time_week__plan0.sql
index 6144d5b142..c980b17683 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Postgres/test_min_max_metric_time_week__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time__plan0.sql
index f03cc14a7f..0e0a0afd73 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time_week__plan0.sql
index 709be0898c..82887bf31e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Redshift/test_min_max_metric_time_week__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time__plan0.sql
index d4cebb1bf8..311a33a68f 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time_week__plan0.sql
index e14f877769..98a6c4cb7e 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Snowflake/test_min_max_metric_time_week__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time__plan0.sql
index ee9846830d..9eb15f6192 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time_week__plan0.sql b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time_week__plan0.sql
index 296bb6b2d6..a42aa07b49 100644
--- a/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time_week__plan0.sql
+++ b/tests_metricflow/snapshots/test_query_rendering.py/SqlPlan/Trino/test_min_max_metric_time_week__plan0.sql
@@ -26,7 +26,7 @@ FROM (
       , subq_0.ds__extract_day
       , subq_0.ds__extract_dow
       , subq_0.ds__extract_doy
-      , subq_0.ds__martian_day
+      , subq_0.ds__alien_day
       , subq_0.ds__day AS metric_time__day
       , subq_0.ds__week AS metric_time__week
       , subq_0.ds__month AS metric_time__month
@@ -38,7 +38,7 @@ FROM (
       , subq_0.ds__extract_day AS metric_time__extract_day
       , subq_0.ds__extract_dow AS metric_time__extract_dow
       , subq_0.ds__extract_doy AS metric_time__extract_doy
-      , subq_0.ds__martian_day AS metric_time__martian_day
+      , subq_0.ds__alien_day AS metric_time__alien_day
     FROM (
       -- Read From Time Spine 'mf_time_spine'
       SELECT
@@ -53,7 +53,7 @@ FROM (
         , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
         , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
         , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-        , time_spine_src_28006.martian_day AS ds__martian_day
+        , time_spine_src_28006.alien_day AS ds__alien_day
       FROM ***************************.mf_time_spine time_spine_src_28006
     ) subq_0
   ) subq_1
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index fd297867dc..df95e859d4 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -35,7 +35,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -50,7 +50,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -65,7 +65,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index 94fd2b7f9f..36c5ab1a7c 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -36,7 +36,7 @@ FROM (
           , subq_7.ds__extract_day
           , subq_7.ds__extract_dow
           , subq_7.ds__extract_doy
-          , subq_7.ds__martian_day
+          , subq_7.ds__alien_day
         FROM (
           -- Change Column Aliases
           SELECT
@@ -51,7 +51,7 @@ FROM (
             , subq_6.ds__extract_day
             , subq_6.ds__extract_dow
             , subq_6.ds__extract_doy
-            , subq_6.ds__martian_day
+            , subq_6.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -66,7 +66,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
               , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_6
         ) subq_7
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql
index 9e53ac1831..a49f52d797 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
           , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql
index fd9fc95287..51d6316420 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -31,7 +31,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day
+        , subq_5.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
           , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index 640e7629c6..a152701bab 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/BigQuery/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -39,7 +39,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -54,7 +54,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
             , EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index e65a6a29ef..0dc0377633 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -35,7 +35,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -50,7 +50,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -65,7 +65,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index 57869ff167..4eb35c037c 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -36,7 +36,7 @@ FROM (
           , subq_7.ds__extract_day
           , subq_7.ds__extract_dow
           , subq_7.ds__extract_doy
-          , subq_7.ds__martian_day
+          , subq_7.ds__alien_day
         FROM (
           -- Change Column Aliases
           SELECT
@@ -51,7 +51,7 @@ FROM (
             , subq_6.ds__extract_day
             , subq_6.ds__extract_dow
             , subq_6.ds__extract_doy
-            , subq_6.ds__martian_day
+            , subq_6.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -66,7 +66,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_6
         ) subq_7
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine__plan0.sql
index 1e595dadfe..1a9b1f5799 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql
index 6d591f1d2c..9b3297f9c3 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -31,7 +31,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day
+        , subq_5.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index 7192e9886b..22522d8194 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Databricks/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -39,7 +39,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -54,7 +54,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index f29c887bdc..6b1070347c 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -35,7 +35,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -50,7 +50,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -65,7 +65,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index ce28eb2ed8..bed40c366d 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -36,7 +36,7 @@ FROM (
           , subq_7.ds__extract_day
           , subq_7.ds__extract_dow
           , subq_7.ds__extract_doy
-          , subq_7.ds__martian_day
+          , subq_7.ds__alien_day
         FROM (
           -- Change Column Aliases
           SELECT
@@ -51,7 +51,7 @@ FROM (
             , subq_6.ds__extract_day
             , subq_6.ds__extract_dow
             , subq_6.ds__extract_doy
-            , subq_6.ds__martian_day
+            , subq_6.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -66,7 +66,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_6
         ) subq_7
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql
index 8373b2e1ac..4c3b34f861 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql
index 25f0fac727..4c592316aa 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -31,7 +31,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day
+        , subq_5.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index 78fa8c8831..70f5e3df5e 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/DuckDB/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -39,7 +39,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -54,7 +54,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index 62e01364f5..68ebec58c6 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -35,7 +35,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -50,7 +50,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -65,7 +65,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index 2e7c5cfa49..df0100d762 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -36,7 +36,7 @@ FROM (
           , subq_7.ds__extract_day
           , subq_7.ds__extract_dow
           , subq_7.ds__extract_doy
-          , subq_7.ds__martian_day
+          , subq_7.ds__alien_day
         FROM (
           -- Change Column Aliases
           SELECT
@@ -51,7 +51,7 @@ FROM (
             , subq_6.ds__extract_day
             , subq_6.ds__extract_dow
             , subq_6.ds__extract_doy
-            , subq_6.ds__martian_day
+            , subq_6.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -66,7 +66,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_6
         ) subq_7
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine__plan0.sql
index 1980c43027..584cf77cc1 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql
index 1606658406..04f150d9e2 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -31,7 +31,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day
+        , subq_5.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index 0161b5187f..fcd563816e 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Postgres/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -39,7 +39,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -54,7 +54,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(isodow FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index c9da5aaf9a..69ae190ac3 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -35,7 +35,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -50,7 +50,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -65,7 +65,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index 0e5ce34ecb..63c8a15337 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -36,7 +36,7 @@ FROM (
           , subq_7.ds__extract_day
           , subq_7.ds__extract_dow
           , subq_7.ds__extract_doy
-          , subq_7.ds__martian_day
+          , subq_7.ds__alien_day
         FROM (
           -- Change Column Aliases
           SELECT
@@ -51,7 +51,7 @@ FROM (
             , subq_6.ds__extract_day
             , subq_6.ds__extract_dow
             , subq_6.ds__extract_doy
-            , subq_6.ds__martian_day
+            , subq_6.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -66,7 +66,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_6
         ) subq_7
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine__plan0.sql
index c4fbda494b..520dd7b121 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql
index 09ff287d1d..6169e78545 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -31,7 +31,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day
+        , subq_5.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index d0ffbfe281..dad7b3c820 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Redshift/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -39,7 +39,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -54,7 +54,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , CASE WHEN EXTRACT(dow FROM time_spine_src_28006.ds) = 0 THEN EXTRACT(dow FROM time_spine_src_28006.ds) + 7 ELSE EXTRACT(dow FROM time_spine_src_28006.ds) END AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index 21054fd461..7fe576c821 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -35,7 +35,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -50,7 +50,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -65,7 +65,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index 53fd019b2b..00228f7859 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -36,7 +36,7 @@ FROM (
           , subq_7.ds__extract_day
           , subq_7.ds__extract_dow
           , subq_7.ds__extract_doy
-          , subq_7.ds__martian_day
+          , subq_7.ds__alien_day
         FROM (
           -- Change Column Aliases
           SELECT
@@ -51,7 +51,7 @@ FROM (
             , subq_6.ds__extract_day
             , subq_6.ds__extract_dow
             , subq_6.ds__extract_doy
-            , subq_6.ds__martian_day
+            , subq_6.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -66,7 +66,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_6
         ) subq_7
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql
index fc0e2bc8f8..7c35343c29 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql
index e8ba60d77c..a2ecb95849 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -31,7 +31,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day
+        , subq_5.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index 760a689b4a..14507fd462 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Snowflake/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -39,7 +39,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -54,7 +54,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(dayofweekiso FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
index 5671fb98b4..5c91b2c85c 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_input_measure_constraint__plan0.sql
@@ -35,7 +35,7 @@ FROM (
         , subq_6.ds__extract_day
         , subq_6.ds__extract_dow
         , subq_6.ds__extract_doy
-        , subq_6.ds__martian_day
+        , subq_6.ds__alien_day
       FROM (
         -- Change Column Aliases
         SELECT
@@ -50,7 +50,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -65,7 +65,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
index d8ccf5899b..ece8085028 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_join_to_time_spine_with_queried_time_constraint__plan0.sql
@@ -36,7 +36,7 @@ FROM (
           , subq_7.ds__extract_day
           , subq_7.ds__extract_dow
           , subq_7.ds__extract_doy
-          , subq_7.ds__martian_day
+          , subq_7.ds__alien_day
         FROM (
           -- Change Column Aliases
           SELECT
@@ -51,7 +51,7 @@ FROM (
             , subq_6.ds__extract_day
             , subq_6.ds__extract_dow
             , subq_6.ds__extract_doy
-            , subq_6.ds__martian_day
+            , subq_6.ds__alien_day
           FROM (
             -- Read From Time Spine 'mf_time_spine'
             SELECT
@@ -66,7 +66,7 @@ FROM (
               , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
               , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
               , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-              , time_spine_src_28006.martian_day AS ds__martian_day
+              , time_spine_src_28006.alien_day AS ds__alien_day
             FROM ***************************.mf_time_spine time_spine_src_28006
           ) subq_6
         ) subq_7
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine__plan0.sql
index e8a4d62a25..aa7f8fa679 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine__plan0.sql
@@ -29,7 +29,7 @@ FROM (
         , subq_4.ds__extract_day
         , subq_4.ds__extract_dow
         , subq_4.ds__extract_doy
-        , subq_4.ds__martian_day
+        , subq_4.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -44,7 +44,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_4
     ) subq_5
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql
index ae6368af30..7aa563d609 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_filter__plan0.sql
@@ -31,7 +31,7 @@ FROM (
         , subq_5.ds__extract_day
         , subq_5.ds__extract_dow
         , subq_5.ds__extract_doy
-        , subq_5.ds__martian_day
+        , subq_5.ds__alien_day
       FROM (
         -- Read From Time Spine 'mf_time_spine'
         SELECT
@@ -46,7 +46,7 @@ FROM (
           , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
           , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
           , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-          , time_spine_src_28006.martian_day AS ds__martian_day
+          , time_spine_src_28006.alien_day AS ds__alien_day
         FROM ***************************.mf_time_spine time_spine_src_28006
       ) subq_5
     ) subq_6
diff --git a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
index 759257e45b..1ac3c631b7 100644
--- a/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
+++ b/tests_metricflow/snapshots/test_time_spine_join_rendering.py/SqlPlan/Trino/test_simple_join_to_time_spine_with_queried_filter__plan0.sql
@@ -39,7 +39,7 @@ FROM (
           , subq_5.ds__extract_day
           , subq_5.ds__extract_dow
           , subq_5.ds__extract_doy
-          , subq_5.ds__martian_day
+          , subq_5.ds__alien_day
         FROM (
           -- Read From Time Spine 'mf_time_spine'
           SELECT
@@ -54,7 +54,7 @@ FROM (
             , EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
             , EXTRACT(DAY_OF_WEEK FROM time_spine_src_28006.ds) AS ds__extract_dow
             , EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
-            , time_spine_src_28006.martian_day AS ds__martian_day
+            , time_spine_src_28006.alien_day AS ds__alien_day
           FROM ***************************.mf_time_spine time_spine_src_28006
         ) subq_5
       ) subq_6