diff --git a/LICENSE b/LICENSE
index c6f2b3458d..7857d8d8df 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017, 2022 Alliance for Sustainable Energy, LLC
+Copyright (c) 2017, 2022 Alliance for Energy Innovation, LLC
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/Heliostat_AzElAod.cpp b/code_attic/Heliostat_AzElAod.cpp
index f8ef217890..ec073e72f4 100644
--- a/code_attic/Heliostat_AzElAod.cpp
+++ b/code_attic/Heliostat_AzElAod.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/atmospheric_aod.cpp b/code_attic/atmospheric_aod.cpp
index 118409df19..be5852a388 100644
--- a/code_attic/atmospheric_aod.cpp
+++ b/code_attic/atmospheric_aod.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/atmospheric_aod.h b/code_attic/atmospheric_aod.h
index edebc5dec1..b3a5ee98ba 100644
--- a/code_attic/atmospheric_aod.h
+++ b/code_attic/atmospheric_aod.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_annualoutput.cpp b/code_attic/cmod_annualoutput.cpp
index 2c76c62256..9ca97b2330 100644
--- a/code_attic/cmod_annualoutput.cpp
+++ b/code_attic/cmod_annualoutput.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_cb_mspt_system_costs.cpp b/code_attic/cmod_cb_mspt_system_costs.cpp
index 00f387d6d9..bdb23c83e9 100644
--- a/code_attic/cmod_cb_mspt_system_costs.cpp
+++ b/code_attic/cmod_cb_mspt_system_costs.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_csp_common_eqns.cpp b/code_attic/cmod_csp_common_eqns.cpp
index 67087e35da..84d6f0cad7 100644
--- a/code_attic/cmod_csp_common_eqns.cpp
+++ b/code_attic/cmod_csp_common_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_csp_common_eqns.h b/code_attic/cmod_csp_common_eqns.h
index c84a26e616..a3fb94478d 100644
--- a/code_attic/cmod_csp_common_eqns.h
+++ b/code_attic/cmod_csp_common_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_csp_tower_eqns.cpp b/code_attic/cmod_csp_tower_eqns.cpp
index 3b173ea259..b7166d4a70 100644
--- a/code_attic/cmod_csp_tower_eqns.cpp
+++ b/code_attic/cmod_csp_tower_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_csp_tower_eqns.h b/code_attic/cmod_csp_tower_eqns.h
index 59432a34a7..2006ea4dc6 100644
--- a/code_attic/cmod_csp_tower_eqns.h
+++ b/code_attic/cmod_csp_tower_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_csp_trough_eqns.cpp b/code_attic/cmod_csp_trough_eqns.cpp
index e2dcb98af5..ef4d7ba29b 100644
--- a/code_attic/cmod_csp_trough_eqns.cpp
+++ b/code_attic/cmod_csp_trough_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_csp_trough_eqns.h b/code_attic/cmod_csp_trough_eqns.h
index bfa0d6dc8d..e87a5d52f1 100644
--- a/code_attic/cmod_csp_trough_eqns.h
+++ b/code_attic/cmod_csp_trough_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_dsg_flux_preprocess.cpp b/code_attic/cmod_dsg_flux_preprocess.cpp
index beba3501a4..e2c3c14e1a 100644
--- a/code_attic/cmod_dsg_flux_preprocess.cpp
+++ b/code_attic/cmod_dsg_flux_preprocess.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_fossilgen.cpp b/code_attic/cmod_fossilgen.cpp
index 46f0ebeabf..63cade9d16 100644
--- a/code_attic/cmod_fossilgen.cpp
+++ b/code_attic/cmod_fossilgen.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_ippppa.cpp b/code_attic/cmod_ippppa.cpp
index 50b1ed8105..729b791f82 100644
--- a/code_attic/cmod_ippppa.cpp
+++ b/code_attic/cmod_ippppa.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_iscc_design_point.cpp b/code_attic/cmod_iscc_design_point.cpp
index cb7bd31c4d..64d99dc07f 100644
--- a/code_attic/cmod_iscc_design_point.cpp
+++ b/code_attic/cmod_iscc_design_point.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_poacalib.cpp b/code_attic/cmod_poacalib.cpp
index 80a1d31746..d9a26a6ee6 100644
--- a/code_attic/cmod_poacalib.cpp
+++ b/code_attic/cmod_poacalib.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_pvwattsv0.cpp b/code_attic/cmod_pvwattsv0.cpp
index 612bd039b6..8a52f94afe 100644
--- a/code_attic/cmod_pvwattsv0.cpp
+++ b/code_attic/cmod_pvwattsv0.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_pvwattsv1.cpp b/code_attic/cmod_pvwattsv1.cpp
index 214cfbf056..4affe0faea 100644
--- a/code_attic/cmod_pvwattsv1.cpp
+++ b/code_attic/cmod_pvwattsv1.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_pvwattsv1_1ts.cpp b/code_attic/cmod_pvwattsv1_1ts.cpp
index 13a0226029..25b49e0893 100644
--- a/code_attic/cmod_pvwattsv1_1ts.cpp
+++ b/code_attic/cmod_pvwattsv1_1ts.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_pvwattsv1_poa.cpp b/code_attic/cmod_pvwattsv1_poa.cpp
index 9102442736..6164ca2770 100644
--- a/code_attic/cmod_pvwattsv1_poa.cpp
+++ b/code_attic/cmod_pvwattsv1_poa.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_tcsdirect_steam.cpp b/code_attic/cmod_tcsdirect_steam.cpp
index 05589834e8..100850a497 100644
--- a/code_attic/cmod_tcsdirect_steam.cpp
+++ b/code_attic/cmod_tcsdirect_steam.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_tcsdish.cpp b/code_attic/cmod_tcsdish.cpp
index 19e61229bf..1e5668f620 100644
--- a/code_attic/cmod_tcsdish.cpp
+++ b/code_attic/cmod_tcsdish.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_tcsiscc.cpp b/code_attic/cmod_tcsiscc.cpp
index bbbe5c08a6..73c1b9011a 100644
--- a/code_attic/cmod_tcsiscc.cpp
+++ b/code_attic/cmod_tcsiscc.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_tcsmslf.cpp b/code_attic/cmod_tcsmslf.cpp
index 17e3f56b09..4e09e14e16 100644
--- a/code_attic/cmod_tcsmslf.cpp
+++ b/code_attic/cmod_tcsmslf.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_tcstrough_physical.cpp b/code_attic/cmod_tcstrough_physical.cpp
index d5ac32c6e0..a35458b363 100644
--- a/code_attic/cmod_tcstrough_physical.cpp
+++ b/code_attic/cmod_tcstrough_physical.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_tcstrough_physical_csp_solver.cpp b/code_attic/cmod_tcstrough_physical_csp_solver.cpp
index 11ffec6e53..c3be556516 100644
--- a/code_attic/cmod_tcstrough_physical_csp_solver.cpp
+++ b/code_attic/cmod_tcstrough_physical_csp_solver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_trough_physical_iph_old.cpp b/code_attic/cmod_trough_physical_iph_old.cpp
index fdf3241f65..a7db8cdc75 100644
--- a/code_attic/cmod_trough_physical_iph_old.cpp
+++ b/code_attic/cmod_trough_physical_iph_old.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_ui_tes_calcs.cpp b/code_attic/cmod_ui_tes_calcs.cpp
index 7f81e044d1..59a3958258 100644
--- a/code_attic/cmod_ui_tes_calcs.cpp
+++ b/code_attic/cmod_ui_tes_calcs.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_utilityrate.cpp b/code_attic/cmod_utilityrate.cpp
index 7fb2cb5875..c2c43802e1 100644
--- a/code_attic/cmod_utilityrate.cpp
+++ b/code_attic/cmod_utilityrate.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_utilityrate2.cpp b/code_attic/cmod_utilityrate2.cpp
index 2d03e0a410..85567d46cd 100644
--- a/code_attic/cmod_utilityrate2.cpp
+++ b/code_attic/cmod_utilityrate2.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_utilityrate3.cpp b/code_attic/cmod_utilityrate3.cpp
index 9eecb0b2de..5a33abe915 100644
--- a/code_attic/cmod_utilityrate3.cpp
+++ b/code_attic/cmod_utilityrate3.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/cmod_utilityrate4.cpp b/code_attic/cmod_utilityrate4.cpp
index d765072f38..b4ef4018b1 100644
--- a/code_attic/cmod_utilityrate4.cpp
+++ b/code_attic/cmod_utilityrate4.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/csp_solver_tou_block_schedules.h b/code_attic/csp_solver_tou_block_schedules.h
index 6376893b0b..0ad8db2615 100644
--- a/code_attic/csp_solver_tou_block_schedules.h
+++ b/code_attic/csp_solver_tou_block_schedules.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/direct_steam_receivers.cpp b/code_attic/direct_steam_receivers.cpp
index fb2705f030..b61a4b39c7 100644
--- a/code_attic/direct_steam_receivers.cpp
+++ b/code_attic/direct_steam_receivers.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/direct_steam_receivers.h b/code_attic/direct_steam_receivers.h
index 47888fac0b..166d0f99f7 100644
--- a/code_attic/direct_steam_receivers.h
+++ b/code_attic/direct_steam_receivers.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/lib_power_electronics_old.h b/code_attic/lib_power_electronics_old.h
index 63884258a7..f2236f3b87 100644
--- a/code_attic/lib_power_electronics_old.h
+++ b/code_attic/lib_power_electronics_old.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/ngcc_powerblock.cpp b/code_attic/ngcc_powerblock.cpp
index e967a63c93..62df05c373 100644
--- a/code_attic/ngcc_powerblock.cpp
+++ b/code_attic/ngcc_powerblock.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/ngcc_powerblock.h b/code_attic/ngcc_powerblock.h
index 299209fb51..e0d46e7870 100644
--- a/code_attic/ngcc_powerblock.h
+++ b/code_attic/ngcc_powerblock.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_dsg_controller_type265.cpp b/code_attic/sam_dsg_controller_type265.cpp
index a528fcc77a..2e024ad8da 100644
--- a/code_attic/sam_dsg_controller_type265.cpp
+++ b/code_attic/sam_dsg_controller_type265.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_iscc_parasitics.cpp b/code_attic/sam_iscc_parasitics.cpp
index 0624f24eeb..2fadbc2eac 100644
--- a/code_attic/sam_iscc_parasitics.cpp
+++ b/code_attic/sam_iscc_parasitics.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_iscc_powerblock.cpp b/code_attic/sam_iscc_powerblock.cpp
index 54eae70cc6..eb9b7f4b29 100644
--- a/code_attic/sam_iscc_powerblock.cpp
+++ b/code_attic/sam_iscc_powerblock.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_mw_csp_SumCalcs.cpp b/code_attic/sam_mw_csp_SumCalcs.cpp
index 2564772b67..d5272ac281 100644
--- a/code_attic/sam_mw_csp_SumCalcs.cpp
+++ b/code_attic/sam_mw_csp_SumCalcs.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_mw_lf_type262_salt.cpp b/code_attic/sam_mw_lf_type262_salt.cpp
index 4086f31729..928e085f6c 100644
--- a/code_attic/sam_mw_lf_type262_salt.cpp
+++ b/code_attic/sam_mw_lf_type262_salt.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_mw_pt_heliostatfield_csp_solver.cpp b/code_attic/sam_mw_pt_heliostatfield_csp_solver.cpp
index 2269725bef..37f6a48348 100644
--- a/code_attic/sam_mw_pt_heliostatfield_csp_solver.cpp
+++ b/code_attic/sam_mw_pt_heliostatfield_csp_solver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_mw_pt_type222_csp_solver.cpp b/code_attic/sam_mw_pt_type222_csp_solver.cpp
index 251d70c1ec..edb71cc476 100644
--- a/code_attic/sam_mw_pt_type222_csp_solver.cpp
+++ b/code_attic/sam_mw_pt_type222_csp_solver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_mw_pt_type224_csp_solver.cpp b/code_attic/sam_mw_pt_type224_csp_solver.cpp
index 013e2169ca..aee18312f2 100644
--- a/code_attic/sam_mw_pt_type224_csp_solver.cpp
+++ b/code_attic/sam_mw_pt_type224_csp_solver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_mw_trough_type250.cpp b/code_attic/sam_mw_trough_type250.cpp
index 7472cae71f..f2cc42c974 100644
--- a/code_attic/sam_mw_trough_type250.cpp
+++ b/code_attic/sam_mw_trough_type250.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_mw_trough_type251.cpp b/code_attic/sam_mw_trough_type251.cpp
index 6433bd4b9f..56d2e4c9a5 100644
--- a/code_attic/sam_mw_trough_type251.cpp
+++ b/code_attic/sam_mw_trough_type251.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_pf_dish_collector_type295.cpp b/code_attic/sam_pf_dish_collector_type295.cpp
index 0e2e073356..ab1c1fb0a3 100644
--- a/code_attic/sam_pf_dish_collector_type295.cpp
+++ b/code_attic/sam_pf_dish_collector_type295.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_pf_dish_engine_type297.cpp b/code_attic/sam_pf_dish_engine_type297.cpp
index 7526bcc34d..fcc7b60d07 100644
--- a/code_attic/sam_pf_dish_engine_type297.cpp
+++ b/code_attic/sam_pf_dish_engine_type297.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_pf_dish_parasitic_type298.cpp b/code_attic/sam_pf_dish_parasitic_type298.cpp
index fbfc057e55..670ac4e47e 100644
--- a/code_attic/sam_pf_dish_parasitic_type298.cpp
+++ b/code_attic/sam_pf_dish_parasitic_type298.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_pf_dish_receiver_type296.cpp b/code_attic/sam_pf_dish_receiver_type296.cpp
index b56601ebc1..4a49ad20d0 100644
--- a/code_attic/sam_pf_dish_receiver_type296.cpp
+++ b/code_attic/sam_pf_dish_receiver_type296.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sam_type250_input_generator.cpp b/code_attic/sam_type250_input_generator.cpp
index 32a30b15d0..93d748b0e7 100644
--- a/code_attic/sam_type250_input_generator.cpp
+++ b/code_attic/sam_type250_input_generator.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sco2_rec_util.cpp b/code_attic/sco2_rec_util.cpp
index d567fd685e..2bdf33c5d7 100644
--- a/code_attic/sco2_rec_util.cpp
+++ b/code_attic/sco2_rec_util.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sco2_rec_util.h b/code_attic/sco2_rec_util.h
index 61c5e4b941..f39c360cbc 100644
--- a/code_attic/sco2_rec_util.h
+++ b/code_attic/sco2_rec_util.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/sco2_test_type401.cpp b/code_attic/sco2_test_type401.cpp
index bc03367b22..09dbe15206 100644
--- a/code_attic/sco2_test_type401.cpp
+++ b/code_attic/sco2_test_type401.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/solarcollector.cpp b/code_attic/solarcollector.cpp
index d8a8ee3080..595a3d29f9 100644
--- a/code_attic/solarcollector.cpp
+++ b/code_attic/solarcollector.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/tc_test_type402.cpp b/code_attic/tc_test_type402.cpp
index d72ac33760..121e7c8200 100644
--- a/code_attic/tc_test_type402.cpp
+++ b/code_attic/tc_test_type402.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/thermocline_tes.cpp b/code_attic/thermocline_tes.cpp
index 6108b2aa8b..d4cf76bfcc 100644
--- a/code_attic/thermocline_tes.cpp
+++ b/code_attic/thermocline_tes.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/code_attic/thermocline_tes.h b/code_attic/thermocline_tes.h
index 281ed39068..97b86edc67 100644
--- a/code_attic/thermocline_tes.h
+++ b/code_attic/thermocline_tes.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/doc/ssc_guide.tex b/doc/ssc_guide.tex
index 94651519d6..15e8107745 100644
--- a/doc/ssc_guide.tex
+++ b/doc/ssc_guide.tex
@@ -1642,7 +1642,7 @@ \subsection{PHP}
 
 \section{Legal}
 
-The System Advisor Model (``Model'') is provided by the National Renewable Energy Laboratory (``NREL''), which is operated by the Alliance for Sustainable Energy, LLC (``Alliance'') for the U.S. Department Of Energy (``DOE'') and may be used for any purpose whatsoever.  
+The System Advisor Model (``Model'') is provided by the National Renewable Energy Laboratory (``NREL''), which is operated by the Alliance for Energy Innovation, LLC (``Alliance'') for the U.S. Department Of Energy (``DOE'') and may be used for any purpose whatsoever.  
 
 The names DOE/NREL/ALLIANCE shall not be used in any representation, advertising, publicity or other manner whatsoever to endorse or promote any entity that adopts or uses the Model.  DOE/NREL/ALLIANCE shall not provide any support, consulting, training or assistance of any kind with regard to the use of the Model or any updates, revisions or new versions of the Model.
 
diff --git a/samples/trough-iph-utility-rates/sscapi.h b/samples/trough-iph-utility-rates/sscapi.h
index 04c6aea278..229a61d379 100644
--- a/samples/trough-iph-utility-rates/sscapi.h
+++ b/samples/trough-iph-utility-rates/sscapi.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/sdktool/dataview.cpp b/sdktool/dataview.cpp
index 4db88cf0b8..aa65461274 100644
--- a/sdktool/dataview.cpp
+++ b/sdktool/dataview.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/sdktool/dataview.h b/sdktool/dataview.h
index e93a526600..042e87e74f 100644
--- a/sdktool/dataview.h
+++ b/sdktool/dataview.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/sdktool/dllinvoke.cpp b/sdktool/dllinvoke.cpp
index b3ced6e3b0..5891101f0a 100644
--- a/sdktool/dllinvoke.cpp
+++ b/sdktool/dllinvoke.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/sdktool/dllinvoke.h b/sdktool/dllinvoke.h
index de0450b63f..353b96df23 100644
--- a/sdktool/dllinvoke.h
+++ b/sdktool/dllinvoke.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/sdktool/editvariable.cpp b/sdktool/editvariable.cpp
index 10f8c6613a..439cc7ea5c 100644
--- a/sdktool/editvariable.cpp
+++ b/sdktool/editvariable.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/sdktool/editvariable.h b/sdktool/editvariable.h
index 58db15ea22..1a099119f0 100644
--- a/sdktool/editvariable.h
+++ b/sdktool/editvariable.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/sdktool/scripting.cpp b/sdktool/scripting.cpp
index 7807ea5732..6aabb51fef 100644
--- a/sdktool/scripting.cpp
+++ b/sdktool/scripting.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/sdktool/scripting.h b/sdktool/scripting.h
index 86018fde90..e4a2dc4955 100644
--- a/sdktool/scripting.h
+++ b/sdktool/scripting.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/sdktool/sscdev.cpp b/sdktool/sscdev.cpp
index 4dd699638e..6d82145061 100644
--- a/sdktool/sscdev.cpp
+++ b/sdktool/sscdev.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/sdktool/sscdev.h b/sdktool/sscdev.h
index 8c0da83786..fbd8285a55 100644
--- a/sdktool/sscdev.h
+++ b/sdktool/sscdev.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/6par_gamma.h b/shared/6par_gamma.h
index dc05c76eb9..ae2b435729 100644
--- a/shared/6par_gamma.h
+++ b/shared/6par_gamma.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/6par_jacobian.h b/shared/6par_jacobian.h
index 4d3f4f4e47..597e3a7263 100644
--- a/shared/6par_jacobian.h
+++ b/shared/6par_jacobian.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/6par_lu.h b/shared/6par_lu.h
index 44fb8554e5..f649f93d25 100644
--- a/shared/6par_lu.h
+++ b/shared/6par_lu.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/6par_newton.h b/shared/6par_newton.h
index 6fd52aa2cc..2e670a1f24 100644
--- a/shared/6par_newton.h
+++ b/shared/6par_newton.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/6par_search.h b/shared/6par_search.h
index c3b544388c..6b53d37a47 100644
--- a/shared/6par_search.h
+++ b/shared/6par_search.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/6par_solve.h b/shared/6par_solve.h
index 8766d357b0..f43b4fbfc4 100644
--- a/shared/6par_solve.h
+++ b/shared/6par_solve.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/DB8_vmpp_impp_uint8_bin.h b/shared/DB8_vmpp_impp_uint8_bin.h
index 019d34358b..6448682e2c 100644
--- a/shared/DB8_vmpp_impp_uint8_bin.h
+++ b/shared/DB8_vmpp_impp_uint8_bin.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_aoi.h b/shared/lib_aoi.h
index 5de2c9f432..9980886cf6 100644
--- a/shared/lib_aoi.h
+++ b/shared/lib_aoi.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery.cpp b/shared/lib_battery.cpp
index 284b2c64c6..1bd2fc4ab2 100644
--- a/shared/lib_battery.cpp
+++ b/shared/lib_battery.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery.h b/shared/lib_battery.h
index e806267de0..4f7059fb11 100644
--- a/shared/lib_battery.h
+++ b/shared/lib_battery.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_capacity.cpp b/shared/lib_battery_capacity.cpp
index d32e1ff85e..3e54cd9c53 100644
--- a/shared/lib_battery_capacity.cpp
+++ b/shared/lib_battery_capacity.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_capacity.h b/shared/lib_battery_capacity.h
index 3c67cf0dfc..9dfeebc83c 100644
--- a/shared/lib_battery_capacity.h
+++ b/shared/lib_battery_capacity.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_dispatch.cpp b/shared/lib_battery_dispatch.cpp
index 0712cd7a63..699cb674be 100644
--- a/shared/lib_battery_dispatch.cpp
+++ b/shared/lib_battery_dispatch.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_dispatch.h b/shared/lib_battery_dispatch.h
index b3210dae56..871a2b50f8 100644
--- a/shared/lib_battery_dispatch.h
+++ b/shared/lib_battery_dispatch.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_dispatch_automatic_btm.cpp b/shared/lib_battery_dispatch_automatic_btm.cpp
index 38648d3098..6c4d45578d 100644
--- a/shared/lib_battery_dispatch_automatic_btm.cpp
+++ b/shared/lib_battery_dispatch_automatic_btm.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_dispatch_automatic_btm.h b/shared/lib_battery_dispatch_automatic_btm.h
index 34d3bbd5ba..7b536dcd8e 100644
--- a/shared/lib_battery_dispatch_automatic_btm.h
+++ b/shared/lib_battery_dispatch_automatic_btm.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_dispatch_automatic_fom.cpp b/shared/lib_battery_dispatch_automatic_fom.cpp
index 2576f42a0c..321f4d3577 100644
--- a/shared/lib_battery_dispatch_automatic_fom.cpp
+++ b/shared/lib_battery_dispatch_automatic_fom.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_dispatch_automatic_fom.h b/shared/lib_battery_dispatch_automatic_fom.h
index 75f820798b..ac395fcaa7 100644
--- a/shared/lib_battery_dispatch_automatic_fom.h
+++ b/shared/lib_battery_dispatch_automatic_fom.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_dispatch_manual.cpp b/shared/lib_battery_dispatch_manual.cpp
index 5dd7181291..d6f4994416 100644
--- a/shared/lib_battery_dispatch_manual.cpp
+++ b/shared/lib_battery_dispatch_manual.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_dispatch_manual.h b/shared/lib_battery_dispatch_manual.h
index 6813da0d2d..91f8d7e8ea 100644
--- a/shared/lib_battery_dispatch_manual.h
+++ b/shared/lib_battery_dispatch_manual.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_dispatch_pvsmoothing_fom.cpp b/shared/lib_battery_dispatch_pvsmoothing_fom.cpp
index e3baecadb5..2094293c45 100644
--- a/shared/lib_battery_dispatch_pvsmoothing_fom.cpp
+++ b/shared/lib_battery_dispatch_pvsmoothing_fom.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_dispatch_pvsmoothing_fom.h b/shared/lib_battery_dispatch_pvsmoothing_fom.h
index 9fa1205729..a1dda38341 100644
--- a/shared/lib_battery_dispatch_pvsmoothing_fom.h
+++ b/shared/lib_battery_dispatch_pvsmoothing_fom.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_lifetime.cpp b/shared/lib_battery_lifetime.cpp
index 76ff34dcad..0608be0c67 100644
--- a/shared/lib_battery_lifetime.cpp
+++ b/shared/lib_battery_lifetime.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_lifetime.h b/shared/lib_battery_lifetime.h
index 57f51d8a6b..d19a9d7b77 100644
--- a/shared/lib_battery_lifetime.h
+++ b/shared/lib_battery_lifetime.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_lifetime_calendar_cycle.cpp b/shared/lib_battery_lifetime_calendar_cycle.cpp
index 26dd89be3c..49d2a3e9fc 100644
--- a/shared/lib_battery_lifetime_calendar_cycle.cpp
+++ b/shared/lib_battery_lifetime_calendar_cycle.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_lifetime_calendar_cycle.h b/shared/lib_battery_lifetime_calendar_cycle.h
index 83107ad409..9e1a2a6080 100644
--- a/shared/lib_battery_lifetime_calendar_cycle.h
+++ b/shared/lib_battery_lifetime_calendar_cycle.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_lifetime_lmolto.cpp b/shared/lib_battery_lifetime_lmolto.cpp
index 3213379835..fbc474dd40 100644
--- a/shared/lib_battery_lifetime_lmolto.cpp
+++ b/shared/lib_battery_lifetime_lmolto.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_lifetime_lmolto.h b/shared/lib_battery_lifetime_lmolto.h
index 6ce17174dd..541afd840b 100644
--- a/shared/lib_battery_lifetime_lmolto.h
+++ b/shared/lib_battery_lifetime_lmolto.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_lifetime_nmc.cpp b/shared/lib_battery_lifetime_nmc.cpp
index 962e27de7a..3c60ff217a 100644
--- a/shared/lib_battery_lifetime_nmc.cpp
+++ b/shared/lib_battery_lifetime_nmc.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_lifetime_nmc.h b/shared/lib_battery_lifetime_nmc.h
index ed95eeffad..83cb6d9d62 100644
--- a/shared/lib_battery_lifetime_nmc.h
+++ b/shared/lib_battery_lifetime_nmc.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_powerflow.cpp b/shared/lib_battery_powerflow.cpp
index a6b974a642..a133c7a638 100644
--- a/shared/lib_battery_powerflow.cpp
+++ b/shared/lib_battery_powerflow.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_powerflow.h b/shared/lib_battery_powerflow.h
index 20bccbb616..86cf771cea 100644
--- a/shared/lib_battery_powerflow.h
+++ b/shared/lib_battery_powerflow.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_voltage.cpp b/shared/lib_battery_voltage.cpp
index 8c53f3db76..ceb0292822 100644
--- a/shared/lib_battery_voltage.cpp
+++ b/shared/lib_battery_voltage.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_battery_voltage.h b/shared/lib_battery_voltage.h
index 9b069261f1..3cc18ec0e8 100644
--- a/shared/lib_battery_voltage.h
+++ b/shared/lib_battery_voltage.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_cec6par.cpp b/shared/lib_cec6par.cpp
index e69b3121dc..bd8667e358 100644
--- a/shared/lib_cec6par.cpp
+++ b/shared/lib_cec6par.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_cec6par.h b/shared/lib_cec6par.h
index 3acc31360f..91412ff612 100644
--- a/shared/lib_cec6par.h
+++ b/shared/lib_cec6par.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_financial.cpp b/shared/lib_financial.cpp
index d81f1a0fa8..7e22a97882 100644
--- a/shared/lib_financial.cpp
+++ b/shared/lib_financial.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_financial.h b/shared/lib_financial.h
index 9e57b0f3ca..091220b518 100644
--- a/shared/lib_financial.h
+++ b/shared/lib_financial.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_fuel_cell.cpp b/shared/lib_fuel_cell.cpp
index 97e076423e..f498ab18e9 100644
--- a/shared/lib_fuel_cell.cpp
+++ b/shared/lib_fuel_cell.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_fuel_cell.h b/shared/lib_fuel_cell.h
index 84acf24a59..335e2d01e2 100644
--- a/shared/lib_fuel_cell.h
+++ b/shared/lib_fuel_cell.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_fuel_cell_dispatch.cpp b/shared/lib_fuel_cell_dispatch.cpp
index e43bf2a0bf..5bed4dbe00 100644
--- a/shared/lib_fuel_cell_dispatch.cpp
+++ b/shared/lib_fuel_cell_dispatch.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_fuel_cell_dispatch.h b/shared/lib_fuel_cell_dispatch.h
index 6282272420..5338453df4 100644
--- a/shared/lib_fuel_cell_dispatch.h
+++ b/shared/lib_fuel_cell_dispatch.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_geothermal.cpp b/shared/lib_geothermal.cpp
index 5f04801d0c..148156e75a 100644
--- a/shared/lib_geothermal.cpp
+++ b/shared/lib_geothermal.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_geothermal.h b/shared/lib_geothermal.h
index 6771fb736d..560e1fac12 100644
--- a/shared/lib_geothermal.h
+++ b/shared/lib_geothermal.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_iec61853.cpp b/shared/lib_iec61853.cpp
index 7ef4deade4..3006bfa2c3 100644
--- a/shared/lib_iec61853.cpp
+++ b/shared/lib_iec61853.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_iec61853.h b/shared/lib_iec61853.h
index ae1d189ad4..24ee947a49 100644
--- a/shared/lib_iec61853.h
+++ b/shared/lib_iec61853.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_irradproc.cpp b/shared/lib_irradproc.cpp
index 74ce0ed0ad..2ca1352c19 100644
--- a/shared/lib_irradproc.cpp
+++ b/shared/lib_irradproc.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_irradproc.h b/shared/lib_irradproc.h
index bb5ce76998..5eb420bab2 100644
--- a/shared/lib_irradproc.h
+++ b/shared/lib_irradproc.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_mlmodel.cpp b/shared/lib_mlmodel.cpp
index dfedd2b51e..f14155f99b 100644
--- a/shared/lib_mlmodel.cpp
+++ b/shared/lib_mlmodel.cpp
@@ -2,7 +2,7 @@
 Copyright 2017 - pvyield GmbH / Timo Richert
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_mlmodel.h b/shared/lib_mlmodel.h
index 757ec2735f..d63008b095 100644
--- a/shared/lib_mlmodel.h
+++ b/shared/lib_mlmodel.h
@@ -2,7 +2,7 @@
 Copyright 2017 - pvyield GmbH / Timo Richert
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_ondinv.cpp b/shared/lib_ondinv.cpp
index 078aaa4a39..2da2775e24 100644
--- a/shared/lib_ondinv.cpp
+++ b/shared/lib_ondinv.cpp
@@ -3,7 +3,7 @@ Copyright 2018 - pvyield GmbH / Timo Richert
 
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_ondinv.h b/shared/lib_ondinv.h
index efae89ce34..78983733ad 100644
--- a/shared/lib_ondinv.h
+++ b/shared/lib_ondinv.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -63,10 +63,10 @@ class ond_inverter
 	double INomDC; // [A]
 	double INomAC; // [A]
 	double IMaxAC; // [A]
-	double TPNom; // [°C]
-	double TPMax; // [°C]
-	double TPLim1; // [°C]
-	double TPLimAbs; // [°C]
+	double TPNom; // [�C]
+	double TPMax; // [�C]
+	double TPLim1; // [�C]
+	double TPLimAbs; // [�C]
 	double PLim1; // [kW]
 	double PLimAbs; // [kW]
 	double VNomEff[3]; // [V]
@@ -87,7 +87,7 @@ class ond_inverter
 		/* inputs */
 		double Pdc,			/* Input power to inverter (Wdc) */
 		double Vdc,			/* Voltage input to inverter (Vdc) */
-		double Tamb,		/* Ambient temperature (°C) */
+		double Tamb,		/* Ambient temperature (�C) */
 
 		/* outputs */
 		double *Pac,		/* AC output power (Wac) */
diff --git a/shared/lib_physics.cpp b/shared/lib_physics.cpp
index 2fb24d357e..36e5bbbe0e 100644
--- a/shared/lib_physics.cpp
+++ b/shared/lib_physics.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_physics.h b/shared/lib_physics.h
index f698a4241a..8091e81fba 100644
--- a/shared/lib_physics.h
+++ b/shared/lib_physics.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_power_electronics.cpp b/shared/lib_power_electronics.cpp
index 0dafe43304..e995fc1eb6 100644
--- a/shared/lib_power_electronics.cpp
+++ b/shared/lib_power_electronics.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_power_electronics.h b/shared/lib_power_electronics.h
index d36f3552fc..2a7244a970 100644
--- a/shared/lib_power_electronics.h
+++ b/shared/lib_power_electronics.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_powerblock.cpp b/shared/lib_powerblock.cpp
index 30b8ab2e51..884c4f9288 100644
--- a/shared/lib_powerblock.cpp
+++ b/shared/lib_powerblock.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_powerblock.h b/shared/lib_powerblock.h
index c3dcd3f549..b6f4dbe77b 100644
--- a/shared/lib_powerblock.h
+++ b/shared/lib_powerblock.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pv_incidence_modifier.cpp b/shared/lib_pv_incidence_modifier.cpp
index 2954f87739..e37a3c72da 100644
--- a/shared/lib_pv_incidence_modifier.cpp
+++ b/shared/lib_pv_incidence_modifier.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pv_incidence_modifier.h b/shared/lib_pv_incidence_modifier.h
index 0b0b712dcd..683478772b 100644
--- a/shared/lib_pv_incidence_modifier.h
+++ b/shared/lib_pv_incidence_modifier.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pv_io_manager.cpp b/shared/lib_pv_io_manager.cpp
index 9bb7061e73..64c1f24c4a 100644
--- a/shared/lib_pv_io_manager.cpp
+++ b/shared/lib_pv_io_manager.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pv_io_manager.h b/shared/lib_pv_io_manager.h
index c6d2521175..3e71e931d9 100644
--- a/shared/lib_pv_io_manager.h
+++ b/shared/lib_pv_io_manager.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pv_shade_loss_mpp.cpp b/shared/lib_pv_shade_loss_mpp.cpp
index 6f62a0795e..db01ca09b2 100644
--- a/shared/lib_pv_shade_loss_mpp.cpp
+++ b/shared/lib_pv_shade_loss_mpp.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pv_shade_loss_mpp.h b/shared/lib_pv_shade_loss_mpp.h
index 7041b9639a..7809b2a86a 100644
--- a/shared/lib_pv_shade_loss_mpp.h
+++ b/shared/lib_pv_shade_loss_mpp.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pvinv.cpp b/shared/lib_pvinv.cpp
index 6ec470c5aa..89c268e51e 100644
--- a/shared/lib_pvinv.cpp
+++ b/shared/lib_pvinv.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pvinv.h b/shared/lib_pvinv.h
index 0083995e55..34023b45c4 100644
--- a/shared/lib_pvinv.h
+++ b/shared/lib_pvinv.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pvmodel.cpp b/shared/lib_pvmodel.cpp
index aa6863c247..231d6c6fb5 100644
--- a/shared/lib_pvmodel.cpp
+++ b/shared/lib_pvmodel.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pvmodel.h b/shared/lib_pvmodel.h
index 206740329c..ebb0797731 100644
--- a/shared/lib_pvmodel.h
+++ b/shared/lib_pvmodel.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pvshade.cpp b/shared/lib_pvshade.cpp
index 7faadb195e..5a1abb900a 100644
--- a/shared/lib_pvshade.cpp
+++ b/shared/lib_pvshade.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pvshade.h b/shared/lib_pvshade.h
index 6e1947a6f5..ec2bb35eb1 100644
--- a/shared/lib_pvshade.h
+++ b/shared/lib_pvshade.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pvwatts.cpp b/shared/lib_pvwatts.cpp
index dcff59f77b..8574b0aec6 100644
--- a/shared/lib_pvwatts.cpp
+++ b/shared/lib_pvwatts.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_pvwatts.h b/shared/lib_pvwatts.h
index cdacbcc5bd..689cf3c48c 100644
--- a/shared/lib_pvwatts.h
+++ b/shared/lib_pvwatts.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_resilience.cpp b/shared/lib_resilience.cpp
index 52f59e7898..459aa14a53 100644
--- a/shared/lib_resilience.cpp
+++ b/shared/lib_resilience.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_resilience.h b/shared/lib_resilience.h
index f1b94556c7..ceef70ce4b 100644
--- a/shared/lib_resilience.h
+++ b/shared/lib_resilience.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_sandia.cpp b/shared/lib_sandia.cpp
index 4f58ed2b68..8bbfa68d77 100644
--- a/shared/lib_sandia.cpp
+++ b/shared/lib_sandia.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_sandia.h b/shared/lib_sandia.h
index cbe69a3976..4f97a5b323 100644
--- a/shared/lib_sandia.h
+++ b/shared/lib_sandia.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_shared_inverter.cpp b/shared/lib_shared_inverter.cpp
index 6155c3d21e..d5964b3f07 100644
--- a/shared/lib_shared_inverter.cpp
+++ b/shared/lib_shared_inverter.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_shared_inverter.h b/shared/lib_shared_inverter.h
index b8bd526b4b..7acb19cc5f 100644
--- a/shared/lib_shared_inverter.h
+++ b/shared/lib_shared_inverter.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_snowmodel.cpp b/shared/lib_snowmodel.cpp
index 7df8c79ee5..79ada1c420 100644
--- a/shared/lib_snowmodel.cpp
+++ b/shared/lib_snowmodel.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_snowmodel.h b/shared/lib_snowmodel.h
index 245d308faa..f78d3b1292 100644
--- a/shared/lib_snowmodel.h
+++ b/shared/lib_snowmodel.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_time.cpp b/shared/lib_time.cpp
index d0d27b35db..a3a3b29a58 100644
--- a/shared/lib_time.cpp
+++ b/shared/lib_time.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_time.h b/shared/lib_time.h
index 127b05c4c2..8e6909dd67 100644
--- a/shared/lib_time.h
+++ b/shared/lib_time.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_util.cpp b/shared/lib_util.cpp
index 6d6df08d01..2062c6dc89 100644
--- a/shared/lib_util.cpp
+++ b/shared/lib_util.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_util.h b/shared/lib_util.h
index ed700faab4..b5028f1e69 100644
--- a/shared/lib_util.h
+++ b/shared/lib_util.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_utility_rate.cpp b/shared/lib_utility_rate.cpp
index 13cfb19b56..10b7014acc 100644
--- a/shared/lib_utility_rate.cpp
+++ b/shared/lib_utility_rate.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_utility_rate.h b/shared/lib_utility_rate.h
index 088801aa71..677f7620ea 100644
--- a/shared/lib_utility_rate.h
+++ b/shared/lib_utility_rate.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_utility_rate_equations.cpp b/shared/lib_utility_rate_equations.cpp
index 9813488076..23b93fdaca 100644
--- a/shared/lib_utility_rate_equations.cpp
+++ b/shared/lib_utility_rate_equations.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_utility_rate_equations.h b/shared/lib_utility_rate_equations.h
index c9eb4454e7..99dfad3dc7 100644
--- a/shared/lib_utility_rate_equations.h
+++ b/shared/lib_utility_rate_equations.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_weatherfile.cpp b/shared/lib_weatherfile.cpp
index 4e6318df03..9fb2387a11 100644
--- a/shared/lib_weatherfile.cpp
+++ b/shared/lib_weatherfile.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_weatherfile.h b/shared/lib_weatherfile.h
index 1628c66a25..84f681f164 100644
--- a/shared/lib_weatherfile.h
+++ b/shared/lib_weatherfile.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_wind_obos.cpp b/shared/lib_wind_obos.cpp
index d80ce6afc8..8dc8e6a06d 100644
--- a/shared/lib_wind_obos.cpp
+++ b/shared/lib_wind_obos.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_wind_obos.h b/shared/lib_wind_obos.h
index cc9fa1cff5..2637379c05 100644
--- a/shared/lib_wind_obos.h
+++ b/shared/lib_wind_obos.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_wind_obos_cable_vessel.cpp b/shared/lib_wind_obos_cable_vessel.cpp
index 3f5679209e..d9a1093797 100644
--- a/shared/lib_wind_obos_cable_vessel.cpp
+++ b/shared/lib_wind_obos_cable_vessel.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_wind_obos_cable_vessel.h b/shared/lib_wind_obos_cable_vessel.h
index 69d166d0d3..a72d21b5d8 100644
--- a/shared/lib_wind_obos_cable_vessel.h
+++ b/shared/lib_wind_obos_cable_vessel.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_windfile.cpp b/shared/lib_windfile.cpp
index 9cdb518959..6eafff638a 100644
--- a/shared/lib_windfile.cpp
+++ b/shared/lib_windfile.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_windfile.h b/shared/lib_windfile.h
index 9a2f03aa96..55ebe0b434 100644
--- a/shared/lib_windfile.h
+++ b/shared/lib_windfile.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_windwakemodel.cpp b/shared/lib_windwakemodel.cpp
index c835db2d39..1a0ad88be3 100644
--- a/shared/lib_windwakemodel.cpp
+++ b/shared/lib_windwakemodel.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_windwakemodel.h b/shared/lib_windwakemodel.h
index 365eee408b..fa9c938b1b 100644
--- a/shared/lib_windwakemodel.h
+++ b/shared/lib_windwakemodel.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_windwatts.cpp b/shared/lib_windwatts.cpp
index b7043b95c4..7c19df97ba 100644
--- a/shared/lib_windwatts.cpp
+++ b/shared/lib_windwatts.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/lib_windwatts.h b/shared/lib_windwatts.h
index df3982f0ec..f10de24d5b 100644
--- a/shared/lib_windwatts.h
+++ b/shared/lib_windwatts.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/logger.cpp b/shared/logger.cpp
index 07857fd2af..d10390aa72 100644
--- a/shared/logger.cpp
+++ b/shared/logger.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/shared/logger.h b/shared/logger.h
index ae4822e2ad..b9a2759368 100644
--- a/shared/logger.h
+++ b/shared/logger.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/API_structures.cpp b/solarpilot/API_structures.cpp
index ed24a2e5af..aa62557cc1 100644
--- a/solarpilot/API_structures.cpp
+++ b/solarpilot/API_structures.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/API_structures.h b/solarpilot/API_structures.h
index 31018dfef7..0902b5b1c3 100644
--- a/solarpilot/API_structures.h
+++ b/solarpilot/API_structures.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Ambient.cpp b/solarpilot/Ambient.cpp
index b20eff96f7..e2758312e9 100644
--- a/solarpilot/Ambient.cpp
+++ b/solarpilot/Ambient.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -85,8 +85,8 @@ void Ambient::calcBuieCSRIntensity(std::vector<double>& angle, std::vector<doubl
     calculate relative solar intensity over the span 0..angle_max[mrad] at npt increments, filling 'angle' and 'intesity'
 
     Creates the Buie (2003) sun shape based on CSR
-    [1] Buie, D., Dey, C., & Bosi, S. (2003). The effective size of the solar cone for solar concentrating systems. Solar energy, 74(2003), 417–427.
-    [2] Buie, D., Monger, A., & Dey, C. (2003). Sunshape distributions for terrestrial solar simulations. Solar Energy, 74(March 2003), 113–122.
+    [1] Buie, D., Dey, C., & Bosi, S. (2003). The effective size of the solar cone for solar concentrating systems. Solar energy, 74(2003), 417�427.
+    [2] Buie, D., Monger, A., & Dey, C. (2003). Sunshape distributions for terrestrial solar simulations. Solar Energy, 74(March 2003), 113�122.
 
     */
     double dt_s = .2;
diff --git a/solarpilot/Ambient.h b/solarpilot/Ambient.h
index d471853f7b..a621e21e97 100644
--- a/solarpilot/Ambient.h
+++ b/solarpilot/Ambient.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/AutoPilot_API.cpp b/solarpilot/AutoPilot_API.cpp
index 89737fee56..c8f7c1c168 100644
--- a/solarpilot/AutoPilot_API.cpp
+++ b/solarpilot/AutoPilot_API.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/AutoPilot_API.h b/solarpilot/AutoPilot_API.h
index 6bd583d391..1c42de2b13 100644
--- a/solarpilot/AutoPilot_API.h
+++ b/solarpilot/AutoPilot_API.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Financial.cpp b/solarpilot/Financial.cpp
index 18c3e14a07..a8dcdb21aa 100644
--- a/solarpilot/Financial.cpp
+++ b/solarpilot/Financial.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Financial.h b/solarpilot/Financial.h
index 1f620b2b97..72c995d9f7 100644
--- a/solarpilot/Financial.h
+++ b/solarpilot/Financial.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Flux.cpp b/solarpilot/Flux.cpp
index 8fd68b3981..9a406d1dd9 100644
--- a/solarpilot/Flux.cpp
+++ b/solarpilot/Flux.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Flux.h b/solarpilot/Flux.h
index 552eac48c5..c5e654f5cb 100644
--- a/solarpilot/Flux.h
+++ b/solarpilot/Flux.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Heliostat.cpp b/solarpilot/Heliostat.cpp
index 298ab6d569..0386521622 100644
--- a/solarpilot/Heliostat.cpp
+++ b/solarpilot/Heliostat.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Heliostat.h b/solarpilot/Heliostat.h
index d46d8d4aff..8cb5015787 100644
--- a/solarpilot/Heliostat.h
+++ b/solarpilot/Heliostat.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/IOUtil.cpp b/solarpilot/IOUtil.cpp
index 8244073ae9..318c7d8d49 100644
--- a/solarpilot/IOUtil.cpp
+++ b/solarpilot/IOUtil.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/IOUtil.h b/solarpilot/IOUtil.h
index 74abd8b5f8..699f71122c 100644
--- a/solarpilot/IOUtil.h
+++ b/solarpilot/IOUtil.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Land.cpp b/solarpilot/Land.cpp
index 340ed2ac72..51e435062c 100644
--- a/solarpilot/Land.cpp
+++ b/solarpilot/Land.cpp
@@ -2,7 +2,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Land.h b/solarpilot/Land.h
index 17c002fe42..f6c2d559c5 100644
--- a/solarpilot/Land.h
+++ b/solarpilot/Land.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/LayoutSimulateThread.cpp b/solarpilot/LayoutSimulateThread.cpp
index 79f89c4f5e..c220e24d3f 100644
--- a/solarpilot/LayoutSimulateThread.cpp
+++ b/solarpilot/LayoutSimulateThread.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/LayoutSimulateThread.h b/solarpilot/LayoutSimulateThread.h
index 9d289c3589..cd0d875652 100644
--- a/solarpilot/LayoutSimulateThread.h
+++ b/solarpilot/LayoutSimulateThread.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/OpticalMesh.cpp b/solarpilot/OpticalMesh.cpp
index 229d55134e..30b817e9bc 100644
--- a/solarpilot/OpticalMesh.cpp
+++ b/solarpilot/OpticalMesh.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/OpticalMesh.h b/solarpilot/OpticalMesh.h
index 1933836bcb..8855afa5d6 100644
--- a/solarpilot/OpticalMesh.h
+++ b/solarpilot/OpticalMesh.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Receiver.cpp b/solarpilot/Receiver.cpp
index 832002adcc..d360a99e4c 100644
--- a/solarpilot/Receiver.cpp
+++ b/solarpilot/Receiver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Receiver.h b/solarpilot/Receiver.h
index 3a12bef240..c21166c117 100644
--- a/solarpilot/Receiver.h
+++ b/solarpilot/Receiver.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/STObject.cpp b/solarpilot/STObject.cpp
index 356857c634..193b93c0de 100644
--- a/solarpilot/STObject.cpp
+++ b/solarpilot/STObject.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/STObject.h b/solarpilot/STObject.h
index 618c6d4d7b..d8addac089 100644
--- a/solarpilot/STObject.h
+++ b/solarpilot/STObject.h
@@ -1,8 +1,8 @@
 /*******************************************************************************************************
-*  Copyright 2017 Alliance for Sustainable Energy, LLC
+*  Copyright 2017 Alliance for Energy Innovation, LLC
 *
-*  NOTICE: This software was developed at least in part by Alliance for Sustainable Energy, LLC
-*  (“Alliance”) under Contract No. DE-AC36-08GO28308 with the U.S. Department of Energy and the U.S.
+*  NOTICE: This software was developed at least in part by Alliance for Energy Innovation, LLC
+*  (�Alliance�) under Contract No. DE-AC36-08GO28308 with the U.S. Department of Energy and the U.S.
 *  The Government retains for itself and others acting on its behalf a nonexclusive, paid-up,
 *  irrevocable worldwide license in the software to reproduce, prepare derivative works, distribute
 *  copies to the public, perform publicly and display publicly, and to permit others to do so.
@@ -26,8 +26,8 @@
 *  4. Redistribution of this software, without modification, must refer to the software by the same
 *  designation. Redistribution of a modified version of this software (i) may not refer to the modified
 *  version by the same designation, or by any confusingly similar designation, and (ii) must refer to
-*  the underlying software originally provided by Alliance as “System Advisor Model” or “SAM”. Except
-*  to comply with the foregoing, the terms “System Advisor Model”, “SAM”, or any confusingly similar
+*  the underlying software originally provided by Alliance as �System Advisor Model� or �SAM�. Except
+*  to comply with the foregoing, the terms �System Advisor Model�, �SAM�, or any confusingly similar
 *  designation may not be used to refer to any modified version of this software or any modified
 *  version of the underlying software originally provided by Alliance without the prior written consent
 *  of Alliance.
diff --git a/solarpilot/STSimulateThread.cpp b/solarpilot/STSimulateThread.cpp
index 0125d84156..cce9549a1f 100644
--- a/solarpilot/STSimulateThread.cpp
+++ b/solarpilot/STSimulateThread.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/STSimulateThread.h b/solarpilot/STSimulateThread.h
index 9bd0aa7a1f..f6f759a692 100644
--- a/solarpilot/STSimulateThread.h
+++ b/solarpilot/STSimulateThread.h
@@ -1,8 +1,8 @@
 /*******************************************************************************************************
-*  Copyright 2017 Alliance for Sustainable Energy, LLC
+*  Copyright 2017 Alliance for Energy Innovation, LLC
 *
-*  NOTICE: This software was developed at least in part by Alliance for Sustainable Energy, LLC
-*  (“Alliance”) under Contract No. DE-AC36-08GO28308 with the U.S. Department of Energy and the U.S.
+*  NOTICE: This software was developed at least in part by Alliance for Energy Innovation, LLC
+*  (�Alliance�) under Contract No. DE-AC36-08GO28308 with the U.S. Department of Energy and the U.S.
 *  The Government retains for itself and others acting on its behalf a nonexclusive, paid-up,
 *  irrevocable worldwide license in the software to reproduce, prepare derivative works, distribute
 *  copies to the public, perform publicly and display publicly, and to permit others to do so.
@@ -26,8 +26,8 @@
 *  4. Redistribution of this software, without modification, must refer to the software by the same
 *  designation. Redistribution of a modified version of this software (i) may not refer to the modified
 *  version by the same designation, or by any confusingly similar designation, and (ii) must refer to
-*  the underlying software originally provided by Alliance as “System Advisor Model” or “SAM”. Except
-*  to comply with the foregoing, the terms “System Advisor Model”, “SAM”, or any confusingly similar
+*  the underlying software originally provided by Alliance as �System Advisor Model� or �SAM�. Except
+*  to comply with the foregoing, the terms �System Advisor Model�, �SAM�, or any confusingly similar
 *  designation may not be used to refer to any modified version of this software or any modified
 *  version of the underlying software originally provided by Alliance without the prior written consent
 *  of Alliance.
diff --git a/solarpilot/SolarField.cpp b/solarpilot/SolarField.cpp
index 47b4398aea..baa450a301 100644
--- a/solarpilot/SolarField.cpp
+++ b/solarpilot/SolarField.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/SolarField.h b/solarpilot/SolarField.h
index 37d3fbd0df..797ca6dea2 100644
--- a/solarpilot/SolarField.h
+++ b/solarpilot/SolarField.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Toolbox.cpp b/solarpilot/Toolbox.cpp
index 53bd89805d..41bd132d8f 100644
--- a/solarpilot/Toolbox.cpp
+++ b/solarpilot/Toolbox.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/Toolbox.h b/solarpilot/Toolbox.h
index 4b3503f249..cf9a67ff4a 100644
--- a/solarpilot/Toolbox.h
+++ b/solarpilot/Toolbox.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/definitions.cpp b/solarpilot/definitions.cpp
index dba006cdda..422a2e6ec3 100644
--- a/solarpilot/definitions.cpp
+++ b/solarpilot/definitions.cpp
@@ -4,7 +4,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/definitions.h b/solarpilot/definitions.h
index fdebac6df7..e85d501236 100644
--- a/solarpilot/definitions.h
+++ b/solarpilot/definitions.h
@@ -2,9 +2,9 @@
 
 
 /*******************************************************************************************************
-*  Copyright 2017 Alliance for Sustainable Energy, LLC
+*  Copyright 2017 Alliance for Energy Innovation, LLC
 *
-*  NOTICE: This software was developed at least in part by Alliance for Sustainable Energy, LLC
+*  NOTICE: This software was developed at least in part by Alliance for Energy Innovation, LLC
 *  ("Alliance") under Contract No. DE-AC36-08GO28308 with the U.S. Department of Energy and the U.S.
 *  The Government retains for itself and others acting on its behalf a nonexclusive, paid-up,
 *  irrevocable worldwide license in the software to reproduce, prepare derivative works, distribute
diff --git a/solarpilot/exceptions.hpp b/solarpilot/exceptions.hpp
index f59cd4fcd3..ffc871401c 100644
--- a/solarpilot/exceptions.hpp
+++ b/solarpilot/exceptions.hpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/fluxsim.cpp b/solarpilot/fluxsim.cpp
index eaa67f74e1..f3bc5df43b 100644
--- a/solarpilot/fluxsim.cpp
+++ b/solarpilot/fluxsim.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/fluxsim.h b/solarpilot/fluxsim.h
index 5e550c55cc..ff158810c2 100644
--- a/solarpilot/fluxsim.h
+++ b/solarpilot/fluxsim.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/heliodata.cpp b/solarpilot/heliodata.cpp
index c75b7e3d8d..7c491f76ae 100644
--- a/solarpilot/heliodata.cpp
+++ b/solarpilot/heliodata.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/heliodata.h b/solarpilot/heliodata.h
index 8b0286dfc8..fac813e696 100644
--- a/solarpilot/heliodata.h
+++ b/solarpilot/heliodata.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/interop.cpp b/solarpilot/interop.cpp
index f0fcd3defb..d5171b38ed 100644
--- a/solarpilot/interop.cpp
+++ b/solarpilot/interop.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/interop.h b/solarpilot/interop.h
index 734165dd94..0c77784747 100644
--- a/solarpilot/interop.h
+++ b/solarpilot/interop.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/mod_base.cpp b/solarpilot/mod_base.cpp
index 8f87dcce91..8175638b3b 100644
--- a/solarpilot/mod_base.cpp
+++ b/solarpilot/mod_base.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/mod_base.h b/solarpilot/mod_base.h
index d9322e4928..769eeb1426 100644
--- a/solarpilot/mod_base.h
+++ b/solarpilot/mod_base.h
@@ -1,7 +1,7 @@
 /*******************************************************************************************************
-*  Copyright 2017 Alliance for Sustainable Energy, LLC
+*  Copyright 2017 Alliance for Energy Innovation, LLC
 *
-*  NOTICE: This software was developed at least in part by Alliance for Sustainable Energy, LLC
+*  NOTICE: This software was developed at least in part by Alliance for Energy Innovation, LLC
 *  (�Alliance�) under Contract No. DE-AC36-08GO28308 with the U.S. Department of Energy and the U.S.
 *  The Government retains for itself and others acting on its behalf a nonexclusive, paid-up,
 *  irrevocable worldwide license in the software to reproduce, prepare derivative works, distribute
diff --git a/solarpilot/optimize.cpp b/solarpilot/optimize.cpp
index 17fd803ff3..a9e6dcd246 100644
--- a/solarpilot/optimize.cpp
+++ b/solarpilot/optimize.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/optimize.h b/solarpilot/optimize.h
index d4ce15e1e4..8e43cdd8ee 100644
--- a/solarpilot/optimize.h
+++ b/solarpilot/optimize.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/solpos.cpp b/solarpilot/solpos.cpp
index 7e9ea1c228..2a0938542c 100644
--- a/solarpilot/solpos.cpp
+++ b/solarpilot/solpos.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/solpos00.h b/solarpilot/solpos00.h
index 6697039a2b..3a67135427 100644
--- a/solarpilot/solpos00.h
+++ b/solarpilot/solpos00.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/sort_method.h b/solarpilot/sort_method.h
index 2e9dc5d728..d2a4c8fe40 100644
--- a/solarpilot/sort_method.h
+++ b/solarpilot/sort_method.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/string_util.cpp b/solarpilot/string_util.cpp
index 912b543dc8..5c6bf41fa8 100644
--- a/solarpilot/string_util.cpp
+++ b/solarpilot/string_util.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/solarpilot/string_util.h b/solarpilot/string_util.h
index 0207a9408f..1c97ba7382 100644
--- a/solarpilot/string_util.h
+++ b/solarpilot/string_util.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_6parsolve.cpp b/ssc/cmod_6parsolve.cpp
index b6cc2dc529..95e42b1974 100644
--- a/ssc/cmod_6parsolve.cpp
+++ b/ssc/cmod_6parsolve.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_analysisperiodchange_eqns.cpp b/ssc/cmod_analysisperiodchange_eqns.cpp
index ae10425d88..881639b31c 100644
--- a/ssc/cmod_analysisperiodchange_eqns.cpp
+++ b/ssc/cmod_analysisperiodchange_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_analysisperiodchange_eqns.h b/ssc/cmod_analysisperiodchange_eqns.h
index eda6b509e5..513724fd8d 100644
--- a/ssc/cmod_analysisperiodchange_eqns.h
+++ b/ssc/cmod_analysisperiodchange_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_battery.cpp b/ssc/cmod_battery.cpp
index d807ac20cc..6ed017ec61 100644
--- a/ssc/cmod_battery.cpp
+++ b/ssc/cmod_battery.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_battery.h b/ssc/cmod_battery.h
index 159e9432b6..da3b9e532d 100644
--- a/ssc/cmod_battery.h
+++ b/ssc/cmod_battery.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_battery_eqns.cpp b/ssc/cmod_battery_eqns.cpp
index e6e3fa9c26..fd15077ddd 100644
--- a/ssc/cmod_battery_eqns.cpp
+++ b/ssc/cmod_battery_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_battery_eqns.h b/ssc/cmod_battery_eqns.h
index 0ee0d14240..0bd068ec27 100644
--- a/ssc/cmod_battery_eqns.h
+++ b/ssc/cmod_battery_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_battery_stateful.cpp b/ssc/cmod_battery_stateful.cpp
index 83e23debd7..8b590ddbc0 100644
--- a/ssc/cmod_battery_stateful.cpp
+++ b/ssc/cmod_battery_stateful.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_battery_stateful.h b/ssc/cmod_battery_stateful.h
index 593d4efb34..0381706692 100644
--- a/ssc/cmod_battery_stateful.h
+++ b/ssc/cmod_battery_stateful.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_battwatts.cpp b/ssc/cmod_battwatts.cpp
index cc6d1db9f2..80a5b8cab4 100644
--- a/ssc/cmod_battwatts.cpp
+++ b/ssc/cmod_battwatts.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_battwatts.h b/ssc/cmod_battwatts.h
index 29fcaaa07c..a624921daf 100644
--- a/ssc/cmod_battwatts.h
+++ b/ssc/cmod_battwatts.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_belpe.cpp b/ssc/cmod_belpe.cpp
index f544683dbe..be381a4d31 100644
--- a/ssc/cmod_belpe.cpp
+++ b/ssc/cmod_belpe.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_biomass.cpp b/ssc/cmod_biomass.cpp
index 57ee7760f3..08ce03fcfe 100644
--- a/ssc/cmod_biomass.cpp
+++ b/ssc/cmod_biomass.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_cashloan.cpp b/ssc/cmod_cashloan.cpp
index eedec2e91d..03faac3ad5 100644
--- a/ssc/cmod_cashloan.cpp
+++ b/ssc/cmod_cashloan.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_cashloan_heat.cpp b/ssc/cmod_cashloan_heat.cpp
index 4c746cb375..f33fa4e32e 100644
--- a/ssc/cmod_cashloan_heat.cpp
+++ b/ssc/cmod_cashloan_heat.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_cb_construction_financing.cpp b/ssc/cmod_cb_construction_financing.cpp
index 93154a8c9d..e993af3958 100644
--- a/ssc/cmod_cb_construction_financing.cpp
+++ b/ssc/cmod_cb_construction_financing.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_cb_empirical_hce_heat_loss.cpp b/ssc/cmod_cb_empirical_hce_heat_loss.cpp
index 1736a40237..83de3da36d 100644
--- a/ssc/cmod_cb_empirical_hce_heat_loss.cpp
+++ b/ssc/cmod_cb_empirical_hce_heat_loss.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_communitysolar.cpp b/ssc/cmod_communitysolar.cpp
index dfa4378f97..0d0ed11acf 100644
--- a/ssc/cmod_communitysolar.cpp
+++ b/ssc/cmod_communitysolar.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_csp_dsg_lf_ui.cpp b/ssc/cmod_csp_dsg_lf_ui.cpp
index 124ec61473..12fcdf1692 100644
--- a/ssc/cmod_csp_dsg_lf_ui.cpp
+++ b/ssc/cmod_csp_dsg_lf_ui.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_csp_heatsink.cpp b/ssc/cmod_csp_heatsink.cpp
index 6ef462d09b..b1c9a6908c 100644
--- a/ssc/cmod_csp_heatsink.cpp
+++ b/ssc/cmod_csp_heatsink.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_csp_subcomponent.cpp b/ssc/cmod_csp_subcomponent.cpp
index a348af8bc3..2c91a1a6ca 100644
--- a/ssc/cmod_csp_subcomponent.cpp
+++ b/ssc/cmod_csp_subcomponent.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_custom_generation.cpp b/ssc/cmod_custom_generation.cpp
index 38e1cde684..16a67b2a85 100644
--- a/ssc/cmod_custom_generation.cpp
+++ b/ssc/cmod_custom_generation.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_equpartflip.cpp b/ssc/cmod_equpartflip.cpp
index 92abb3561a..e385ba4814 100644
--- a/ssc/cmod_equpartflip.cpp
+++ b/ssc/cmod_equpartflip.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_etes_electric_resistance.cpp b/ssc/cmod_etes_electric_resistance.cpp
index 204aec0557..fdea4a9428 100644
--- a/ssc/cmod_etes_electric_resistance.cpp
+++ b/ssc/cmod_etes_electric_resistance.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_etes_ptes.cpp b/ssc/cmod_etes_ptes.cpp
index e6e65bc685..cb26fb324a 100644
--- a/ssc/cmod_etes_ptes.cpp
+++ b/ssc/cmod_etes_ptes.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_financial_eqns.cpp b/ssc/cmod_financial_eqns.cpp
index 6fbe16a2bf..54918d2660 100644
--- a/ssc/cmod_financial_eqns.cpp
+++ b/ssc/cmod_financial_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_financial_eqns.h b/ssc/cmod_financial_eqns.h
index cda6652afe..65d24121b9 100644
--- a/ssc/cmod_financial_eqns.h
+++ b/ssc/cmod_financial_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_fresnel_physical.cpp b/ssc/cmod_fresnel_physical.cpp
index c9a482cfd2..c4b62081bb 100644
--- a/ssc/cmod_fresnel_physical.cpp
+++ b/ssc/cmod_fresnel_physical.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_fresnel_physical_iph.cpp b/ssc/cmod_fresnel_physical_iph.cpp
index 26dcb053ad..95fdb00631 100644
--- a/ssc/cmod_fresnel_physical_iph.cpp
+++ b/ssc/cmod_fresnel_physical_iph.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_fuelcell.cpp b/ssc/cmod_fuelcell.cpp
index 69591821ac..06b89b58a1 100644
--- a/ssc/cmod_fuelcell.cpp
+++ b/ssc/cmod_fuelcell.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_fuelcell.h b/ssc/cmod_fuelcell.h
index 990d8c033d..b0616d310c 100644
--- a/ssc/cmod_fuelcell.h
+++ b/ssc/cmod_fuelcell.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_generic_system-builder.cpp b/ssc/cmod_generic_system-builder.cpp
index c1ae8db132..8c2a5bb0d6 100644
--- a/ssc/cmod_generic_system-builder.cpp
+++ b/ssc/cmod_generic_system-builder.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_generic_system-builder.h b/ssc/cmod_generic_system-builder.h
index 46bb83115a..d9f13f4feb 100644
--- a/ssc/cmod_generic_system-builder.h
+++ b/ssc/cmod_generic_system-builder.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_generic_system.cpp b/ssc/cmod_generic_system.cpp
index 665c7b4ad5..5a5d03a002 100644
--- a/ssc/cmod_generic_system.cpp
+++ b/ssc/cmod_generic_system.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_geothermal.cpp b/ssc/cmod_geothermal.cpp
index 18bad9aadd..bc111a5e83 100644
--- a/ssc/cmod_geothermal.cpp
+++ b/ssc/cmod_geothermal.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_geothermal_costs.cpp b/ssc/cmod_geothermal_costs.cpp
index a6329f447a..8e621bf2d7 100644
--- a/ssc/cmod_geothermal_costs.cpp
+++ b/ssc/cmod_geothermal_costs.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_geothermal_costs_eqns.cpp b/ssc/cmod_geothermal_costs_eqns.cpp
index e90ff66a3d..36f65d9340 100644
--- a/ssc/cmod_geothermal_costs_eqns.cpp
+++ b/ssc/cmod_geothermal_costs_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_geothermal_costs_eqns.h b/ssc/cmod_geothermal_costs_eqns.h
index 7dd6b94068..0005fe2709 100644
--- a/ssc/cmod_geothermal_costs_eqns.h
+++ b/ssc/cmod_geothermal_costs_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_geothermal_om_costs.cpp b/ssc/cmod_geothermal_om_costs.cpp
index e0a03cf86f..f9d86856d5 100644
--- a/ssc/cmod_geothermal_om_costs.cpp
+++ b/ssc/cmod_geothermal_om_costs.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_grid.cpp b/ssc/cmod_grid.cpp
index 8f8e697909..84fcd16e18 100644
--- a/ssc/cmod_grid.cpp
+++ b/ssc/cmod_grid.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_grid.h b/ssc/cmod_grid.h
index db9c9583cf..3b7fd52489 100644
--- a/ssc/cmod_grid.h
+++ b/ssc/cmod_grid.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_hcpv.cpp b/ssc/cmod_hcpv.cpp
index e0fa985dec..2d16ac6236 100644
--- a/ssc/cmod_hcpv.cpp
+++ b/ssc/cmod_hcpv.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_host_developer.cpp b/ssc/cmod_host_developer.cpp
index 147a42ccb6..d20700a349 100644
--- a/ssc/cmod_host_developer.cpp
+++ b/ssc/cmod_host_developer.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_hybrid.cpp b/ssc/cmod_hybrid.cpp
index a3f06b16ca..6472b53873 100644
--- a/ssc/cmod_hybrid.cpp
+++ b/ssc/cmod_hybrid.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_hybrid_steps.cpp b/ssc/cmod_hybrid_steps.cpp
index 8f3a17e23a..6bf29ce2c3 100644
--- a/ssc/cmod_hybrid_steps.cpp
+++ b/ssc/cmod_hybrid_steps.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_iec61853par.cpp b/ssc/cmod_iec61853par.cpp
index abcf3e9270..ee2005c4fb 100644
--- a/ssc/cmod_iec61853par.cpp
+++ b/ssc/cmod_iec61853par.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_inv_cec_cg.cpp b/ssc/cmod_inv_cec_cg.cpp
index 241077355d..a834a26ea0 100644
--- a/ssc/cmod_inv_cec_cg.cpp
+++ b/ssc/cmod_inv_cec_cg.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_iph_linear_fresnel_dsg.cpp b/ssc/cmod_iph_linear_fresnel_dsg.cpp
index 7f57e6f7e5..1b8a5f8c35 100644
--- a/ssc/cmod_iph_linear_fresnel_dsg.cpp
+++ b/ssc/cmod_iph_linear_fresnel_dsg.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_iph_to_lcoefcr.cpp b/ssc/cmod_iph_to_lcoefcr.cpp
index 1e06089cba..4b97468b9a 100644
--- a/ssc/cmod_iph_to_lcoefcr.cpp
+++ b/ssc/cmod_iph_to_lcoefcr.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_irradproc.cpp b/ssc/cmod_irradproc.cpp
index ef4562d097..3286d250eb 100644
--- a/ssc/cmod_irradproc.cpp
+++ b/ssc/cmod_irradproc.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_layoutarea.cpp b/ssc/cmod_layoutarea.cpp
index 8cdd8d0555..3cb1d7afa2 100644
--- a/ssc/cmod_layoutarea.cpp
+++ b/ssc/cmod_layoutarea.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_lcoefcr.cpp b/ssc/cmod_lcoefcr.cpp
index 6e253b8cfe..e1695a3bfd 100644
--- a/ssc/cmod_lcoefcr.cpp
+++ b/ssc/cmod_lcoefcr.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_levpartflip.cpp b/ssc/cmod_levpartflip.cpp
index 3b088321ab..dbb30cbcdd 100644
--- a/ssc/cmod_levpartflip.cpp
+++ b/ssc/cmod_levpartflip.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_linear_fresnel_dsg_iph.cpp b/ssc/cmod_linear_fresnel_dsg_iph.cpp
index 22fadc9417..079b2f191b 100644
--- a/ssc/cmod_linear_fresnel_dsg_iph.cpp
+++ b/ssc/cmod_linear_fresnel_dsg_iph.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_merchantplant.cpp b/ssc/cmod_merchantplant.cpp
index b5ec95c2c1..0030917661 100644
--- a/ssc/cmod_merchantplant.cpp
+++ b/ssc/cmod_merchantplant.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_merchantplant_eqns.cpp b/ssc/cmod_merchantplant_eqns.cpp
index 46a8c1e441..32fbb7bfde 100644
--- a/ssc/cmod_merchantplant_eqns.cpp
+++ b/ssc/cmod_merchantplant_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_merchantplant_eqns.h b/ssc/cmod_merchantplant_eqns.h
index bc9616f6e9..cabba20f0b 100644
--- a/ssc/cmod_merchantplant_eqns.h
+++ b/ssc/cmod_merchantplant_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_mhk_costs.cpp b/ssc/cmod_mhk_costs.cpp
index 4f45b0da4a..df1da3629a 100644
--- a/ssc/cmod_mhk_costs.cpp
+++ b/ssc/cmod_mhk_costs.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_mhk_eqns.cpp b/ssc/cmod_mhk_eqns.cpp
index 9e080b5a6b..02f2a6dad1 100644
--- a/ssc/cmod_mhk_eqns.cpp
+++ b/ssc/cmod_mhk_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_mhk_eqns.h b/ssc/cmod_mhk_eqns.h
index 18806ed60f..4375769b0b 100644
--- a/ssc/cmod_mhk_eqns.h
+++ b/ssc/cmod_mhk_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_mhk_tidal.cpp b/ssc/cmod_mhk_tidal.cpp
index 5428cac377..b36ab3cae6 100644
--- a/ssc/cmod_mhk_tidal.cpp
+++ b/ssc/cmod_mhk_tidal.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_mhk_wave.cpp b/ssc/cmod_mhk_wave.cpp
index 2bddbc3971..75a3ae2ac1 100644
--- a/ssc/cmod_mhk_wave.cpp
+++ b/ssc/cmod_mhk_wave.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_mspt_iph.cpp b/ssc/cmod_mspt_iph.cpp
index 343b8ebfb2..fc59bf79c0 100644
--- a/ssc/cmod_mspt_iph.cpp
+++ b/ssc/cmod_mspt_iph.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_mspt_sf_and_rec_isolated.cpp b/ssc/cmod_mspt_sf_and_rec_isolated.cpp
index 2fb2b94738..6c153d2923 100644
--- a/ssc/cmod_mspt_sf_and_rec_isolated.cpp
+++ b/ssc/cmod_mspt_sf_and_rec_isolated.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_ptes_design_point.cpp b/ssc/cmod_ptes_design_point.cpp
index 841ab1a8f2..a1eee2aeac 100644
--- a/ssc/cmod_ptes_design_point.cpp
+++ b/ssc/cmod_ptes_design_point.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_pv6parmod.cpp b/ssc/cmod_pv6parmod.cpp
index 0d45d2ed82..e94755c08e 100644
--- a/ssc/cmod_pv6parmod.cpp
+++ b/ssc/cmod_pv6parmod.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_pv_get_shade_loss_mpp.cpp b/ssc/cmod_pv_get_shade_loss_mpp.cpp
index 200848ea0f..3bf5468fe6 100644
--- a/ssc/cmod_pv_get_shade_loss_mpp.cpp
+++ b/ssc/cmod_pv_get_shade_loss_mpp.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_pvsamv1.cpp b/ssc/cmod_pvsamv1.cpp
index c6b2c562d7..59a7f34beb 100644
--- a/ssc/cmod_pvsamv1.cpp
+++ b/ssc/cmod_pvsamv1.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_pvsamv1.h b/ssc/cmod_pvsamv1.h
index a323a79b39..01116ca562 100644
--- a/ssc/cmod_pvsamv1.h
+++ b/ssc/cmod_pvsamv1.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_pvsamv1_eqns.cpp b/ssc/cmod_pvsamv1_eqns.cpp
index 94049a44c4..285a6bea5c 100644
--- a/ssc/cmod_pvsamv1_eqns.cpp
+++ b/ssc/cmod_pvsamv1_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_pvsamv1_eqns.h b/ssc/cmod_pvsamv1_eqns.h
index c7311229f7..ad0203c71b 100644
--- a/ssc/cmod_pvsamv1_eqns.h
+++ b/ssc/cmod_pvsamv1_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_pvsandiainv.cpp b/ssc/cmod_pvsandiainv.cpp
index 7c7f997a1e..05362a2721 100644
--- a/ssc/cmod_pvsandiainv.cpp
+++ b/ssc/cmod_pvsandiainv.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_pvwattsv5.cpp b/ssc/cmod_pvwattsv5.cpp
index 8e258bb7e6..cab605e29b 100644
--- a/ssc/cmod_pvwattsv5.cpp
+++ b/ssc/cmod_pvwattsv5.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_pvwattsv7.cpp b/ssc/cmod_pvwattsv7.cpp
index c78176f09d..2983d6a9c5 100644
--- a/ssc/cmod_pvwattsv7.cpp
+++ b/ssc/cmod_pvwattsv7.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_pvwattsv8.cpp b/ssc/cmod_pvwattsv8.cpp
index be94768f96..92bfcbe346 100644
--- a/ssc/cmod_pvwattsv8.cpp
+++ b/ssc/cmod_pvwattsv8.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_saleleaseback.cpp b/ssc/cmod_saleleaseback.cpp
index 513261bf5a..4a1c6b9db7 100644
--- a/ssc/cmod_saleleaseback.cpp
+++ b/ssc/cmod_saleleaseback.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_sco2_air_cooler.cpp b/ssc/cmod_sco2_air_cooler.cpp
index 596c370e39..cdb2fa76d5 100644
--- a/ssc/cmod_sco2_air_cooler.cpp
+++ b/ssc/cmod_sco2_air_cooler.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_sco2_csp_system.cpp b/ssc/cmod_sco2_csp_system.cpp
index 792f35fe2f..d200c35503 100644
--- a/ssc/cmod_sco2_csp_system.cpp
+++ b/ssc/cmod_sco2_csp_system.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_sco2_csp_ud_pc_tables.cpp b/ssc/cmod_sco2_csp_ud_pc_tables.cpp
index 1ab99d01ab..81add52db2 100644
--- a/ssc/cmod_sco2_csp_ud_pc_tables.cpp
+++ b/ssc/cmod_sco2_csp_ud_pc_tables.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_sco2_offdesign.cpp b/ssc/cmod_sco2_offdesign.cpp
index 597a59f865..ec1122ae7a 100644
--- a/ssc/cmod_sco2_offdesign.cpp
+++ b/ssc/cmod_sco2_offdesign.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_singlediode.cpp b/ssc/cmod_singlediode.cpp
index 3228481b63..fc5a89a213 100644
--- a/ssc/cmod_singlediode.cpp
+++ b/ssc/cmod_singlediode.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_singleowner.cpp b/ssc/cmod_singleowner.cpp
index e32df65b81..d303e06e5a 100644
--- a/ssc/cmod_singleowner.cpp
+++ b/ssc/cmod_singleowner.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_singleowner_heat.cpp b/ssc/cmod_singleowner_heat.cpp
index 0942417861..bd76579838 100644
--- a/ssc/cmod_singleowner_heat.cpp
+++ b/ssc/cmod_singleowner_heat.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_snowmodel.cpp b/ssc/cmod_snowmodel.cpp
index f61948a9cd..51664ab100 100644
--- a/ssc/cmod_snowmodel.cpp
+++ b/ssc/cmod_snowmodel.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_solarpilot.cpp b/ssc/cmod_solarpilot.cpp
index 8547acf781..cf977f3b4b 100644
--- a/ssc/cmod_solarpilot.cpp
+++ b/ssc/cmod_solarpilot.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_sp_ty.cpp b/ssc/cmod_sp_ty.cpp
index 866e832eb9..9142348f70 100644
--- a/ssc/cmod_sp_ty.cpp
+++ b/ssc/cmod_sp_ty.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_swh.cpp b/ssc/cmod_swh.cpp
index 29be1db3c8..4e2ad6607a 100644
--- a/ssc/cmod_swh.cpp
+++ b/ssc/cmod_swh.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_tcsgeneric_solar.cpp b/ssc/cmod_tcsgeneric_solar.cpp
index 1e7f56db58..00a28e5b5c 100644
--- a/ssc/cmod_tcsgeneric_solar.cpp
+++ b/ssc/cmod_tcsgeneric_solar.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_tcslinear_fresnel.cpp b/ssc/cmod_tcslinear_fresnel.cpp
index 025f2317ca..aaec69df9b 100644
--- a/ssc/cmod_tcslinear_fresnel.cpp
+++ b/ssc/cmod_tcslinear_fresnel.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_tcslinear_fresnel_dsg_csp_solver.cpp b/ssc/cmod_tcslinear_fresnel_dsg_csp_solver.cpp
index 3ff5967ef8..3245bb18e9 100644
--- a/ssc/cmod_tcslinear_fresnel_dsg_csp_solver.cpp
+++ b/ssc/cmod_tcslinear_fresnel_dsg_csp_solver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_tcsmolten_salt.cpp b/ssc/cmod_tcsmolten_salt.cpp
index 18858c6c5c..5bffd81646 100644
--- a/ssc/cmod_tcsmolten_salt.cpp
+++ b/ssc/cmod_tcsmolten_salt.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_tcsmolten_salt_tcs_solver.cpp b/ssc/cmod_tcsmolten_salt_tcs_solver.cpp
index 5aceb3124b..e10e8131e1 100644
--- a/ssc/cmod_tcsmolten_salt_tcs_solver.cpp
+++ b/ssc/cmod_tcsmolten_salt_tcs_solver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_tcstrough_empirical.cpp b/ssc/cmod_tcstrough_empirical.cpp
index 4cec0b86d0..f886029b0d 100644
--- a/ssc/cmod_tcstrough_empirical.cpp
+++ b/ssc/cmod_tcstrough_empirical.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_test_ud_power_cycle.cpp b/ssc/cmod_test_ud_power_cycle.cpp
index 95aa82d624..54e1a7be52 100644
--- a/ssc/cmod_test_ud_power_cycle.cpp
+++ b/ssc/cmod_test_ud_power_cycle.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_thermalrate.cpp b/ssc/cmod_thermalrate.cpp
index 69363b81b9..da10979303 100644
--- a/ssc/cmod_thermalrate.cpp
+++ b/ssc/cmod_thermalrate.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_thermalrate_iph.cpp b/ssc/cmod_thermalrate_iph.cpp
index fb61f479a6..ea5768deaf 100644
--- a/ssc/cmod_thermalrate_iph.cpp
+++ b/ssc/cmod_thermalrate_iph.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_thirdpartyownership.cpp b/ssc/cmod_thirdpartyownership.cpp
index 0ccfb8174c..e5b2133e72 100644
--- a/ssc/cmod_thirdpartyownership.cpp
+++ b/ssc/cmod_thirdpartyownership.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_tidalfile.cpp b/ssc/cmod_tidalfile.cpp
index 47362c4696..cb5ad5bfde 100644
--- a/ssc/cmod_tidalfile.cpp
+++ b/ssc/cmod_tidalfile.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_timeseq.cpp b/ssc/cmod_timeseq.cpp
index d5d8ac0c5f..344c33029c 100644
--- a/ssc/cmod_timeseq.cpp
+++ b/ssc/cmod_timeseq.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_trough_physical.cpp b/ssc/cmod_trough_physical.cpp
index bd6a2f85f5..bc1dd745f6 100644
--- a/ssc/cmod_trough_physical.cpp
+++ b/ssc/cmod_trough_physical.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_trough_physical_iph.cpp b/ssc/cmod_trough_physical_iph.cpp
index d0525f8741..bdffe69be3 100644
--- a/ssc/cmod_trough_physical_iph.cpp
+++ b/ssc/cmod_trough_physical_iph.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_ui_udpc_checks.cpp b/ssc/cmod_ui_udpc_checks.cpp
index 6e67132f5d..6f3bc0fa13 100644
--- a/ssc/cmod_ui_udpc_checks.cpp
+++ b/ssc/cmod_ui_udpc_checks.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_user_htf_comparison.cpp b/ssc/cmod_user_htf_comparison.cpp
index 806dd015a9..f54fc2fa64 100644
--- a/ssc/cmod_user_htf_comparison.cpp
+++ b/ssc/cmod_user_htf_comparison.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_utilityrate5.cpp b/ssc/cmod_utilityrate5.cpp
index 5d44e3a2ff..36ce239413 100644
--- a/ssc/cmod_utilityrate5.cpp
+++ b/ssc/cmod_utilityrate5.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_utilityrate5.h b/ssc/cmod_utilityrate5.h
index d9c899f6b0..7f9af94124 100644
--- a/ssc/cmod_utilityrate5.h
+++ b/ssc/cmod_utilityrate5.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_utilityrate5_eqns.cpp b/ssc/cmod_utilityrate5_eqns.cpp
index 4a3f3c9be5..4b722d22d9 100644
--- a/ssc/cmod_utilityrate5_eqns.cpp
+++ b/ssc/cmod_utilityrate5_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_utilityrate5_eqns.h b/ssc/cmod_utilityrate5_eqns.h
index 3e3f340edf..cc0169491c 100644
--- a/ssc/cmod_utilityrate5_eqns.h
+++ b/ssc/cmod_utilityrate5_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_utilityrateforecast.cpp b/ssc/cmod_utilityrateforecast.cpp
index 15cae0c2fc..f5495dd65e 100644
--- a/ssc/cmod_utilityrateforecast.cpp
+++ b/ssc/cmod_utilityrateforecast.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_utilityrateforecast.h b/ssc/cmod_utilityrateforecast.h
index 57dba0c4fe..447cb985a3 100644
--- a/ssc/cmod_utilityrateforecast.h
+++ b/ssc/cmod_utilityrateforecast.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_wavefile.cpp b/ssc/cmod_wavefile.cpp
index f09c2f023a..b42e544fc1 100644
--- a/ssc/cmod_wavefile.cpp
+++ b/ssc/cmod_wavefile.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_wfcheck.cpp b/ssc/cmod_wfcheck.cpp
index 9169069fa5..4268292414 100644
--- a/ssc/cmod_wfcheck.cpp
+++ b/ssc/cmod_wfcheck.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_wfcsv.cpp b/ssc/cmod_wfcsv.cpp
index e37a3589ff..1616a4a0ba 100644
--- a/ssc/cmod_wfcsv.cpp
+++ b/ssc/cmod_wfcsv.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_wfreader.cpp b/ssc/cmod_wfreader.cpp
index b3d7b59cb6..e1386f2c02 100644
--- a/ssc/cmod_wfreader.cpp
+++ b/ssc/cmod_wfreader.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_wind_landbosse.cpp b/ssc/cmod_wind_landbosse.cpp
index 26ca55d015..3d0eaf12c7 100644
--- a/ssc/cmod_wind_landbosse.cpp
+++ b/ssc/cmod_wind_landbosse.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_wind_landbosse.h b/ssc/cmod_wind_landbosse.h
index 8afeebec72..f6c79667d3 100644
--- a/ssc/cmod_wind_landbosse.h
+++ b/ssc/cmod_wind_landbosse.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_wind_obos.cpp b/ssc/cmod_wind_obos.cpp
index 0384e4fe3d..a37ee3b524 100644
--- a/ssc/cmod_wind_obos.cpp
+++ b/ssc/cmod_wind_obos.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_windbos.cpp b/ssc/cmod_windbos.cpp
index 3971e16639..90ba755cf0 100644
--- a/ssc/cmod_windbos.cpp
+++ b/ssc/cmod_windbos.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_windcsm.cpp b/ssc/cmod_windcsm.cpp
index a65fd44cec..7e9b200ed2 100644
--- a/ssc/cmod_windcsm.cpp
+++ b/ssc/cmod_windcsm.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_windfile.cpp b/ssc/cmod_windfile.cpp
index 537eccddb9..23ed43e3b4 100644
--- a/ssc/cmod_windfile.cpp
+++ b/ssc/cmod_windfile.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_windpower.cpp b/ssc/cmod_windpower.cpp
index b9fc250cc3..fc2cd30e2e 100644
--- a/ssc/cmod_windpower.cpp
+++ b/ssc/cmod_windpower.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_windpower.h b/ssc/cmod_windpower.h
index 59d8255fe1..47e439f20b 100644
--- a/ssc/cmod_windpower.h
+++ b/ssc/cmod_windpower.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_windpower_eqns.cpp b/ssc/cmod_windpower_eqns.cpp
index abbbd1ff98..0a46d8c348 100644
--- a/ssc/cmod_windpower_eqns.cpp
+++ b/ssc/cmod_windpower_eqns.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/cmod_windpower_eqns.h b/ssc/cmod_windpower_eqns.h
index 7fe59675c2..e5a886c06a 100644
--- a/ssc/cmod_windpower_eqns.h
+++ b/ssc/cmod_windpower_eqns.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/common.cpp b/ssc/common.cpp
index 650527f1e9..3fc273abfb 100644
--- a/ssc/common.cpp
+++ b/ssc/common.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/common.h b/ssc/common.h
index 44724d9f0d..01c869e329 100644
--- a/ssc/common.h
+++ b/ssc/common.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/common_financial.cpp b/ssc/common_financial.cpp
index 19e0f9a6e2..c66681d291 100644
--- a/ssc/common_financial.cpp
+++ b/ssc/common_financial.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/common_financial.h b/ssc/common_financial.h
index fe41ed95a4..b9f119b6ec 100644
--- a/ssc/common_financial.h
+++ b/ssc/common_financial.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/core.cpp b/ssc/core.cpp
index a1e89bea5a..7b41bd7d2a 100644
--- a/ssc/core.cpp
+++ b/ssc/core.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/core.h b/ssc/core.h
index 289eaefa7c..26e5d75ee5 100644
--- a/ssc/core.h
+++ b/ssc/core.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/csp_common.cpp b/ssc/csp_common.cpp
index 04bcfc3c59..404670837c 100644
--- a/ssc/csp_common.cpp
+++ b/ssc/csp_common.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/csp_common.h b/ssc/csp_common.h
index 5e36f1ab27..5b1fd05d9d 100644
--- a/ssc/csp_common.h
+++ b/ssc/csp_common.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/ssc_equations.h b/ssc/ssc_equations.h
index 2724d8acfc..04f14c9217 100644
--- a/ssc/ssc_equations.h
+++ b/ssc/ssc_equations.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/sscapi.cpp b/ssc/sscapi.cpp
index 549f912191..0d4dd1e6a8 100644
--- a/ssc/sscapi.cpp
+++ b/ssc/sscapi.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/sscapi.h b/ssc/sscapi.h
index cf03527239..ce5e72aeda 100644
--- a/ssc/sscapi.h
+++ b/ssc/sscapi.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/tckernel.cpp b/ssc/tckernel.cpp
index 6b70bdb38f..b96cbab8c8 100644
--- a/ssc/tckernel.cpp
+++ b/ssc/tckernel.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/tckernel.h b/ssc/tckernel.h
index e53be3be3e..03dac76dd8 100644
--- a/ssc/tckernel.h
+++ b/ssc/tckernel.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/vartab.cpp b/ssc/vartab.cpp
index 9381bf741c..6d7fba2ab8 100644
--- a/ssc/vartab.cpp
+++ b/ssc/vartab.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/vartab.h b/ssc/vartab.h
index 1782dac8da..2423277f2e 100644
--- a/ssc/vartab.h
+++ b/ssc/vartab.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/vbapi.cpp b/ssc/vbapi.cpp
index 6ebd5b9fa2..b668fee9c0 100644
--- a/ssc/vbapi.cpp
+++ b/ssc/vbapi.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/ssc/vbapi.h b/ssc/vbapi.h
index 5e84b3e296..4c715950ff 100644
--- a/ssc/vbapi.h
+++ b/ssc/vbapi.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/CO2_properties.cpp b/tcs/CO2_properties.cpp
index e37ab2e820..209c6d553b 100644
--- a/tcs/CO2_properties.cpp
+++ b/tcs/CO2_properties.cpp
@@ -4,7 +4,7 @@ Copyright (c) 2016, Northland Numerics LLC
 All rights reserved.
 
 Use of this software in source and binary forms, with or without modification, is permitted for
-Alliance for Sustainable Energy, LLC (the “Licensee�) and for third parties that receive this
+Alliance for Energy Innovation, LLC (the “Licensee�) and for third parties that receive this
 software, with or without modification, directly from Licensee.  Licensee is permitted to
 redistribute this software in source and binary forms, with or without modification, provided
 that redistributions of source code must retain the above copyright notice and reservation of
diff --git a/tcs/CO2_properties.h b/tcs/CO2_properties.h
index 0dd75d9a7e..4334ab08a9 100644
--- a/tcs/CO2_properties.h
+++ b/tcs/CO2_properties.h
@@ -5,12 +5,12 @@ Pressure Range: 1.0 kPa to 60.0 MPa
 FIT Version: 4cd1a62f8548
 
 ----------------------------------------------------------------------------------------------------
-—
+�
 Copyright (c) 2016, Northland Numerics LLC
 All rights reserved.
 
 Use of this software in source and binary forms, with or without modification, is permitted for
-Alliance for Sustainable Energy, LLC (the “Licensee”) and for third parties that receive this
+Alliance for Energy Innovation, LLC (the �Licensee�) and for third parties that receive this
 software, with or without modification, directly from Licensee.  Licensee is permitted to
 redistribute this software in source and binary forms, with or without modification, provided
 that redistributions of source code must retain the above copyright notice and reservation of
@@ -31,7 +31,7 @@ OR LOSS OF USE, DATA, OR PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE), ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-—
+�
 
 ----------------------------------------------------------------------------------------------------
 
diff --git a/tcs/base_dispatch.cpp b/tcs/base_dispatch.cpp
index ebd12042b6..2eff8ca9d4 100644
--- a/tcs/base_dispatch.cpp
+++ b/tcs/base_dispatch.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/base_dispatch.h b/tcs/base_dispatch.h
index 22e014bc27..4792bdfa33 100644
--- a/tcs/base_dispatch.h
+++ b/tcs/base_dispatch.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/cavity_calcs.cpp b/tcs/cavity_calcs.cpp
index b717bc825b..259e8dcd05 100644
--- a/tcs/cavity_calcs.cpp
+++ b/tcs/cavity_calcs.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/cavity_calcs.h b/tcs/cavity_calcs.h
index c30115bf73..f875a937d8 100644
--- a/tcs/cavity_calcs.h
+++ b/tcs/cavity_calcs.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/co2_compressor_library.cpp b/tcs/co2_compressor_library.cpp
index ea3408e7f6..b6fc58cf25 100644
--- a/tcs/co2_compressor_library.cpp
+++ b/tcs/co2_compressor_library.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/co2_compressor_library.h b/tcs/co2_compressor_library.h
index 01d5917cd1..2eea9024ba 100644
--- a/tcs/co2_compressor_library.h
+++ b/tcs/co2_compressor_library.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_dispatch.cpp b/tcs/csp_dispatch.cpp
index c7fb095877..0c4a24d131 100644
--- a/tcs/csp_dispatch.cpp
+++ b/tcs/csp_dispatch.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_dispatch.h b/tcs/csp_dispatch.h
index 59b5f2195a..f749122210 100644
--- a/tcs/csp_dispatch.h
+++ b/tcs/csp_dispatch.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_cavity_receiver.cpp b/tcs/csp_solver_cavity_receiver.cpp
index 0c93f468e2..d246cfe89c 100644
--- a/tcs/csp_solver_cavity_receiver.cpp
+++ b/tcs/csp_solver_cavity_receiver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_cavity_receiver.h b/tcs/csp_solver_cavity_receiver.h
index 772ebbee5c..362733355b 100644
--- a/tcs/csp_solver_cavity_receiver.h
+++ b/tcs/csp_solver_cavity_receiver.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_core.cpp b/tcs/csp_solver_core.cpp
index e7e42fcbc0..250352e714 100644
--- a/tcs/csp_solver_core.cpp
+++ b/tcs/csp_solver_core.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_core.h b/tcs/csp_solver_core.h
index e52dee5988..29bbe99d3b 100644
--- a/tcs/csp_solver_core.h
+++ b/tcs/csp_solver_core.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_cr_electric_resistance.cpp b/tcs/csp_solver_cr_electric_resistance.cpp
index ea357fee42..a8a80cf19c 100644
--- a/tcs/csp_solver_cr_electric_resistance.cpp
+++ b/tcs/csp_solver_cr_electric_resistance.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_cr_electric_resistance.h b/tcs/csp_solver_cr_electric_resistance.h
index 7b6d16fcfd..a78e379dff 100644
--- a/tcs/csp_solver_cr_electric_resistance.h
+++ b/tcs/csp_solver_cr_electric_resistance.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_cr_heat_pump.cpp b/tcs/csp_solver_cr_heat_pump.cpp
index 9f44d2211e..3ffcfd1c32 100644
--- a/tcs/csp_solver_cr_heat_pump.cpp
+++ b/tcs/csp_solver_cr_heat_pump.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_cr_heat_pump.h b/tcs/csp_solver_cr_heat_pump.h
index 8b39e06ef7..d159242340 100644
--- a/tcs/csp_solver_cr_heat_pump.h
+++ b/tcs/csp_solver_cr_heat_pump.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_fresnel_collector_receiver.h b/tcs/csp_solver_fresnel_collector_receiver.h
index 872cc04a0c..686d1aea5c 100644
--- a/tcs/csp_solver_fresnel_collector_receiver.h
+++ b/tcs/csp_solver_fresnel_collector_receiver.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_gen_collector_receiver.cpp b/tcs/csp_solver_gen_collector_receiver.cpp
index dfd98ed29f..5f5e5e0186 100644
--- a/tcs/csp_solver_gen_collector_receiver.cpp
+++ b/tcs/csp_solver_gen_collector_receiver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_gen_collector_receiver.h b/tcs/csp_solver_gen_collector_receiver.h
index 204eb050a9..8173bf761d 100644
--- a/tcs/csp_solver_gen_collector_receiver.h
+++ b/tcs/csp_solver_gen_collector_receiver.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_lf_dsg_collector_receiver.cpp b/tcs/csp_solver_lf_dsg_collector_receiver.cpp
index 210a628847..572cb3e807 100644
--- a/tcs/csp_solver_lf_dsg_collector_receiver.cpp
+++ b/tcs/csp_solver_lf_dsg_collector_receiver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_lf_dsg_collector_receiver.h b/tcs/csp_solver_lf_dsg_collector_receiver.h
index a7af937221..d708b17d54 100644
--- a/tcs/csp_solver_lf_dsg_collector_receiver.h
+++ b/tcs/csp_solver_lf_dsg_collector_receiver.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_mono_eq_methods.cpp b/tcs/csp_solver_mono_eq_methods.cpp
index 69d2c3fd38..fda85b84df 100644
--- a/tcs/csp_solver_mono_eq_methods.cpp
+++ b/tcs/csp_solver_mono_eq_methods.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_mspt_collector_receiver.cpp b/tcs/csp_solver_mspt_collector_receiver.cpp
index 555f924946..a8b8f4436f 100644
--- a/tcs/csp_solver_mspt_collector_receiver.cpp
+++ b/tcs/csp_solver_mspt_collector_receiver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_mspt_collector_receiver.h b/tcs/csp_solver_mspt_collector_receiver.h
index 3b8f586b10..fb9463abac 100644
--- a/tcs/csp_solver_mspt_collector_receiver.h
+++ b/tcs/csp_solver_mspt_collector_receiver.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_mspt_receiver.cpp b/tcs/csp_solver_mspt_receiver.cpp
index 91ca8a765d..73ecd4a095 100644
--- a/tcs/csp_solver_mspt_receiver.cpp
+++ b/tcs/csp_solver_mspt_receiver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_mspt_receiver.h b/tcs/csp_solver_mspt_receiver.h
index 8049643f86..355760323f 100644
--- a/tcs/csp_solver_mspt_receiver.h
+++ b/tcs/csp_solver_mspt_receiver.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_mspt_receiver_222.cpp b/tcs/csp_solver_mspt_receiver_222.cpp
index 5759660d62..c4d6d9e779 100644
--- a/tcs/csp_solver_mspt_receiver_222.cpp
+++ b/tcs/csp_solver_mspt_receiver_222.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_mspt_receiver_222.h b/tcs/csp_solver_mspt_receiver_222.h
index 58da0e2207..f9163fd8ed 100644
--- a/tcs/csp_solver_mspt_receiver_222.h
+++ b/tcs/csp_solver_mspt_receiver_222.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_packedbed_tes.cpp b/tcs/csp_solver_packedbed_tes.cpp
index 835b5ab036..205de73cd5 100644
--- a/tcs/csp_solver_packedbed_tes.cpp
+++ b/tcs/csp_solver_packedbed_tes.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_packedbed_tes.h b/tcs/csp_solver_packedbed_tes.h
index 7798d5f941..ed4eef331a 100644
--- a/tcs/csp_solver_packedbed_tes.h
+++ b/tcs/csp_solver_packedbed_tes.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_Rankine_indirect_224.cpp b/tcs/csp_solver_pc_Rankine_indirect_224.cpp
index fc75c892b8..316d5f5577 100644
--- a/tcs/csp_solver_pc_Rankine_indirect_224.cpp
+++ b/tcs/csp_solver_pc_Rankine_indirect_224.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_Rankine_indirect_224.h b/tcs/csp_solver_pc_Rankine_indirect_224.h
index 06f549873d..485966f58a 100644
--- a/tcs/csp_solver_pc_Rankine_indirect_224.h
+++ b/tcs/csp_solver_pc_Rankine_indirect_224.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_gen.cpp b/tcs/csp_solver_pc_gen.cpp
index d8457d9801..94032ec61e 100644
--- a/tcs/csp_solver_pc_gen.cpp
+++ b/tcs/csp_solver_pc_gen.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_gen.h b/tcs/csp_solver_pc_gen.h
index dcf714dc5f..1807992c54 100644
--- a/tcs/csp_solver_pc_gen.h
+++ b/tcs/csp_solver_pc_gen.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_heat_sink.cpp b/tcs/csp_solver_pc_heat_sink.cpp
index 90e0742307..f1843e9d8a 100644
--- a/tcs/csp_solver_pc_heat_sink.cpp
+++ b/tcs/csp_solver_pc_heat_sink.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_heat_sink.h b/tcs/csp_solver_pc_heat_sink.h
index 6264befab5..2107a3f8d1 100644
--- a/tcs/csp_solver_pc_heat_sink.h
+++ b/tcs/csp_solver_pc_heat_sink.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_heat_sink_physical.cpp b/tcs/csp_solver_pc_heat_sink_physical.cpp
index c6b10a63e1..599565ae42 100644
--- a/tcs/csp_solver_pc_heat_sink_physical.cpp
+++ b/tcs/csp_solver_pc_heat_sink_physical.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_heat_sink_physical.h b/tcs/csp_solver_pc_heat_sink_physical.h
index 9c9c25a58a..db5e5c16a4 100644
--- a/tcs/csp_solver_pc_heat_sink_physical.h
+++ b/tcs/csp_solver_pc_heat_sink_physical.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_ptes.cpp b/tcs/csp_solver_pc_ptes.cpp
index 28d1d19abd..345927a1f5 100644
--- a/tcs/csp_solver_pc_ptes.cpp
+++ b/tcs/csp_solver_pc_ptes.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_ptes.h b/tcs/csp_solver_pc_ptes.h
index d877a4bae9..5b5aa43a9a 100644
--- a/tcs/csp_solver_pc_ptes.h
+++ b/tcs/csp_solver_pc_ptes.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_steam_heat_sink.cpp b/tcs/csp_solver_pc_steam_heat_sink.cpp
index 1742dd522d..576875771e 100644
--- a/tcs/csp_solver_pc_steam_heat_sink.cpp
+++ b/tcs/csp_solver_pc_steam_heat_sink.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pc_steam_heat_sink.h b/tcs/csp_solver_pc_steam_heat_sink.h
index 54569ebff5..15b560d450 100644
--- a/tcs/csp_solver_pc_steam_heat_sink.h
+++ b/tcs/csp_solver_pc_steam_heat_sink.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_piston_cylinder_tes.cpp b/tcs/csp_solver_piston_cylinder_tes.cpp
index 02c0d99fd7..5f153a0554 100644
--- a/tcs/csp_solver_piston_cylinder_tes.cpp
+++ b/tcs/csp_solver_piston_cylinder_tes.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_piston_cylinder_tes.h b/tcs/csp_solver_piston_cylinder_tes.h
index acacc3d133..dd81e4a7e0 100644
--- a/tcs/csp_solver_piston_cylinder_tes.h
+++ b/tcs/csp_solver_piston_cylinder_tes.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pt_receiver.cpp b/tcs/csp_solver_pt_receiver.cpp
index 426eabae02..a8c2d33efc 100644
--- a/tcs/csp_solver_pt_receiver.cpp
+++ b/tcs/csp_solver_pt_receiver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pt_receiver.h b/tcs/csp_solver_pt_receiver.h
index 8ae3eb50c3..2dbc8d7661 100644
--- a/tcs/csp_solver_pt_receiver.h
+++ b/tcs/csp_solver_pt_receiver.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pt_sf_perf_interp.cpp b/tcs/csp_solver_pt_sf_perf_interp.cpp
index eaf982ea76..4021373c88 100644
--- a/tcs/csp_solver_pt_sf_perf_interp.cpp
+++ b/tcs/csp_solver_pt_sf_perf_interp.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_pt_sf_perf_interp.h b/tcs/csp_solver_pt_sf_perf_interp.h
index 063a267fac..d2681c60d1 100644
--- a/tcs/csp_solver_pt_sf_perf_interp.h
+++ b/tcs/csp_solver_pt_sf_perf_interp.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_stratified_tes.cpp b/tcs/csp_solver_stratified_tes.cpp
index bb6e35b6c8..76a0a974ea 100644
--- a/tcs/csp_solver_stratified_tes.cpp
+++ b/tcs/csp_solver_stratified_tes.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_stratified_tes.h b/tcs/csp_solver_stratified_tes.h
index ba99cf4431..7d6b5cbcf3 100644
--- a/tcs/csp_solver_stratified_tes.h
+++ b/tcs/csp_solver_stratified_tes.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_tes_core.cpp b/tcs/csp_solver_tes_core.cpp
index ba2fc3613a..c1ebdb7cb6 100644
--- a/tcs/csp_solver_tes_core.cpp
+++ b/tcs/csp_solver_tes_core.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_tes_core.h b/tcs/csp_solver_tes_core.h
index 9f9b9dd502..092884e061 100644
--- a/tcs/csp_solver_tes_core.h
+++ b/tcs/csp_solver_tes_core.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_tou_block_schedules.cpp b/tcs/csp_solver_tou_block_schedules.cpp
index f0b6a1c36d..e4cd66382d 100644
--- a/tcs/csp_solver_tou_block_schedules.cpp
+++ b/tcs/csp_solver_tou_block_schedules.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_trough_collector_receiver.cpp b/tcs/csp_solver_trough_collector_receiver.cpp
index 347f271a4d..25593323af 100644
--- a/tcs/csp_solver_trough_collector_receiver.cpp
+++ b/tcs/csp_solver_trough_collector_receiver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_trough_collector_receiver.h b/tcs/csp_solver_trough_collector_receiver.h
index 39aa1e19e6..62c35e3311 100644
--- a/tcs/csp_solver_trough_collector_receiver.h
+++ b/tcs/csp_solver_trough_collector_receiver.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_two_tank_tes.cpp b/tcs/csp_solver_two_tank_tes.cpp
index 83c9ae6acd..6f508fbe8b 100644
--- a/tcs/csp_solver_two_tank_tes.cpp
+++ b/tcs/csp_solver_two_tank_tes.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_two_tank_tes.h b/tcs/csp_solver_two_tank_tes.h
index ee004c320a..30651f0715 100644
--- a/tcs/csp_solver_two_tank_tes.h
+++ b/tcs/csp_solver_two_tank_tes.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_util.cpp b/tcs/csp_solver_util.cpp
index 38d2d650ed..b791ad496d 100644
--- a/tcs/csp_solver_util.cpp
+++ b/tcs/csp_solver_util.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_util.h b/tcs/csp_solver_util.h
index 820e84ef21..d33ea49481 100644
--- a/tcs/csp_solver_util.h
+++ b/tcs/csp_solver_util.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_solver_weatherreader.cpp b/tcs/csp_solver_weatherreader.cpp
index 91efb6c9c7..2eb7b0ef8c 100644
--- a/tcs/csp_solver_weatherreader.cpp
+++ b/tcs/csp_solver_weatherreader.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_system_costs.cpp b/tcs/csp_system_costs.cpp
index 268255b051..3cd7a629fb 100644
--- a/tcs/csp_system_costs.cpp
+++ b/tcs/csp_system_costs.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/csp_system_costs.h b/tcs/csp_system_costs.h
index 0ffbba787a..9f06ecf1e5 100644
--- a/tcs/csp_system_costs.h
+++ b/tcs/csp_system_costs.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/cst_iph_dispatch.cpp b/tcs/cst_iph_dispatch.cpp
index 20ffc71daf..e1e7ba31a8 100644
--- a/tcs/cst_iph_dispatch.cpp
+++ b/tcs/cst_iph_dispatch.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/cst_iph_dispatch.h b/tcs/cst_iph_dispatch.h
index 14d4e4830e..cebeb25360 100644
--- a/tcs/cst_iph_dispatch.h
+++ b/tcs/cst_iph_dispatch.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/datatest.cpp b/tcs/datatest.cpp
index 23af644775..206b8a62bd 100644
--- a/tcs/datatest.cpp
+++ b/tcs/datatest.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/dispatch_builder.cpp b/tcs/dispatch_builder.cpp
index 6b7c12f0e8..9fcaa47876 100644
--- a/tcs/dispatch_builder.cpp
+++ b/tcs/dispatch_builder.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/dispatch_builder.h b/tcs/dispatch_builder.h
index 625eda8b8b..caa34dadd5 100644
--- a/tcs/dispatch_builder.h
+++ b/tcs/dispatch_builder.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/etes_dispatch.cpp b/tcs/etes_dispatch.cpp
index e17a0d31a4..3c76758adf 100644
--- a/tcs/etes_dispatch.cpp
+++ b/tcs/etes_dispatch.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/etes_dispatch.h b/tcs/etes_dispatch.h
index 3bf7a24623..28b408aa80 100644
--- a/tcs/etes_dispatch.h
+++ b/tcs/etes_dispatch.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/flat_plate_solar_collector.cpp b/tcs/flat_plate_solar_collector.cpp
index 17e04853ff..89b0641057 100644
--- a/tcs/flat_plate_solar_collector.cpp
+++ b/tcs/flat_plate_solar_collector.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/flat_plate_solar_collector.h b/tcs/flat_plate_solar_collector.h
index f6bcc419bc..eb7856c5f5 100644
--- a/tcs/flat_plate_solar_collector.h
+++ b/tcs/flat_plate_solar_collector.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/heat_exchangers.cpp b/tcs/heat_exchangers.cpp
index eecb3d4eaa..e891bcb0d9 100644
--- a/tcs/heat_exchangers.cpp
+++ b/tcs/heat_exchangers.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/heat_exchangers.h b/tcs/heat_exchangers.h
index d6b4e32634..1b8abf4f9a 100644
--- a/tcs/heat_exchangers.h
+++ b/tcs/heat_exchangers.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/htf_props.cpp b/tcs/htf_props.cpp
index 3c605d56df..9283355fcf 100644
--- a/tcs/htf_props.cpp
+++ b/tcs/htf_props.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/htf_props.h b/tcs/htf_props.h
index 8476036f3f..8e98fd8e53 100644
--- a/tcs/htf_props.h
+++ b/tcs/htf_props.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/interconnect.cpp b/tcs/interconnect.cpp
index 77dd5e3832..a9f147407d 100644
--- a/tcs/interconnect.cpp
+++ b/tcs/interconnect.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/interconnect.h b/tcs/interconnect.h
index 0cbb8745d0..bd7cd36888 100644
--- a/tcs/interconnect.h
+++ b/tcs/interconnect.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/interpolation_routines.cpp b/tcs/interpolation_routines.cpp
index 5b8cd8a32e..58d50d5693 100644
--- a/tcs/interpolation_routines.cpp
+++ b/tcs/interpolation_routines.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/interpolation_routines.h b/tcs/interpolation_routines.h
index a2ad2c1dcc..ba7701dbed 100644
--- a/tcs/interpolation_routines.h
+++ b/tcs/interpolation_routines.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/numeric_solvers.cpp b/tcs/numeric_solvers.cpp
index c2c5f4d662..ea0782470b 100644
--- a/tcs/numeric_solvers.cpp
+++ b/tcs/numeric_solvers.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/numeric_solvers.h b/tcs/numeric_solvers.h
index 27a32ee359..13417c5648 100644
--- a/tcs/numeric_solvers.h
+++ b/tcs/numeric_solvers.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/ptes_solver_design_point.cpp b/tcs/ptes_solver_design_point.cpp
index 30c65e41bb..a14e06fa23 100644
--- a/tcs/ptes_solver_design_point.cpp
+++ b/tcs/ptes_solver_design_point.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/ptes_solver_design_point.h b/tcs/ptes_solver_design_point.h
index 652ae37a62..733cf17480 100644
--- a/tcs/ptes_solver_design_point.h
+++ b/tcs/ptes_solver_design_point.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/pump.cpp b/tcs/pump.cpp
index ae84579487..0c42e068a6 100644
--- a/tcs/pump.cpp
+++ b/tcs/pump.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sam_csp_util.cpp b/tcs/sam_csp_util.cpp
index 18fa051b40..701f0d1d5d 100644
--- a/tcs/sam_csp_util.cpp
+++ b/tcs/sam_csp_util.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sam_csp_util.h b/tcs/sam_csp_util.h
index a0609a492b..9f90d9df77 100644
--- a/tcs/sam_csp_util.h
+++ b/tcs/sam_csp_util.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sam_lf_st_pt_type232.cpp b/tcs/sam_lf_st_pt_type232.cpp
index ed7fd9444d..f0e05a6238 100644
--- a/tcs/sam_lf_st_pt_type232.cpp
+++ b/tcs/sam_lf_st_pt_type232.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sam_mw_gen_Type260_csp_solver.cpp b/tcs/sam_mw_gen_Type260_csp_solver.cpp
index 997248e03e..0103e273fa 100644
--- a/tcs/sam_mw_gen_Type260_csp_solver.cpp
+++ b/tcs/sam_mw_gen_Type260_csp_solver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sam_mw_lf_type261_Wnet.cpp b/tcs/sam_mw_lf_type261_Wnet.cpp
index 90f49c6edf..b108910b5e 100644
--- a/tcs/sam_mw_lf_type261_Wnet.cpp
+++ b/tcs/sam_mw_lf_type261_Wnet.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sam_mw_lf_type261_steam.cpp b/tcs/sam_mw_lf_type261_steam.cpp
index b412a055a7..f277a6e453 100644
--- a/tcs/sam_mw_lf_type261_steam.cpp
+++ b/tcs/sam_mw_lf_type261_steam.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sam_mw_pt_type228.cpp b/tcs/sam_mw_pt_type228.cpp
index 31e402f8bd..4f1de0d876 100644
--- a/tcs/sam_mw_pt_type228.cpp
+++ b/tcs/sam_mw_pt_type228.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sam_mw_type234.cpp b/tcs/sam_mw_type234.cpp
index a1bb2ff51d..a4965febdf 100644
--- a/tcs/sam_mw_type234.cpp
+++ b/tcs/sam_mw_type234.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sam_trough_model_type805.cpp b/tcs/sam_trough_model_type805.cpp
index 7a13352f8e..3510d4acfe 100644
--- a/tcs/sam_trough_model_type805.cpp
+++ b/tcs/sam_trough_model_type805.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sam_trough_plant_type807.cpp b/tcs/sam_trough_plant_type807.cpp
index 2c26ffb2a3..f0b02f7b50 100644
--- a/tcs/sam_trough_plant_type807.cpp
+++ b/tcs/sam_trough_plant_type807.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sam_trough_storage_type806.cpp b/tcs/sam_trough_storage_type806.cpp
index 187d179728..0627bac84f 100644
--- a/tcs/sam_trough_storage_type806.cpp
+++ b/tcs/sam_trough_storage_type806.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sco2_htrbypass_cycle.cpp b/tcs/sco2_htrbypass_cycle.cpp
index b69e3bdc9a..939d7c49b9 100644
--- a/tcs/sco2_htrbypass_cycle.cpp
+++ b/tcs/sco2_htrbypass_cycle.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sco2_htrbypass_cycle.h b/tcs/sco2_htrbypass_cycle.h
index cc0ea5eb57..9f3ae55b76 100644
--- a/tcs/sco2_htrbypass_cycle.h
+++ b/tcs/sco2_htrbypass_cycle.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sco2_partialcooling_cycle.cpp b/tcs/sco2_partialcooling_cycle.cpp
index 843811505d..7c86e7812a 100644
--- a/tcs/sco2_partialcooling_cycle.cpp
+++ b/tcs/sco2_partialcooling_cycle.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sco2_partialcooling_cycle.h b/tcs/sco2_partialcooling_cycle.h
index 97d46c89ef..6875bcdf20 100644
--- a/tcs/sco2_partialcooling_cycle.h
+++ b/tcs/sco2_partialcooling_cycle.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sco2_pc_csp_int.cpp b/tcs/sco2_pc_csp_int.cpp
index beb6a6d672..0762fa5e71 100644
--- a/tcs/sco2_pc_csp_int.cpp
+++ b/tcs/sco2_pc_csp_int.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sco2_pc_csp_int.h b/tcs/sco2_pc_csp_int.h
index a172b5e769..8c8ceea700 100644
--- a/tcs/sco2_pc_csp_int.h
+++ b/tcs/sco2_pc_csp_int.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sco2_recompression_cycle.cpp b/tcs/sco2_recompression_cycle.cpp
index 2a747ed1d5..03c58d388c 100644
--- a/tcs/sco2_recompression_cycle.cpp
+++ b/tcs/sco2_recompression_cycle.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sco2_recompression_cycle.h b/tcs/sco2_recompression_cycle.h
index 43d8ca5032..5d6e1ff02f 100644
--- a/tcs/sco2_recompression_cycle.h
+++ b/tcs/sco2_recompression_cycle.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sco2_turbinesplitflow_cycle.cpp b/tcs/sco2_turbinesplitflow_cycle.cpp
index 7ee71df601..1df24fc9ae 100644
--- a/tcs/sco2_turbinesplitflow_cycle.cpp
+++ b/tcs/sco2_turbinesplitflow_cycle.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sco2_turbinesplitflow_cycle.h b/tcs/sco2_turbinesplitflow_cycle.h
index 21360294f1..89330eb2d3 100644
--- a/tcs/sco2_turbinesplitflow_cycle.h
+++ b/tcs/sco2_turbinesplitflow_cycle.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/storage_hx.cpp b/tcs/storage_hx.cpp
index dacbdfaebf..b4e09f5a51 100644
--- a/tcs/storage_hx.cpp
+++ b/tcs/storage_hx.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/storage_hx.h b/tcs/storage_hx.h
index b7cc9c9527..42c8a67a67 100644
--- a/tcs/storage_hx.h
+++ b/tcs/storage_hx.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/sumprod.cpp b/tcs/sumprod.cpp
index a868458555..eac7288418 100644
--- a/tcs/sumprod.cpp
+++ b/tcs/sumprod.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/tcs_debug.h b/tcs/tcs_debug.h
index 53e3876f43..a2d24ac3f0 100644
--- a/tcs/tcs_debug.h
+++ b/tcs/tcs_debug.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/tcskernel.cpp b/tcs/tcskernel.cpp
index 389359e136..1fc3f6893b 100644
--- a/tcs/tcskernel.cpp
+++ b/tcs/tcskernel.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/tcskernel.h b/tcs/tcskernel.h
index 4b3905d8a0..a54231a1d6 100644
--- a/tcs/tcskernel.h
+++ b/tcs/tcskernel.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/tcstype.h b/tcs/tcstype.h
index ef5f769b8e..f41cefbccb 100644
--- a/tcs/tcstype.h
+++ b/tcs/tcstype.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/tou_translator_csp_solver.cpp b/tcs/tou_translator_csp_solver.cpp
index 2cf9cad48c..8756059de7 100644
--- a/tcs/tou_translator_csp_solver.cpp
+++ b/tcs/tou_translator_csp_solver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/trnsys_weatherreader.cpp b/tcs/trnsys_weatherreader.cpp
index f633796252..bcaf29dd59 100644
--- a/tcs/trnsys_weatherreader.cpp
+++ b/tcs/trnsys_weatherreader.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/typelib.cpp b/tcs/typelib.cpp
index 3f9d17e939..a5e6a470d0 100644
--- a/tcs/typelib.cpp
+++ b/tcs/typelib.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/ud_power_cycle.cpp b/tcs/ud_power_cycle.cpp
index 12e5894216..cf883e4e2d 100644
--- a/tcs/ud_power_cycle.cpp
+++ b/tcs/ud_power_cycle.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/ud_power_cycle.h b/tcs/ud_power_cycle.h
index 921ca5c977..7bbae179a2 100644
--- a/tcs/ud_power_cycle.h
+++ b/tcs/ud_power_cycle.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tcs/water_properties.cpp b/tcs/water_properties.cpp
index 7ba5781c82..4e75f53b3d 100644
--- a/tcs/water_properties.cpp
+++ b/tcs/water_properties.cpp
@@ -3,7 +3,7 @@ Copyright (c) 2016, Northland Numerics LLC
 All rights reserved.
 
 Use of this software in source and binary forms, with or without modification, is permitted for
-Alliance for Sustainable Energy, LLC (the “Licensee�) and for third parties that receive this
+Alliance for Energy Innovation, LLC (the “Licensee�) and for third parties that receive this
 software, with or without modification, directly from Licensee.  Licensee is permitted to
 redistribute this software in source and binary forms, with or without modification, provided
 that redistributions of source code must retain the above copyright notice and reservation of
diff --git a/tcs/water_properties.h b/tcs/water_properties.h
index 7b0a303756..e2da16695c 100644
--- a/tcs/water_properties.h
+++ b/tcs/water_properties.h
@@ -9,7 +9,7 @@ Copyright (c) 2016, Northland Numerics LLC
 All rights reserved.
 
 Use of this software in source and binary forms, with or without modification, is permitted for
-Alliance for Sustainable Energy, LLC (the “Licensee”) and for third parties that receive this
+Alliance for Energy Innovation, LLC (the �Licensee�) and for third parties that receive this
 software, with or without modification, directly from Licensee.  Licensee is permitted to
 redistribute this software in source and binary forms, with or without modification, provided
 that redistributions of source code must retain the above copyright notice and reservation of
diff --git a/tcs/weatherreader_csp_solver.cpp b/tcs/weatherreader_csp_solver.cpp
index 7c2a137e39..b14bc8d470 100644
--- a/tcs/weatherreader_csp_solver.cpp
+++ b/tcs/weatherreader_csp_solver.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/battery_common_data.h b/test/input_cases/battery_common_data.h
index 5d6516a924..5029fec2cb 100644
--- a/test/input_cases/battery_common_data.h
+++ b/test/input_cases/battery_common_data.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/battwatts_cases.h b/test/input_cases/battwatts_cases.h
index 461f31834e..2e198b40f7 100644
--- a/test/input_cases/battwatts_cases.h
+++ b/test/input_cases/battwatts_cases.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/biomass_common.h b/test/input_cases/biomass_common.h
index 0108f9d2fb..30ffb54849 100644
--- a/test/input_cases/biomass_common.h
+++ b/test/input_cases/biomass_common.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/code_generator_utilities.h b/test/input_cases/code_generator_utilities.h
index 874ddf9677..9cc7f785cb 100644
--- a/test/input_cases/code_generator_utilities.h
+++ b/test/input_cases/code_generator_utilities.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/custom_generation_common_data.h b/test/input_cases/custom_generation_common_data.h
index 4f397336f3..6e2f1abad0 100644
--- a/test/input_cases/custom_generation_common_data.h
+++ b/test/input_cases/custom_generation_common_data.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/etes_etes_defaults.h b/test/input_cases/etes_etes_defaults.h
index 5b8da89dcb..9f59755900 100644
--- a/test/input_cases/etes_etes_defaults.h
+++ b/test/input_cases/etes_etes_defaults.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/etes_ptes_defaults.h b/test/input_cases/etes_ptes_defaults.h
index 1ca8b1c020..cb6e1fd60b 100644
--- a/test/input_cases/etes_ptes_defaults.h
+++ b/test/input_cases/etes_ptes_defaults.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/fuelcell_common_data.h b/test/input_cases/fuelcell_common_data.h
index bb749d3e25..863f512d8f 100644
--- a/test/input_cases/fuelcell_common_data.h
+++ b/test/input_cases/fuelcell_common_data.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/geothermal_common_data.h b/test/input_cases/geothermal_common_data.h
index 131e1b57ec..575f6069f2 100644
--- a/test/input_cases/geothermal_common_data.h
+++ b/test/input_cases/geothermal_common_data.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/geothermal_costs_common_data.h b/test/input_cases/geothermal_costs_common_data.h
index 768d35d47f..2321705dcc 100644
--- a/test/input_cases/geothermal_costs_common_data.h
+++ b/test/input_cases/geothermal_costs_common_data.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/grid_common_data.h b/test/input_cases/grid_common_data.h
index 4c394c6e0a..a0b47678fa 100644
--- a/test/input_cases/grid_common_data.h
+++ b/test/input_cases/grid_common_data.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/mhk/mhk_cost_inputs.h b/test/input_cases/mhk/mhk_cost_inputs.h
index 06a7f25e2e..c714afabde 100644
--- a/test/input_cases/mhk/mhk_cost_inputs.h
+++ b/test/input_cases/mhk/mhk_cost_inputs.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/mhk/mhk_tidal_inputs.h b/test/input_cases/mhk/mhk_tidal_inputs.h
index dcb5ce562b..173b75c6f2 100644
--- a/test/input_cases/mhk/mhk_tidal_inputs.h
+++ b/test/input_cases/mhk/mhk_tidal_inputs.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/mhk/mhk_wave_inputs.h b/test/input_cases/mhk/mhk_wave_inputs.h
index 2b22dccefe..7c6d8b403b 100644
--- a/test/input_cases/mhk/mhk_wave_inputs.h
+++ b/test/input_cases/mhk/mhk_wave_inputs.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/pvsamv1_battery_common_data.h b/test/input_cases/pvsamv1_battery_common_data.h
index 5254aad997..d53e1ea530 100644
--- a/test/input_cases/pvsamv1_battery_common_data.h
+++ b/test/input_cases/pvsamv1_battery_common_data.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/pvsamv1_cases.h b/test/input_cases/pvsamv1_cases.h
index 0c72276fb9..673c19fb33 100644
--- a/test/input_cases/pvsamv1_cases.h
+++ b/test/input_cases/pvsamv1_cases.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/pvsamv1_common_data.cpp b/test/input_cases/pvsamv1_common_data.cpp
index e17f4a51ba..4622099bb7 100644
--- a/test/input_cases/pvsamv1_common_data.cpp
+++ b/test/input_cases/pvsamv1_common_data.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/pvsamv1_common_data.h b/test/input_cases/pvsamv1_common_data.h
index 176ee2f8e4..65a15517c3 100644
--- a/test/input_cases/pvsamv1_common_data.h
+++ b/test/input_cases/pvsamv1_common_data.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/pvwatts_cases.h b/test/input_cases/pvwatts_cases.h
index 73b8f797a7..e1773d4315 100644
--- a/test/input_cases/pvwatts_cases.h
+++ b/test/input_cases/pvwatts_cases.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/pvyield_cases.h b/test/input_cases/pvyield_cases.h
index 0f4cd66b15..1cfcb368c2 100644
--- a/test/input_cases/pvyield_cases.h
+++ b/test/input_cases/pvyield_cases.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/pvyield_common_data.h b/test/input_cases/pvyield_common_data.h
index 97ab098e2a..28e05fa1f8 100644
--- a/test/input_cases/pvyield_common_data.h
+++ b/test/input_cases/pvyield_common_data.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/shared_rate_data.cpp b/test/input_cases/shared_rate_data.cpp
index 0175387575..7cc0589ffb 100644
--- a/test/input_cases/shared_rate_data.cpp
+++ b/test/input_cases/shared_rate_data.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/shared_rate_data.h b/test/input_cases/shared_rate_data.h
index ca97f0ff01..1d3d5f9673 100644
--- a/test/input_cases/shared_rate_data.h
+++ b/test/input_cases/shared_rate_data.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/singleowner_common.h b/test/input_cases/singleowner_common.h
index 6d932a7245..a08c7d1f16 100644
--- a/test/input_cases/singleowner_common.h
+++ b/test/input_cases/singleowner_common.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/sscapi.h b/test/input_cases/sscapi.h
index cac72b8ed8..43bf766126 100644
--- a/test/input_cases/sscapi.h
+++ b/test/input_cases/sscapi.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/swh_common.h b/test/input_cases/swh_common.h
index 770e58de96..f3133366cf 100644
--- a/test/input_cases/swh_common.h
+++ b/test/input_cases/swh_common.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/tcsmolten_salt_defaults.h b/test/input_cases/tcsmolten_salt_defaults.h
index 7d5a674319..911973d11b 100644
--- a/test/input_cases/tcsmolten_salt_defaults.h
+++ b/test/input_cases/tcsmolten_salt_defaults.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/tcstrough_empirical_defaults.h b/test/input_cases/tcstrough_empirical_defaults.h
index fc23af0652..2695c5a1a6 100644
--- a/test/input_cases/tcstrough_empirical_defaults.h
+++ b/test/input_cases/tcstrough_empirical_defaults.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/trough_physical_defaults.h b/test/input_cases/trough_physical_defaults.h
index 7a6a420986..1858ea6be0 100644
--- a/test/input_cases/trough_physical_defaults.h
+++ b/test/input_cases/trough_physical_defaults.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/trough_physical_iph_defaults.h b/test/input_cases/trough_physical_iph_defaults.h
index 942600832f..ee2519143e 100644
--- a/test/input_cases/trough_physical_iph_defaults.h
+++ b/test/input_cases/trough_physical_iph_defaults.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/weather_inputs.cpp b/test/input_cases/weather_inputs.cpp
index 61defeb721..4bb8e720fd 100644
--- a/test/input_cases/weather_inputs.cpp
+++ b/test/input_cases/weather_inputs.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/weather_inputs.h b/test/input_cases/weather_inputs.h
index 6123136257..53fa060196 100644
--- a/test/input_cases/weather_inputs.h
+++ b/test/input_cases/weather_inputs.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_cases/windpower_cases.h b/test/input_cases/windpower_cases.h
index b7f68c6058..d0ea3920a6 100644
--- a/test/input_cases/windpower_cases.h
+++ b/test/input_cases/windpower_cases.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/input_json/sscapi.h b/test/input_json/sscapi.h
index 2e458bb6fd..d04b5bb3c2 100644
--- a/test/input_json/sscapi.h
+++ b/test/input_json/sscapi.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/main.cpp b/test/main.cpp
index 356d3a4bed..97534f48a9 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/6par_solve_test.cpp b/test/shared_test/6par_solve_test.cpp
index 92d6a16f0a..2cc87be16a 100644
--- a/test/shared_test/6par_solve_test.cpp
+++ b/test/shared_test/6par_solve_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_capacity_test.cpp b/test/shared_test/lib_battery_capacity_test.cpp
index cd249cc6c2..6a7d24c031 100644
--- a/test/shared_test/lib_battery_capacity_test.cpp
+++ b/test/shared_test/lib_battery_capacity_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_capacity_test.h b/test/shared_test/lib_battery_capacity_test.h
index 44996b29bf..58ec8ee9fd 100644
--- a/test/shared_test/lib_battery_capacity_test.h
+++ b/test/shared_test/lib_battery_capacity_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_dispatch_automatic_btm_test.cpp b/test/shared_test/lib_battery_dispatch_automatic_btm_test.cpp
index 632d63cdc1..77ce41c8ce 100644
--- a/test/shared_test/lib_battery_dispatch_automatic_btm_test.cpp
+++ b/test/shared_test/lib_battery_dispatch_automatic_btm_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_dispatch_automatic_btm_test.h b/test/shared_test/lib_battery_dispatch_automatic_btm_test.h
index 2e30078a37..62f58ca2ff 100644
--- a/test/shared_test/lib_battery_dispatch_automatic_btm_test.h
+++ b/test/shared_test/lib_battery_dispatch_automatic_btm_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_dispatch_automatic_fom_test.cpp b/test/shared_test/lib_battery_dispatch_automatic_fom_test.cpp
index b6ddcf9e2c..d2527bbf30 100644
--- a/test/shared_test/lib_battery_dispatch_automatic_fom_test.cpp
+++ b/test/shared_test/lib_battery_dispatch_automatic_fom_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_dispatch_automatic_fom_test.h b/test/shared_test/lib_battery_dispatch_automatic_fom_test.h
index 8dab599b52..487c52c42a 100644
--- a/test/shared_test/lib_battery_dispatch_automatic_fom_test.h
+++ b/test/shared_test/lib_battery_dispatch_automatic_fom_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_dispatch_manual_test.cpp b/test/shared_test/lib_battery_dispatch_manual_test.cpp
index 8638e36e53..15f80484ea 100644
--- a/test/shared_test/lib_battery_dispatch_manual_test.cpp
+++ b/test/shared_test/lib_battery_dispatch_manual_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_dispatch_manual_test.h b/test/shared_test/lib_battery_dispatch_manual_test.h
index 2a6c449a3e..34363c0aa7 100644
--- a/test/shared_test/lib_battery_dispatch_manual_test.h
+++ b/test/shared_test/lib_battery_dispatch_manual_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_dispatch_pvsmoothing_fom_test.cpp b/test/shared_test/lib_battery_dispatch_pvsmoothing_fom_test.cpp
index f00374fd1b..0332522493 100644
--- a/test/shared_test/lib_battery_dispatch_pvsmoothing_fom_test.cpp
+++ b/test/shared_test/lib_battery_dispatch_pvsmoothing_fom_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_dispatch_pvsmoothing_fom_test.h b/test/shared_test/lib_battery_dispatch_pvsmoothing_fom_test.h
index cdb75449b1..cbdf578d6b 100644
--- a/test/shared_test/lib_battery_dispatch_pvsmoothing_fom_test.h
+++ b/test/shared_test/lib_battery_dispatch_pvsmoothing_fom_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_dispatch_test.h b/test/shared_test/lib_battery_dispatch_test.h
index e9bf22deb1..f5f7eb277e 100644
--- a/test/shared_test/lib_battery_dispatch_test.h
+++ b/test/shared_test/lib_battery_dispatch_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_lifetime_lmolto_test.cpp b/test/shared_test/lib_battery_lifetime_lmolto_test.cpp
index 94e7d94304..29da6d5120 100644
--- a/test/shared_test/lib_battery_lifetime_lmolto_test.cpp
+++ b/test/shared_test/lib_battery_lifetime_lmolto_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_lifetime_nmc_test.cpp b/test/shared_test/lib_battery_lifetime_nmc_test.cpp
index 19f1c4a3f1..011dee2d4d 100644
--- a/test/shared_test/lib_battery_lifetime_nmc_test.cpp
+++ b/test/shared_test/lib_battery_lifetime_nmc_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_lifetime_test.cpp b/test/shared_test/lib_battery_lifetime_test.cpp
index 39c10188f6..846bc8af74 100644
--- a/test/shared_test/lib_battery_lifetime_test.cpp
+++ b/test/shared_test/lib_battery_lifetime_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_lifetime_test.h b/test/shared_test/lib_battery_lifetime_test.h
index b521500ded..cbcbaba2e7 100644
--- a/test/shared_test/lib_battery_lifetime_test.h
+++ b/test/shared_test/lib_battery_lifetime_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_powerflow_test.cpp b/test/shared_test/lib_battery_powerflow_test.cpp
index 81519f6432..b9ac3d049b 100644
--- a/test/shared_test/lib_battery_powerflow_test.cpp
+++ b/test/shared_test/lib_battery_powerflow_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_powerflow_test.h b/test/shared_test/lib_battery_powerflow_test.h
index 610222b842..0ad2abfb92 100644
--- a/test/shared_test/lib_battery_powerflow_test.h
+++ b/test/shared_test/lib_battery_powerflow_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_properties.h b/test/shared_test/lib_battery_properties.h
index dd27c73ae1..cb90f31082 100644
--- a/test/shared_test/lib_battery_properties.h
+++ b/test/shared_test/lib_battery_properties.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_test.cpp b/test/shared_test/lib_battery_test.cpp
index dab1483718..9d8e4f4e55 100644
--- a/test/shared_test/lib_battery_test.cpp
+++ b/test/shared_test/lib_battery_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_test.h b/test/shared_test/lib_battery_test.h
index 7da652cb53..1992780eb7 100644
--- a/test/shared_test/lib_battery_test.h
+++ b/test/shared_test/lib_battery_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_voltage_test.cpp b/test/shared_test/lib_battery_voltage_test.cpp
index a3498ebf09..683abe16ef 100644
--- a/test/shared_test/lib_battery_voltage_test.cpp
+++ b/test/shared_test/lib_battery_voltage_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_battery_voltage_test.h b/test/shared_test/lib_battery_voltage_test.h
index af506e69ea..478a64531a 100644
--- a/test/shared_test/lib_battery_voltage_test.h
+++ b/test/shared_test/lib_battery_voltage_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_csp_tes_test.cpp b/test/shared_test/lib_csp_tes_test.cpp
index 79f723bbf7..c06251ff85 100644
--- a/test/shared_test/lib_csp_tes_test.cpp
+++ b/test/shared_test/lib_csp_tes_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_csp_tes_test.h b/test/shared_test/lib_csp_tes_test.h
index e06898c025..e5d42e0779 100644
--- a/test/shared_test/lib_csp_tes_test.h
+++ b/test/shared_test/lib_csp_tes_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_csp_trough_test.cpp b/test/shared_test/lib_csp_trough_test.cpp
index 94a01f1e7e..60e7917962 100644
--- a/test/shared_test/lib_csp_trough_test.cpp
+++ b/test/shared_test/lib_csp_trough_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_csp_trough_test.h b/test/shared_test/lib_csp_trough_test.h
index dcca442bd5..52536aaf80 100644
--- a/test/shared_test/lib_csp_trough_test.h
+++ b/test/shared_test/lib_csp_trough_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_fuel_cell_test.cpp b/test/shared_test/lib_fuel_cell_test.cpp
index f133073d75..7f15440889 100644
--- a/test/shared_test/lib_fuel_cell_test.cpp
+++ b/test/shared_test/lib_fuel_cell_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_fuel_cell_test.h b/test/shared_test/lib_fuel_cell_test.h
index 2f4354cc5a..5d3ede9827 100644
--- a/test/shared_test/lib_fuel_cell_test.h
+++ b/test/shared_test/lib_fuel_cell_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_geothermal_test.cpp b/test/shared_test/lib_geothermal_test.cpp
index 4898577b3e..bb1084f708 100644
--- a/test/shared_test/lib_geothermal_test.cpp
+++ b/test/shared_test/lib_geothermal_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_geothermal_test.h b/test/shared_test/lib_geothermal_test.h
index e69706f506..7f59e6d2e2 100644
--- a/test/shared_test/lib_geothermal_test.h
+++ b/test/shared_test/lib_geothermal_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_irradproc_test.cpp b/test/shared_test/lib_irradproc_test.cpp
index eb210967f9..12ef7663c7 100644
--- a/test/shared_test/lib_irradproc_test.cpp
+++ b/test/shared_test/lib_irradproc_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_irradproc_test.h b/test/shared_test/lib_irradproc_test.h
index 9e71f60224..921bb5dd97 100644
--- a/test/shared_test/lib_irradproc_test.h
+++ b/test/shared_test/lib_irradproc_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_resilience_test.cpp b/test/shared_test/lib_resilience_test.cpp
index 70cb33ccf0..149f9b22c0 100644
--- a/test/shared_test/lib_resilience_test.cpp
+++ b/test/shared_test/lib_resilience_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_resilience_test.h b/test/shared_test/lib_resilience_test.h
index 7b4c1f97d0..1b616e46c4 100644
--- a/test/shared_test/lib_resilience_test.h
+++ b/test/shared_test/lib_resilience_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_shared_inverter_test.cpp b/test/shared_test/lib_shared_inverter_test.cpp
index cf849d0f95..7fdddd684b 100644
--- a/test/shared_test/lib_shared_inverter_test.cpp
+++ b/test/shared_test/lib_shared_inverter_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_solar_thermal_test.cpp b/test/shared_test/lib_solar_thermal_test.cpp
index 22b89a3771..e43c6c37ff 100644
--- a/test/shared_test/lib_solar_thermal_test.cpp
+++ b/test/shared_test/lib_solar_thermal_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_solar_thermal_test.h b/test/shared_test/lib_solar_thermal_test.h
index 4ab7af49f7..cc6ea3178b 100644
--- a/test/shared_test/lib_solar_thermal_test.h
+++ b/test/shared_test/lib_solar_thermal_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_time_test.cpp b/test/shared_test/lib_time_test.cpp
index 4d795c4ead..d99fda4b46 100644
--- a/test/shared_test/lib_time_test.cpp
+++ b/test/shared_test/lib_time_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_time_test.h b/test/shared_test/lib_time_test.h
index 19b2f0ecca..53583a4862 100644
--- a/test/shared_test/lib_time_test.h
+++ b/test/shared_test/lib_time_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_util_test.cpp b/test/shared_test/lib_util_test.cpp
index 2b5ec492d7..9f56de134a 100644
--- a/test/shared_test/lib_util_test.cpp
+++ b/test/shared_test/lib_util_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_utility_rate_equations_test.cpp b/test/shared_test/lib_utility_rate_equations_test.cpp
index 1c5af7aee0..55eae5d7b3 100644
--- a/test/shared_test/lib_utility_rate_equations_test.cpp
+++ b/test/shared_test/lib_utility_rate_equations_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_utility_rate_test.cpp b/test/shared_test/lib_utility_rate_test.cpp
index 0f6e644243..1eb7df7460 100644
--- a/test/shared_test/lib_utility_rate_test.cpp
+++ b/test/shared_test/lib_utility_rate_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_weatherfile_test.cpp b/test/shared_test/lib_weatherfile_test.cpp
index 8620649af4..19760bdcd1 100644
--- a/test/shared_test/lib_weatherfile_test.cpp
+++ b/test/shared_test/lib_weatherfile_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_windfile_test.cpp b/test/shared_test/lib_windfile_test.cpp
index 8dddb1faf9..baa41b9998 100644
--- a/test/shared_test/lib_windfile_test.cpp
+++ b/test/shared_test/lib_windfile_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_windwakemodel_test.cpp b/test/shared_test/lib_windwakemodel_test.cpp
index a3a48fdf32..01eb2d481a 100644
--- a/test/shared_test/lib_windwakemodel_test.cpp
+++ b/test/shared_test/lib_windwakemodel_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_windwakemodel_test.h b/test/shared_test/lib_windwakemodel_test.h
index 49a9f7cc10..b2783ac663 100644
--- a/test/shared_test/lib_windwakemodel_test.h
+++ b/test/shared_test/lib_windwakemodel_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/shared_test/lib_windwatts_test.cpp b/test/shared_test/lib_windwatts_test.cpp
index 54889d6a21..5fe5066c94 100644
--- a/test/shared_test/lib_windwatts_test.cpp
+++ b/test/shared_test/lib_windwatts_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_6parsolve_test.cpp b/test/ssc_test/cmod_6parsolve_test.cpp
index 5805cc2723..b96ff89deb 100644
--- a/test/ssc_test/cmod_6parsolve_test.cpp
+++ b/test/ssc_test/cmod_6parsolve_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_battery_eqns_test.cpp b/test/ssc_test/cmod_battery_eqns_test.cpp
index 093671eb8d..a0584c089d 100644
--- a/test/ssc_test/cmod_battery_eqns_test.cpp
+++ b/test/ssc_test/cmod_battery_eqns_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_battery_eqns_test.h b/test/ssc_test/cmod_battery_eqns_test.h
index 674cd8c405..fa9093c049 100644
--- a/test/ssc_test/cmod_battery_eqns_test.h
+++ b/test/ssc_test/cmod_battery_eqns_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_battery_pvsamv1_test.cpp b/test/ssc_test/cmod_battery_pvsamv1_test.cpp
index cef3581bd4..2e59c56820 100644
--- a/test/ssc_test/cmod_battery_pvsamv1_test.cpp
+++ b/test/ssc_test/cmod_battery_pvsamv1_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_battery_pvsamv1_test.h b/test/ssc_test/cmod_battery_pvsamv1_test.h
index 320b26408c..a1c12fd3e8 100644
--- a/test/ssc_test/cmod_battery_pvsamv1_test.h
+++ b/test/ssc_test/cmod_battery_pvsamv1_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_battery_stateful_test.cpp b/test/ssc_test/cmod_battery_stateful_test.cpp
index 161eea11bc..bdda94dcd4 100644
--- a/test/ssc_test/cmod_battery_stateful_test.cpp
+++ b/test/ssc_test/cmod_battery_stateful_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_battery_stateful_test.h b/test/ssc_test/cmod_battery_stateful_test.h
index d0d779eaa1..87e8fdad0f 100644
--- a/test/ssc_test/cmod_battery_stateful_test.h
+++ b/test/ssc_test/cmod_battery_stateful_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_battery_test.cpp b/test/ssc_test/cmod_battery_test.cpp
index 1b7ca7489d..f6045d683f 100644
--- a/test/ssc_test/cmod_battery_test.cpp
+++ b/test/ssc_test/cmod_battery_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_battery_test.h b/test/ssc_test/cmod_battery_test.h
index 845f0a25f1..71b0c9d4c0 100644
--- a/test/ssc_test/cmod_battery_test.h
+++ b/test/ssc_test/cmod_battery_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_battwatts_test.cpp b/test/ssc_test/cmod_battwatts_test.cpp
index b8c0d1438b..61998bf187 100644
--- a/test/ssc_test/cmod_battwatts_test.cpp
+++ b/test/ssc_test/cmod_battwatts_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_battwatts_test.h b/test/ssc_test/cmod_battwatts_test.h
index 2014942a0f..21ef874335 100644
--- a/test/ssc_test/cmod_battwatts_test.h
+++ b/test/ssc_test/cmod_battwatts_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_biomass_test.cpp b/test/ssc_test/cmod_biomass_test.cpp
index 1a44db4f5f..2f4162197b 100644
--- a/test/ssc_test/cmod_biomass_test.cpp
+++ b/test/ssc_test/cmod_biomass_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_biomass_test.h b/test/ssc_test/cmod_biomass_test.h
index 042e04f0fd..01dde9270e 100644
--- a/test/ssc_test/cmod_biomass_test.h
+++ b/test/ssc_test/cmod_biomass_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_cashloan_test.cpp b/test/ssc_test/cmod_cashloan_test.cpp
index 53b23d9e9a..ab8e2a13c9 100644
--- a/test/ssc_test/cmod_cashloan_test.cpp
+++ b/test/ssc_test/cmod_cashloan_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_cashloan_test.h b/test/ssc_test/cmod_cashloan_test.h
index ede807218f..2d22ecc088 100644
--- a/test/ssc_test/cmod_cashloan_test.h
+++ b/test/ssc_test/cmod_cashloan_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_communitysolar_test .cpp b/test/ssc_test/cmod_communitysolar_test .cpp
index d7c10eb647..7f4be841ea 100644
--- a/test/ssc_test/cmod_communitysolar_test .cpp	
+++ b/test/ssc_test/cmod_communitysolar_test .cpp	
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_communitysolar_test.h b/test/ssc_test/cmod_communitysolar_test.h
index 9e8585871c..a282d8a663 100644
--- a/test/ssc_test/cmod_communitysolar_test.h
+++ b/test/ssc_test/cmod_communitysolar_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_custom_generation_test.cpp b/test/ssc_test/cmod_custom_generation_test.cpp
index 603751e3a1..f18bfcd927 100644
--- a/test/ssc_test/cmod_custom_generation_test.cpp
+++ b/test/ssc_test/cmod_custom_generation_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_custom_generation_test.h b/test/ssc_test/cmod_custom_generation_test.h
index cdc25d43fd..ea86236178 100644
--- a/test/ssc_test/cmod_custom_generation_test.h
+++ b/test/ssc_test/cmod_custom_generation_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_equpartflip_test.cpp b/test/ssc_test/cmod_equpartflip_test.cpp
index d0f64bd4ff..ddefb0bf02 100644
--- a/test/ssc_test/cmod_equpartflip_test.cpp
+++ b/test/ssc_test/cmod_equpartflip_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_equpartflip_test.h b/test/ssc_test/cmod_equpartflip_test.h
index 7f96a850cf..7c2304d32e 100644
--- a/test/ssc_test/cmod_equpartflip_test.h
+++ b/test/ssc_test/cmod_equpartflip_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_etes_etes_test.cpp b/test/ssc_test/cmod_etes_etes_test.cpp
index 4be17b15e0..712d245525 100644
--- a/test/ssc_test/cmod_etes_etes_test.cpp
+++ b/test/ssc_test/cmod_etes_etes_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_etes_ptes_test.cpp b/test/ssc_test/cmod_etes_ptes_test.cpp
index af4e429b0c..e95bc58125 100644
--- a/test/ssc_test/cmod_etes_ptes_test.cpp
+++ b/test/ssc_test/cmod_etes_ptes_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_fresnel_physical_test.cpp b/test/ssc_test/cmod_fresnel_physical_test.cpp
index 59bc500ee5..e3f0e61709 100644
--- a/test/ssc_test/cmod_fresnel_physical_test.cpp
+++ b/test/ssc_test/cmod_fresnel_physical_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_fresnel_physical_test.h b/test/ssc_test/cmod_fresnel_physical_test.h
index 54a3e5ed5a..041fb0f562 100644
--- a/test/ssc_test/cmod_fresnel_physical_test.h
+++ b/test/ssc_test/cmod_fresnel_physical_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_fuelcell_test.cpp b/test/ssc_test/cmod_fuelcell_test.cpp
index ade3ff190b..0eaf250dc4 100644
--- a/test/ssc_test/cmod_fuelcell_test.cpp
+++ b/test/ssc_test/cmod_fuelcell_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_fuelcell_test.h b/test/ssc_test/cmod_fuelcell_test.h
index 1bed974bdf..5f2253a906 100644
--- a/test/ssc_test/cmod_fuelcell_test.h
+++ b/test/ssc_test/cmod_fuelcell_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_geothermal_costs_test.cpp b/test/ssc_test/cmod_geothermal_costs_test.cpp
index a5951862df..5135a656ab 100644
--- a/test/ssc_test/cmod_geothermal_costs_test.cpp
+++ b/test/ssc_test/cmod_geothermal_costs_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_geothermal_costs_test.h b/test/ssc_test/cmod_geothermal_costs_test.h
index 5f19e421c1..380689e898 100644
--- a/test/ssc_test/cmod_geothermal_costs_test.h
+++ b/test/ssc_test/cmod_geothermal_costs_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_geothermal_test.cpp b/test/ssc_test/cmod_geothermal_test.cpp
index e3166151b3..462dbe72bc 100644
--- a/test/ssc_test/cmod_geothermal_test.cpp
+++ b/test/ssc_test/cmod_geothermal_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_geothermal_test.h b/test/ssc_test/cmod_geothermal_test.h
index bad8bfcac9..37dec9afec 100644
--- a/test/ssc_test/cmod_geothermal_test.h
+++ b/test/ssc_test/cmod_geothermal_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_grid_test.cpp b/test/ssc_test/cmod_grid_test.cpp
index 9dbf30cd47..9517355fca 100644
--- a/test/ssc_test/cmod_grid_test.cpp
+++ b/test/ssc_test/cmod_grid_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_grid_test.h b/test/ssc_test/cmod_grid_test.h
index ad86da818f..ff64665e97 100644
--- a/test/ssc_test/cmod_grid_test.h
+++ b/test/ssc_test/cmod_grid_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_host_developer_test.cpp b/test/ssc_test/cmod_host_developer_test.cpp
index 8ccf7495a5..b293a14c19 100644
--- a/test/ssc_test/cmod_host_developer_test.cpp
+++ b/test/ssc_test/cmod_host_developer_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_host_developer_test.h b/test/ssc_test/cmod_host_developer_test.h
index 7420d8081a..1c8921dc3e 100644
--- a/test/ssc_test/cmod_host_developer_test.h
+++ b/test/ssc_test/cmod_host_developer_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_hybrid_steps_test.cpp b/test/ssc_test/cmod_hybrid_steps_test.cpp
index aca2158d92..68db9e794f 100644
--- a/test/ssc_test/cmod_hybrid_steps_test.cpp
+++ b/test/ssc_test/cmod_hybrid_steps_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_hybrid_steps_test.h b/test/ssc_test/cmod_hybrid_steps_test.h
index 2c13a20cd7..e51b246386 100644
--- a/test/ssc_test/cmod_hybrid_steps_test.h
+++ b/test/ssc_test/cmod_hybrid_steps_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_hybrid_test.cpp b/test/ssc_test/cmod_hybrid_test.cpp
index 904d35c5e9..9b9e2e4964 100644
--- a/test/ssc_test/cmod_hybrid_test.cpp
+++ b/test/ssc_test/cmod_hybrid_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_hybrid_test.h b/test/ssc_test/cmod_hybrid_test.h
index 7fb9e0a05e..02bcb3f681 100644
--- a/test/ssc_test/cmod_hybrid_test.h
+++ b/test/ssc_test/cmod_hybrid_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_json_comparison_test.h b/test/ssc_test/cmod_json_comparison_test.h
index f30649b113..7b7806a58d 100644
--- a/test/ssc_test/cmod_json_comparison_test.h
+++ b/test/ssc_test/cmod_json_comparison_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_lcoefcr_test.cpp b/test/ssc_test/cmod_lcoefcr_test.cpp
index 1bb5eb08c5..be382d289f 100644
--- a/test/ssc_test/cmod_lcoefcr_test.cpp
+++ b/test/ssc_test/cmod_lcoefcr_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_lcoefcr_test.h b/test/ssc_test/cmod_lcoefcr_test.h
index 6ecd7d3ced..e81d2faf50 100644
--- a/test/ssc_test/cmod_lcoefcr_test.h
+++ b/test/ssc_test/cmod_lcoefcr_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_levpartflip_test.cpp b/test/ssc_test/cmod_levpartflip_test.cpp
index 12b301028e..a43dc1821e 100644
--- a/test/ssc_test/cmod_levpartflip_test.cpp
+++ b/test/ssc_test/cmod_levpartflip_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_levpartflip_test.h b/test/ssc_test/cmod_levpartflip_test.h
index dce2506b3d..3a214d195c 100644
--- a/test/ssc_test/cmod_levpartflip_test.h
+++ b/test/ssc_test/cmod_levpartflip_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_merchantplant_test.cpp b/test/ssc_test/cmod_merchantplant_test.cpp
index 8c5f6264b2..0374c5540a 100644
--- a/test/ssc_test/cmod_merchantplant_test.cpp
+++ b/test/ssc_test/cmod_merchantplant_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_merchantplant_test.h b/test/ssc_test/cmod_merchantplant_test.h
index 8daff1d12f..d713d6d0b4 100644
--- a/test/ssc_test/cmod_merchantplant_test.h
+++ b/test/ssc_test/cmod_merchantplant_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_mhk_costs_test.cpp b/test/ssc_test/cmod_mhk_costs_test.cpp
index 97f4e5ad76..0aad9b3c03 100644
--- a/test/ssc_test/cmod_mhk_costs_test.cpp
+++ b/test/ssc_test/cmod_mhk_costs_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_mhk_costs_test.h b/test/ssc_test/cmod_mhk_costs_test.h
index 775d10b836..a06f0bbfad 100644
--- a/test/ssc_test/cmod_mhk_costs_test.h
+++ b/test/ssc_test/cmod_mhk_costs_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_mhk_tidal_test.cpp b/test/ssc_test/cmod_mhk_tidal_test.cpp
index 149528adf4..bac148e3be 100644
--- a/test/ssc_test/cmod_mhk_tidal_test.cpp
+++ b/test/ssc_test/cmod_mhk_tidal_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_mhk_tidal_test.h b/test/ssc_test/cmod_mhk_tidal_test.h
index 73bbc09317..a2ff20f780 100644
--- a/test/ssc_test/cmod_mhk_tidal_test.h
+++ b/test/ssc_test/cmod_mhk_tidal_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_mhk_wave_test.cpp b/test/ssc_test/cmod_mhk_wave_test.cpp
index 043a8b84f9..33e85ef790 100644
--- a/test/ssc_test/cmod_mhk_wave_test.cpp
+++ b/test/ssc_test/cmod_mhk_wave_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_mhk_wave_test.h b/test/ssc_test/cmod_mhk_wave_test.h
index f58fe933a8..e5ba8e4f5d 100644
--- a/test/ssc_test/cmod_mhk_wave_test.h
+++ b/test/ssc_test/cmod_mhk_wave_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_pvsamv1_test.cpp b/test/ssc_test/cmod_pvsamv1_test.cpp
index e39cdac084..15a402a784 100644
--- a/test/ssc_test/cmod_pvsamv1_test.cpp
+++ b/test/ssc_test/cmod_pvsamv1_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_pvsamv1_test.h b/test/ssc_test/cmod_pvsamv1_test.h
index 0c55231253..a81b3d4d7c 100644
--- a/test/ssc_test/cmod_pvsamv1_test.h
+++ b/test/ssc_test/cmod_pvsamv1_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_pvwattsv5_test.cpp b/test/ssc_test/cmod_pvwattsv5_test.cpp
index 84fa3bd6d1..94a2a139fd 100644
--- a/test/ssc_test/cmod_pvwattsv5_test.cpp
+++ b/test/ssc_test/cmod_pvwattsv5_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_pvwattsv5_test.h b/test/ssc_test/cmod_pvwattsv5_test.h
index ff864e9436..23825b55c0 100644
--- a/test/ssc_test/cmod_pvwattsv5_test.h
+++ b/test/ssc_test/cmod_pvwattsv5_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_pvwattsv7_test.h b/test/ssc_test/cmod_pvwattsv7_test.h
index ed313decf8..647e2a1f6d 100644
--- a/test/ssc_test/cmod_pvwattsv7_test.h
+++ b/test/ssc_test/cmod_pvwattsv7_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_pvwattsv8_test.cpp b/test/ssc_test/cmod_pvwattsv8_test.cpp
index 7ed1c48d82..ee23e233ed 100644
--- a/test/ssc_test/cmod_pvwattsv8_test.cpp
+++ b/test/ssc_test/cmod_pvwattsv8_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_pvwattsv8_test.h b/test/ssc_test/cmod_pvwattsv8_test.h
index 59067502e7..08e64d067f 100644
--- a/test/ssc_test/cmod_pvwattsv8_test.h
+++ b/test/ssc_test/cmod_pvwattsv8_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_pvyield_test.cpp b/test/ssc_test/cmod_pvyield_test.cpp
index 4ec2b40ef5..d08b897dab 100644
--- a/test/ssc_test/cmod_pvyield_test.cpp
+++ b/test/ssc_test/cmod_pvyield_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_pvyield_test.h b/test/ssc_test/cmod_pvyield_test.h
index 4b452cf8c2..c59a5bfe26 100644
--- a/test/ssc_test/cmod_pvyield_test.h
+++ b/test/ssc_test/cmod_pvyield_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_saleleaseback_test.cpp b/test/ssc_test/cmod_saleleaseback_test.cpp
index 76007144d2..d002129404 100644
--- a/test/ssc_test/cmod_saleleaseback_test.cpp
+++ b/test/ssc_test/cmod_saleleaseback_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_saleleaseback_test.h b/test/ssc_test/cmod_saleleaseback_test.h
index 0a9c235bd9..7e7d9dd74c 100644
--- a/test/ssc_test/cmod_saleleaseback_test.h
+++ b/test/ssc_test/cmod_saleleaseback_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_sco2_csp_system_test.cpp b/test/ssc_test/cmod_sco2_csp_system_test.cpp
index c0d8058676..c0a5b5f3d0 100644
--- a/test/ssc_test/cmod_sco2_csp_system_test.cpp
+++ b/test/ssc_test/cmod_sco2_csp_system_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_singleowner_test.cpp b/test/ssc_test/cmod_singleowner_test.cpp
index b877a7c024..4477da6987 100644
--- a/test/ssc_test/cmod_singleowner_test.cpp
+++ b/test/ssc_test/cmod_singleowner_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_singleowner_test.h b/test/ssc_test/cmod_singleowner_test.h
index e7284d6587..69882eccf3 100644
--- a/test/ssc_test/cmod_singleowner_test.h
+++ b/test/ssc_test/cmod_singleowner_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_swh_test.cpp b/test/ssc_test/cmod_swh_test.cpp
index def0d0c764..d17c994b01 100644
--- a/test/ssc_test/cmod_swh_test.cpp
+++ b/test/ssc_test/cmod_swh_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_swh_test.h b/test/ssc_test/cmod_swh_test.h
index ed0e01d1cd..64d252d2d1 100644
--- a/test/ssc_test/cmod_swh_test.h
+++ b/test/ssc_test/cmod_swh_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_tcsmolten_salt_test.cpp b/test/ssc_test/cmod_tcsmolten_salt_test.cpp
index 1cf6366543..164b37ef53 100644
--- a/test/ssc_test/cmod_tcsmolten_salt_test.cpp
+++ b/test/ssc_test/cmod_tcsmolten_salt_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_tcsmolten_salt_test.h b/test/ssc_test/cmod_tcsmolten_salt_test.h
index 37a565a4cf..033718e2ee 100644
--- a/test/ssc_test/cmod_tcsmolten_salt_test.h
+++ b/test/ssc_test/cmod_tcsmolten_salt_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_tcstrough_empirical_test.cpp b/test/ssc_test/cmod_tcstrough_empirical_test.cpp
index 8896cd4e1f..88ed2aa883 100644
--- a/test/ssc_test/cmod_tcstrough_empirical_test.cpp
+++ b/test/ssc_test/cmod_tcstrough_empirical_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_thirdpartyownership_test.cpp b/test/ssc_test/cmod_thirdpartyownership_test.cpp
index 9a4fe21092..be896cf85a 100644
--- a/test/ssc_test/cmod_thirdpartyownership_test.cpp
+++ b/test/ssc_test/cmod_thirdpartyownership_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_thirdpartyownership_test.h b/test/ssc_test/cmod_thirdpartyownership_test.h
index e7803df273..ae66d9f951 100644
--- a/test/ssc_test/cmod_thirdpartyownership_test.h
+++ b/test/ssc_test/cmod_thirdpartyownership_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_trough_physical_iph.h b/test/ssc_test/cmod_trough_physical_iph.h
index 8f0cdf025b..f5f66781e6 100644
--- a/test/ssc_test/cmod_trough_physical_iph.h
+++ b/test/ssc_test/cmod_trough_physical_iph.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_trough_physical_iph_test.cpp b/test/ssc_test/cmod_trough_physical_iph_test.cpp
index 1a8aeb00e4..6825a87e2a 100644
--- a/test/ssc_test/cmod_trough_physical_iph_test.cpp
+++ b/test/ssc_test/cmod_trough_physical_iph_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_trough_physical_test.cpp b/test/ssc_test/cmod_trough_physical_test.cpp
index a0742c4b92..35da4886be 100644
--- a/test/ssc_test/cmod_trough_physical_test.cpp
+++ b/test/ssc_test/cmod_trough_physical_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_utilityrate5_test.cpp b/test/ssc_test/cmod_utilityrate5_test.cpp
index 0dc5f040e8..c6c75e91af 100644
--- a/test/ssc_test/cmod_utilityrate5_test.cpp
+++ b/test/ssc_test/cmod_utilityrate5_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_wfreader_test.cpp b/test/ssc_test/cmod_wfreader_test.cpp
index e6625ae474..bdf43f4ab2 100644
--- a/test/ssc_test/cmod_wfreader_test.cpp
+++ b/test/ssc_test/cmod_wfreader_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_windpower_test.cpp b/test/ssc_test/cmod_windpower_test.cpp
index 3cc882ce46..5e3c95fa04 100644
--- a/test/ssc_test/cmod_windpower_test.cpp
+++ b/test/ssc_test/cmod_windpower_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/cmod_windpower_test.h b/test/ssc_test/cmod_windpower_test.h
index da570ef8a8..53b9814c49 100644
--- a/test/ssc_test/cmod_windpower_test.h
+++ b/test/ssc_test/cmod_windpower_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/csp_common_test.h b/test/ssc_test/csp_common_test.h
index d55fd9a17d..7cdf477dbd 100644
--- a/test/ssc_test/csp_common_test.h
+++ b/test/ssc_test/csp_common_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/solesca_test.cpp b/test/ssc_test/solesca_test.cpp
index 8ce1e60df2..9d637ef2e3 100644
--- a/test/ssc_test/solesca_test.cpp
+++ b/test/ssc_test/solesca_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/solesca_test.h b/test/ssc_test/solesca_test.h
index 6ad57a586d..a3aa221396 100644
--- a/test/ssc_test/solesca_test.h
+++ b/test/ssc_test/solesca_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/sscapi_test.cpp b/test/ssc_test/sscapi_test.cpp
index 2308759585..ad02989c9e 100644
--- a/test/ssc_test/sscapi_test.cpp
+++ b/test/ssc_test/sscapi_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/vartab_test.cpp b/test/ssc_test/vartab_test.cpp
index cdac8a15a2..799ebb902b 100644
--- a/test/ssc_test/vartab_test.cpp
+++ b/test/ssc_test/vartab_test.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without
diff --git a/test/ssc_test/vartab_test.h b/test/ssc_test/vartab_test.h
index c794ae1618..e7920a90b8 100644
--- a/test/ssc_test/vartab_test.h
+++ b/test/ssc_test/vartab_test.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
 
 
 Redistribution and use in source and binary forms, with or without