diff --git a/deploy/runtime/sscapi.h b/deploy/runtime/sscapi.h
index ce5e72aed..8a2ae0954 100644
--- a/deploy/runtime/sscapi.h
+++ b/deploy/runtime/sscapi.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/ssc/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/case.cpp b/src/case.cpp
index 2d3d16069..df0e046ba 100644
--- a/src/case.cpp
+++ b/src/case.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/case.h b/src/case.h
index eaeff68a9..247a7944e 100644
--- a/src/case.h
+++ b/src/case.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/casewin.cpp b/src/casewin.cpp
index a666e7a66..a91a36373 100644
--- a/src/casewin.cpp
+++ b/src/casewin.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/casewin.h b/src/casewin.h
index 1beb81d3d..e05344d28 100644
--- a/src/casewin.h
+++ b/src/casewin.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/codegenerator.cpp b/src/codegenerator.cpp
index eaa838e19..8c90c0dbf 100644
--- a/src/codegenerator.cpp
+++ b/src/codegenerator.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -5140,7 +5140,7 @@ bool CodeGen_php5::SupportingFiles()
 	fprintf(f, "	char buf[16];\n");
 	fprintf(f, "	sprintf(buf, \"%%d\", ssc_version());\n");
 	fprintf(f, "	php_info_print_table_start();\n");
-	fprintf(f, "	php_info_print_table_header(2, \"NREL SAM Simulation Core(SSC) support\", \"enabled\");\n");
+	fprintf(f, "	php_info_print_table_header(2, \"NLR SAM Simulation Core(SSC) support\", \"enabled\");\n");
 	fprintf(f, "	php_info_print_table_row(2, \"Version\", buf );\n");
 	fprintf(f, "	php_info_print_table_row(2, \"Build\", ssc_build_info() );\n");
 	fprintf(f, "	php_info_print_table_end();\n");
@@ -5751,7 +5751,7 @@ bool CodeGen_php7::SupportingFiles()
 	fprintf(f, "	char buf[16];\n");
 	fprintf(f, "	sprintf(buf, \"188713200\", ssc_version());\n");
 	fprintf(f, "	php_info_print_table_start();\n");
-	fprintf(f, "	php_info_print_table_header(2, \"NREL SAM Simulation Core(SSC) support\", \"enabled\");\n");
+	fprintf(f, "	php_info_print_table_header(2, \"NLR SAM Simulation Core(SSC) support\", \"enabled\");\n");
 	fprintf(f, "	php_info_print_table_row(2, \"Version\", buf );\n");
 	fprintf(f, "	php_info_print_table_row(2, \"Build\", ssc_build_info() );\n");
 	fprintf(f, "	php_info_print_table_end();\n");
@@ -6384,7 +6384,7 @@ bool CodeGen_php8::SupportingFiles()
 	fprintf(f, "	char buf[16];\n");
 	fprintf(f, "	sprintf(buf, \"188713200\", ssc_version());\n");
 	fprintf(f, "	php_info_print_table_start();\n");
-	fprintf(f, "	php_info_print_table_header(2, \"NREL SAM Simulation Core(SSC) support\", \"enabled\");\n");
+	fprintf(f, "	php_info_print_table_header(2, \"NLR SAM Simulation Core(SSC) support\", \"enabled\");\n");
 	fprintf(f, "	php_info_print_table_row(2, \"Version\", buf );\n");
 	fprintf(f, "	php_info_print_table_row(2, \"Build\", ssc_build_info() );\n");
 	fprintf(f, "	php_info_print_table_end();\n");
diff --git a/src/codegenerator.h b/src/codegenerator.h
index 5d90b820f..37ee5345e 100644
--- a/src/codegenerator.h
+++ b/src/codegenerator.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/combinecases.cpp b/src/combinecases.cpp
index 6dd742821..b9e0b45c9 100644
--- a/src/combinecases.cpp
+++ b/src/combinecases.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/combinecases.h b/src/combinecases.h
index 9632666ee..5b115ebe3 100644
--- a/src/combinecases.h
+++ b/src/combinecases.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/defmgr.cpp b/src/defmgr.cpp
index e7a7ecb97..8ff5e03a2 100644
--- a/src/defmgr.cpp
+++ b/src/defmgr.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/defmgr.h b/src/defmgr.h
index d75576811..7a34da8e9 100644
--- a/src/defmgr.h
+++ b/src/defmgr.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/equations.cpp b/src/equations.cpp
index a5d20bbd6..ab3f38afc 100644
--- a/src/equations.cpp
+++ b/src/equations.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/equations.h b/src/equations.h
index e51c10294..3f4bde114 100644
--- a/src/equations.h
+++ b/src/equations.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/excelexch.cpp b/src/excelexch.cpp
index d04a8b5f4..b077e6de2 100644
--- a/src/excelexch.cpp
+++ b/src/excelexch.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/excelexch.h b/src/excelexch.h
index 38305d9ef..3ea8d6dbc 100644
--- a/src/excelexch.h
+++ b/src/excelexch.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/geotools.cpp b/src/geotools.cpp
index 81407994e..4eabd7a5a 100644
--- a/src/geotools.cpp
+++ b/src/geotools.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -195,7 +195,7 @@ bool GeoTools::coordinate_to_dms(wxString& coord, double* d, double* m, double*
 
 }
 
-// Geocode using Google API for non-NREL builds of SAM
+// Geocode using Google API for non-NLR builds of SAM
 bool GeoTools::GeocodeGoogle(const wxString& address, double* lat, double* lon, double* tz, bool showprogress) {
     wxBusyCursor _curs;
 
@@ -315,7 +315,7 @@ bool GeoTools::GeocodeGoogle(const wxString& address, double* lat, double* lon,
 
 }
 
-// Geocode using NREL Developer API (MapQuest) for NREL builds of SAM
+// Geocode using NLR Developer API (MapQuest) for NLR builds of SAM
 // submit address and no lat/lon to get lat/lon
 bool GeoTools::GeocodeDeveloper(const wxString& address, double* lat, double* lon, bool showprogress) {
     wxBusyCursor _curs;
diff --git a/src/geotools.h b/src/geotools.h
index 23041b0c1..4a446e67e 100644
--- a/src/geotools.h
+++ b/src/geotools.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -41,12 +41,12 @@ class GeoTools
 
     // Use Google Geocoding API to return lat/lon from address
     // Requires a Google Cloud Project account with billing enabled
-    // This is an alternative to GeocodeDeveloper for non-NREL builds of SAM
+    // This is an alternative to GeocodeDeveloper for non-NLR builds of SAM
     // Google API key is defined in private.h
     static bool GeocodeGoogle(const wxString& address, double* lat, double* lon, double* tz = 0, bool showprogress = true);
 
-    // Use private NREL Developer API (MapQuest wrapper) to return lat/lon from address
-    // Requires a special private API key from NREL defined in private.h
+    // Use private NLR Developer API (MapQuest wrapper) to return lat/lon from address
+    // Requires a special private API key from NLR defined in private.h
     static bool GeocodeDeveloper(const wxString& address, double* lat, double* lon, bool showprogress = true);
 
     // Use Microsoft Azure API to return time zone from lat/lon
diff --git a/src/graph.cpp b/src/graph.cpp
index 3985dc7eb..0aa83dbe6 100644
--- a/src/graph.cpp
+++ b/src/graph.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/graph.h b/src/graph.h
index e3c1e4fa3..8f091f207 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/gridsupport.cpp b/src/gridsupport.cpp
index 393c2ad59..1cda82181 100644
--- a/src/gridsupport.cpp
+++ b/src/gridsupport.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/gridsupport.h b/src/gridsupport.h
index d950f13c0..ba92bd481 100644
--- a/src/gridsupport.h
+++ b/src/gridsupport.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/ide.cpp b/src/ide.cpp
index 7b64e9f83..51d0e0eab 100644
--- a/src/ide.cpp
+++ b/src/ide.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/ide.h b/src/ide.h
index 3be5d3498..ae94790e1 100644
--- a/src/ide.h
+++ b/src/ide.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/inputpage.cpp b/src/inputpage.cpp
index d93eb90b1..8dfb05ed5 100644
--- a/src/inputpage.cpp
+++ b/src/inputpage.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/inputpage.h b/src/inputpage.h
index 5bd3eeda6..1b7f0078b 100644
--- a/src/inputpage.h
+++ b/src/inputpage.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/invoke.cpp b/src/invoke.cpp
index 09e350ac8..77093b03f 100644
--- a/src/invoke.cpp
+++ b/src/invoke.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -3009,7 +3009,7 @@ void fcall_wavetoolkit(lk::invoke_t& cxt)
             if (ok && (curls[i]->GetDataAsString().Length() < 1000))
                 ok = curls[i]->Get(urls[i]);
             if (!ok)
-                wxMessageBox("Download failed.\n\n" + urls[i] + "\n\nThere may be a problem with your internet connection,\nor the NREL Hindcast Wave Data web service may be down.", "NREL Hindcast Wave Data Download Message", wxOK);
+                wxMessageBox("Download failed.\n\n" + urls[i] + "\n\nThere may be a problem with your internet connection,\nor the NLR Hindcast Wave Data web service may be down.", "NLR Hindcast Wave Data Download Message", wxOK);
             else if (curls[i]->GetDataAsString().Length() < 1000) {
                 wxMessageBox("Weather file not available.\n\n" + urls[i] + "\n\n" + curls[i]->GetDataAsString(), "Wave Resource Download Message", wxOK);
                 cxt.result().empty_hash();
@@ -3023,7 +3023,7 @@ void fcall_wavetoolkit(lk::invoke_t& cxt)
                 file_list += filename_array[i] + "\n";
                 if (!curls[i]->WriteDataToFile(fn))
                 {
-                    wxMessageBox("Failed to write file.\n\n" + fn, "NREL Hindcast Wave Data Download Message", wxOK);
+                    wxMessageBox("Failed to write file.\n\n" + fn, "NLR Hindcast Wave Data Download Message", wxOK);
                     //break;
                 }
                 num_downloaded++;
@@ -3066,7 +3066,7 @@ void fcall_wavetoolkit(lk::invoke_t& cxt)
                     SamApp::Settings().Write("wave_data_paths", wxJoin(paths, ';'));
                 }
             }
-            if (file_list != "") wxMessageBox("Download complete.\n\nThe following files have been downloaded and added to your resource library:\n\n" + file_list, "NREL Hindcast Wave Data Download Message", wxOK);
+            if (file_list != "") wxMessageBox("Download complete.\n\nThe following files have been downloaded and added to your resource library:\n\n" + file_list, "NLR Hindcast Wave Data Download Message", wxOK);
             //EndModal(wxID_OK);
         }
 
@@ -3109,10 +3109,10 @@ void fcall_wavetoolkit(lk::invoke_t& cxt)
 
 void fcall_windtoolkit(lk::invoke_t &cxt)
 {
-	LK_DOC("windtoolkit", "Creates the NREL WIND Toolkit Download dialog box, downloads weather file from WIND Toolkit API for requested location and parameters, and returns weather file name", "(none) : string");
+	LK_DOC("windtoolkit", "Creates the NLR WIND Toolkit Download dialog box, downloads weather file from WIND Toolkit API for requested location and parameters, and returns weather file name", "(none) : string");
 
 	//Create the wind data object
-	WindToolkitDialog spd(SamApp::Window(), "NREL WIND Toolkit Download");
+	WindToolkitDialog spd(SamApp::Window(), "NLR WIND Toolkit Download");
 	spd.CenterOnParent();
 	int code = spd.ShowModal(); //shows the dialog and makes it so you can't interact with other parts until window is closed
 
@@ -3134,7 +3134,7 @@ void fcall_windtoolkit(lk::invoke_t &cxt)
 	{
 		wxBusyInfo bid("Converting address to lat/lon.");
 
-		// use GeoTools::GeocodeGoogle for non-NREL builds and set google_api_key in private.h
+		// use GeoTools::GeocodeGoogle for non-NLR builds and set google_api_key in private.h
         if (!GeoTools::GeocodeDeveloper(spd.GetAddress(), &lat, &lon, false))
 		{
 			wxMessageDialog* md = new wxMessageDialog(NULL, "Failed to convert address to lat/lon. This may be caused by a geocoding service outage or internet connection problem.", "WIND Toolkit Download Error", wxOK);
@@ -3830,7 +3830,7 @@ static bool copy_mat(lk::invoke_t &cxt, wxString sched_name, matrix_t<double> &m
 void fcall_geocode(lk::invoke_t& cxt)
 {
   	LK_DOC("geocode",
-		"Given a street address or location name, returns latitude, longitude. Returns optional time zone if get_tz is true. Not designed to take latitude and longitude as input. Uses the MapQuest Geocoding API via a private NREL wrapper. Returned table fields are 'lat', 'lon', 'tz', 'ok'.",
+		"Given a street address or location name, returns latitude, longitude. Returns optional time zone if get_tz is true. Not designed to take latitude and longitude as input. Uses the MapQuest Geocoding API via a private NLR wrapper. Returned table fields are 'lat', 'lon', 'tz', 'ok'.",
 		"(string:location, [boolean:get_tz]):table");
 
 	double lat, lon, tz;
@@ -3884,7 +3884,7 @@ void fcall_geocode(lk::invoke_t& cxt)
 		get_tz = cxt.arg(1).as_boolean();
 	}
 
-	// use GeoTools::GeocodeGoogle for non-NREL builds and set google_api_key in private.h
+	// use GeoTools::GeocodeGoogle for non-NLR builds and set google_api_key in private.h
 	if (is_address) {
 		ok = GeoTools::GeocodeDeveloper(cxt.arg(0).as_string(), &lat, &lon);
 		if (!ok) {
diff --git a/src/invoke.h b/src/invoke.h
index 2bebcd038..738766c4f 100644
--- a/src/invoke.h
+++ b/src/invoke.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/ipagelist.cpp b/src/ipagelist.cpp
index 8d0be3ac6..d2737f1b7 100644
--- a/src/ipagelist.cpp
+++ b/src/ipagelist.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/ipagelist.h b/src/ipagelist.h
index fe071fdc4..7968a1c8a 100644
--- a/src/ipagelist.h
+++ b/src/ipagelist.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/library.cpp b/src/library.cpp
index d766a7bb7..db9538cce 100644
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/library.h b/src/library.h
index 7324a7ecd..90646b1ad 100644
--- a/src/library.h
+++ b/src/library.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/lossadj.cpp b/src/lossadj.cpp
index ed217751a..35df995c9 100644
--- a/src/lossadj.cpp
+++ b/src/lossadj.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/lossadj.h b/src/lossadj.h
index 9bcb40318..70d0a23ae 100644
--- a/src/lossadj.h
+++ b/src/lossadj.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/lossdiag.cpp b/src/lossdiag.cpp
index 88bafb61c..cfd3b3a44 100644
--- a/src/lossdiag.cpp
+++ b/src/lossdiag.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/lossdiag.h b/src/lossdiag.h
index d753e81a4..3b6733795 100644
--- a/src/lossdiag.h
+++ b/src/lossdiag.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/macro.cpp b/src/macro.cpp
index b0493f7d5..95b0a8899 100644
--- a/src/macro.cpp
+++ b/src/macro.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/macro.h b/src/macro.h
index c9180b523..c5db3a26a 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/main.cpp b/src/main.cpp
index 84eae6a15..ecbe07981 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/main.h b/src/main.h
index f889a4f68..9fa7c265d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/main_add.h b/src/main_add.h
index 99b55525b..efc61f4ce 100644
--- a/src/main_add.h
+++ b/src/main_add.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -372,7 +372,7 @@ extern void RegisterReportObjectTypes();
 		return false;
 	}
 
-	g_config = new wxConfig("SystemAdvisorModel", "NREL");
+	g_config = new wxConfig("SystemAdvisorModel", "NLR");
 
 	wxInitAllImageHandlers();
 
@@ -422,7 +422,7 @@ extern void RegisterReportObjectTypes();
 		Settings().Write(fl_key, false);
 
 		// enable web update app
-		wxConfig cfg("SamUpdate3", "NREL");
+		wxConfig cfg("SamUpdate3", "NLR");
 		cfg.Write("allow_web_updates", true);
 
 		// after installing a new version, always show the reminders again until the user turns them off
@@ -484,7 +484,7 @@ wxString SamApp::AboutSAM()
 	return "<html><body>"
 		"<h1>System Advisor Model (SAM)</h1>"
 		"<h2>Open Source Build</h2>"
-		"<p>BSD 3-Clause License<br><br>Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE.</p>"
+		"<p>BSD 3-Clause License<br><br>Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE.</p>"
 		"<p>All rights reserved.</p>"
 		"<p>Redistribution and use in source and binary forms, with or without	modification, are permitted provided that the following conditions are met:</p>"
 		"<ol>"
diff --git a/src/materials.cpp b/src/materials.cpp
index c705db763..bc1a5919a 100644
--- a/src/materials.cpp
+++ b/src/materials.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/materials.h b/src/materials.h
index 9d3825ad5..43a0ed222 100644
--- a/src/materials.h
+++ b/src/materials.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/nohrsc.cpp b/src/nohrsc.cpp
index c6822954d..6d9f809ed 100644
--- a/src/nohrsc.cpp
+++ b/src/nohrsc.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -392,7 +392,7 @@ void NOHRSCDialog::GetResources()
 	double lat, lon;
 	if (is_addr)	//entered an address instead of a lat/long
 	{
-		// use GeoTools::GeocodeGoogle for non-NREL builds and set google_api_key in private.h
+		// use GeoTools::GeocodeGoogle for non-NLR builds and set google_api_key in private.h
 		if (!GeoTools::GeocodeDeveloper(location, &lat, &lon))
 		{
 			wxMessageBox("Failed to geocode address.\n\n" + location, "NOHRSC Download Message", wxOK, this);
diff --git a/src/nohrsc.h b/src/nohrsc.h
index 49c5faab8..008f524e9 100644
--- a/src/nohrsc.h
+++ b/src/nohrsc.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/nsrdb.cpp b/src/nsrdb.cpp
index 91be2e740..ceb17db6f 100644
--- a/src/nsrdb.cpp
+++ b/src/nsrdb.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -566,7 +566,7 @@ void NSRDBDialog::GetResources()
 	double lat, lon;
 	if (is_addr)	//entered an address instead of a lat/long
 	{
-		// use GeoTools::GeocodeGoogle for non-NREL builds and set google_api_key in private.h
+		// use GeoTools::GeocodeGoogle for non-NLR builds and set google_api_key in private.h
 		if (!GeoTools::GeocodeDeveloper(location, &lat, &lon))
 		{
 			wxMessageBox("Failed to geocode address.\n\n" + location, "NSRDB Download Message", wxOK, this);
diff --git a/src/nsrdb.h b/src/nsrdb.h
index 6278db53d..cfa6fa15c 100644
--- a/src/nsrdb.h
+++ b/src/nsrdb.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/object.cpp b/src/object.cpp
index 5e4b47268..ae9c560cd 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/object.h b/src/object.h
index b58e05106..959bf77fa 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/p50p90.cpp b/src/p50p90.cpp
index a13ace53b..a9d5a7867 100644
--- a/src/p50p90.cpp
+++ b/src/p50p90.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/p50p90.h b/src/p50p90.h
index 192cb6e34..f567c2014 100644
--- a/src/p50p90.h
+++ b/src/p50p90.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/parametric.cpp b/src/parametric.cpp
index 9bb04696d..5f9c14dfa 100644
--- a/src/parametric.cpp
+++ b/src/parametric.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/parametric.h b/src/parametric.h
index c19178c6d..f3deb1a0e 100644
--- a/src/parametric.h
+++ b/src/parametric.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/private.h b/src/private.h
index 8233f6069..fdb690773 100644
--- a/src/private.h
+++ b/src/private.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -35,17 +35,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // by default, should be NULL
 static const char *version_label = 0; //"iscc-ge";
 
-// NREL Developer API:
-// For calls to NREL Developer APIs for weather file downloads, REopt calls, etc.
+// NLR Developer API:
+// For calls to NLR Developer APIs for weather file downloads, REopt calls, etc.
 // Get an API key at https://developer.nlr.gov
 const char *sam_api_key = "";
 
-// Email address used to register for NREL Developer API
-// For calls to NSRDB and other NREL Developer APIs that require an email address
+// Email address used to register for NLR Developer API
+// For calls to NSRDB and other NLR Developer APIs that require an email address
 const char* user_email = "";
 
 // Google APIs:
-// For non-NREL builds of SAM, use this instead of NREL geocoding API
+// For non-NLR builds of SAM, use this instead of NLR geocoding API
 // Requires Google Cloud account and subscription https://cloud.google.com
 const char *google_api_key = "";
 
@@ -55,7 +55,7 @@ const char *google_api_key = "";
 // Get a an Azure Maps key at https://azure.microsoft.com/
 const char *azure_api_key = "";
 
-// Private NREL Developer geocoding API for NREL versions of SAM
+// Private NLR Developer geocoding API for NLR versions of SAM
 const char *geocode_api_key = "";
 
 // specific to SAM and SAM-private - can be separate include file
diff --git a/src/project.cpp b/src/project.cpp
index 18abf88d7..1ff09215e 100644
--- a/src/project.cpp
+++ b/src/project.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -279,7 +279,7 @@ bool ProjectFile::Read( wxInputStream &input )
 	m_lastError.Clear();
 	Clear();
 
-	// suppress wxLogging and system errors from wxLogError in wxWidgets and handle project file reading issues here - see https://github.com/NREL/SAM/issues/393
+	// suppress wxLogging and system errors from wxLogError in wxWidgets and handle project file reading issues here - see https://github.com/NatLabRockies/SAM/issues/393
 	// regular logging restored when wxLogNull object goes out of scope.
 	wxLogNull logNo; 
 
diff --git a/src/project.h b/src/project.h
index 5c4ecea1f..a12f70492 100644
--- a/src/project.h
+++ b/src/project.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/ptesdesignptdialog.cpp b/src/ptesdesignptdialog.cpp
index bf2f9b07c..d35838b19 100644
--- a/src/ptesdesignptdialog.cpp
+++ b/src/ptesdesignptdialog.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/ptesdesignptdialog.h b/src/ptesdesignptdialog.h
index 46c8e8e30..cf6a78a7a 100644
--- a/src/ptesdesignptdialog.h
+++ b/src/ptesdesignptdialog.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/ptlayoutctrl.cpp b/src/ptlayoutctrl.cpp
index b88a919d9..f03907881 100644
--- a/src/ptlayoutctrl.cpp
+++ b/src/ptlayoutctrl.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/ptlayoutctrl.h b/src/ptlayoutctrl.h
index 020c03726..0429607ef 100644
--- a/src/ptlayoutctrl.h
+++ b/src/ptlayoutctrl.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/pvuncertainty.cpp b/src/pvuncertainty.cpp
index d94290a82..48f5e9381 100644
--- a/src/pvuncertainty.cpp
+++ b/src/pvuncertainty.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/pvuncertainty.h b/src/pvuncertainty.h
index 918634118..9ae9b6a32 100644
--- a/src/pvuncertainty.h
+++ b/src/pvuncertainty.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/reports.cpp b/src/reports.cpp
index fb9813164..85ea6bdc4 100644
--- a/src/reports.cpp
+++ b/src/reports.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/reports.h b/src/reports.h
index eaf882cfd..69cbb1152 100644
--- a/src/reports.h
+++ b/src/reports.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/results.cpp b/src/results.cpp
index 2b7e2096d..0a40fd8b1 100644
--- a/src/results.cpp
+++ b/src/results.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/results.h b/src/results.h
index f8c9b50b7..f42021d9c 100644
--- a/src/results.h
+++ b/src/results.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/s3engine.cpp b/src/s3engine.cpp
index 58bcc726c..cf31fcecf 100644
--- a/src/s3engine.cpp
+++ b/src/s3engine.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/s3engine.h b/src/s3engine.h
index 8de12f096..dc948f341 100644
--- a/src/s3engine.h
+++ b/src/s3engine.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/s3objects.cpp b/src/s3objects.cpp
index 61311f6f0..1f4107612 100644
--- a/src/s3objects.cpp
+++ b/src/s3objects.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/s3objects.h b/src/s3objects.h
index dfc61f25c..b7a612212 100644
--- a/src/s3objects.h
+++ b/src/s3objects.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/s3tool.cpp b/src/s3tool.cpp
index 2b3255da0..3afaa14a7 100644
--- a/src/s3tool.cpp
+++ b/src/s3tool.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -207,7 +207,7 @@ void LocationSetup::OnAddressChange( wxCommandEvent & )
 	double lon = std::numeric_limits<double>::quiet_NaN();
 	double tz = std::numeric_limits<double>::quiet_NaN();
 	
-	// use GeoTools::GeocodeGoogle for non-NREL builds and set google_api_key in private.h
+	// use GeoTools::GeocodeGoogle for non-NLR builds and set google_api_key in private.h
 	if (GeoTools::GeocodeDeveloper(m_address->GetValue(), &lat, &lon))
 	{
 		m_lat->SetValue(lat);
diff --git a/src/s3tool.h b/src/s3tool.h
index 8073907f0..023d16cc6 100644
--- a/src/s3tool.h
+++ b/src/s3tool.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/s3view.cpp b/src/s3view.cpp
index 7d47273b6..6305c661d 100644
--- a/src/s3view.cpp
+++ b/src/s3view.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/s3view.h b/src/s3view.h
index cff80dd3a..3aadcc478 100644
--- a/src/s3view.h
+++ b/src/s3view.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/script.cpp b/src/script.cpp
index cebf220c5..465901a96 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/script.h b/src/script.h
index 5bbeb2d73..bec1dfd06 100644
--- a/src/script.h
+++ b/src/script.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/shadingfactors.cpp b/src/shadingfactors.cpp
index a9bedae84..a2ec73ada 100644
--- a/src/shadingfactors.cpp
+++ b/src/shadingfactors.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/shadingfactors.h b/src/shadingfactors.h
index ae34bb6ac..2222a7573 100644
--- a/src/shadingfactors.h
+++ b/src/shadingfactors.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/simulation.cpp b/src/simulation.cpp
index 65d0932a4..9a69539fc 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -2,7 +2,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/simulation.h b/src/simulation.h
index d5589e674..de2738d84 100644
--- a/src/simulation.h
+++ b/src/simulation.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/stochastic.cpp b/src/stochastic.cpp
index 185e484cd..4d9ade7ee 100644
--- a/src/stochastic.cpp
+++ b/src/stochastic.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/stochastic.h b/src/stochastic.h
index 61ad14a1b..18a0b80fa 100644
--- a/src/stochastic.h
+++ b/src/stochastic.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/troughloop.cpp b/src/troughloop.cpp
index dce5c7187..c6ebb0cf1 100644
--- a/src/troughloop.cpp
+++ b/src/troughloop.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/troughloop.h b/src/troughloop.h
index d67f566a2..d106a2172 100644
--- a/src/troughloop.h
+++ b/src/troughloop.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/uiobjects.cpp b/src/uiobjects.cpp
index 03718ae1a..180b6c90b 100644
--- a/src/uiobjects.cpp
+++ b/src/uiobjects.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/uiobjects.h b/src/uiobjects.h
index 5b4a6a274..077f150ff 100644
--- a/src/uiobjects.h
+++ b/src/uiobjects.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/uncertainties.cpp b/src/uncertainties.cpp
index 96821b665..d11471e68 100644
--- a/src/uncertainties.cpp
+++ b/src/uncertainties.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/uncertainties.h b/src/uncertainties.h
index 0d836f6c2..2176e2d8d 100644
--- a/src/uncertainties.h
+++ b/src/uncertainties.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/urdb.cpp b/src/urdb.cpp
index 23fd320c4..854141e0c 100644
--- a/src/urdb.cpp
+++ b/src/urdb.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -289,7 +289,7 @@ bool OpenEI::QueryUtilityCompaniesbyZipcode(const wxString &zipcode, wxArrayStri
 		return false;
 	}
 	 
-	// NREL Developer API to list utility companies by lat/lon https://developer.nlr.gov/docs/electricity/utility-rates-v3/
+	// NLR Developer API to list utility companies by lat/lon https://developer.nlr.gov/docs/electricity/utility-rates-v3/
 	wxString url = SamApp::WebApi("urdb_companies_by_lat_lon");
 	url.Replace("<LAT>", wxString::Format("%g",lat));
 	url.Replace("<LON>", wxString::Format("%g",lon));
diff --git a/src/urdb.h b/src/urdb.h
index 400692975..b5e8e9d1a 100644
--- a/src/urdb.h
+++ b/src/urdb.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/variablegrid.cpp b/src/variablegrid.cpp
index a0dd289c4..60f580c3d 100644
--- a/src/variablegrid.cpp
+++ b/src/variablegrid.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/variablegrid.h b/src/variablegrid.h
index aaec027d6..964ac42d8 100644
--- a/src/variablegrid.h
+++ b/src/variablegrid.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/variables.cpp b/src/variables.cpp
index 7f285e24d..1abd41c80 100644
--- a/src/variables.cpp
+++ b/src/variables.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/variables.h b/src/variables.h
index d449d9cb0..cd325e248 100644
--- a/src/variables.h
+++ b/src/variables.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/wavetoolkit.cpp b/src/wavetoolkit.cpp
index 22bc7fd08..3e3cafc71 100644
--- a/src/wavetoolkit.cpp
+++ b/src/wavetoolkit.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 static const char* help_text =
-"NREL Wave Toolkit data is only available for locations in the continental United States. Each weather file contains wave resource data for a single year.\n\n"
+"NLR Wave Toolkit data is only available for locations in the continental United States. Each weather file contains wave resource data for a single year.\n\n"
 "See Help for details.";
 
 enum {
@@ -367,7 +367,7 @@ void WaveDownloadDialog::GetResources()
 	double lat, lon;
 	if (is_addr)	//entered an address instead of a lat/long
 	{
-		// use GeoTools::GeocodeGoogle for non-NREL builds and set google_api_key in private.h
+		// use GeoTools::GeocodeGoogle for non-NLR builds and set google_api_key in private.h
 		if (!GeoTools::GeocodeDeveloper(location, &lat, &lon))
 		{
 			wxMessageBox("Failed to geocode address.\n\n" + location, "Wave Download Message", wxOK, this);
diff --git a/src/wavetoolkit.h b/src/wavetoolkit.h
index 82ab044db..4307e11e3 100644
--- a/src/wavetoolkit.h
+++ b/src/wavetoolkit.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/welcome.cpp b/src/welcome.cpp
index c7a7c75b5..aded2385f 100644
--- a/src/welcome.cpp
+++ b/src/welcome.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/welcome.h b/src/welcome.h
index 56b00aafc..5992a07ac 100644
--- a/src/welcome.h
+++ b/src/welcome.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/widgets.cpp b/src/widgets.cpp
index abec18cd9..279da711f 100644
--- a/src/widgets.cpp
+++ b/src/widgets.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/widgets.h b/src/widgets.h
index 9e489d1bc..0f5028942 100644
--- a/src/widgets.h
+++ b/src/widgets.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/windtoolkit.cpp b/src/windtoolkit.cpp
index a1b61f474..98e10a2af 100644
--- a/src/windtoolkit.cpp
+++ b/src/windtoolkit.cpp
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 static const char *help_text =
 "Choose one or more measurement heights close to the turbine hub height, or choose no heights to download data at all available heights.\n\n"
-"NREL WIND Toolkit data is only available for locations in the continental United States. Each weather file contains wind resource data for a single year.\n\n"
+"NLR WIND Toolkit data is only available for locations in the continental United States. Each weather file contains wind resource data for a single year.\n\n"
 "See Help for details.";
 
 enum {
diff --git a/src/windtoolkit.h b/src/windtoolkit.h
index d2a601b0b..ef7c283e8 100644
--- a/src/windtoolkit.h
+++ b/src/windtoolkit.h
@@ -1,7 +1,7 @@
 /*
 BSD 3-Clause License
 
-Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/SAM/blob/develop/LICENSE
+Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/SAM/blob/develop/LICENSE
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without