diff --git a/modemm17/CRC16.h b/modemm17/CRC16.h
index d7c91e9ce..6cd2917e2 100644
--- a/modemm17/CRC16.h
+++ b/modemm17/CRC16.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/CarrierDetect.h b/modemm17/CarrierDetect.h
index 89c34edb2..72192dacf 100644
--- a/modemm17/CarrierDetect.h
+++ b/modemm17/CarrierDetect.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/ClockRecovery.h b/modemm17/ClockRecovery.h
index 4ae4c2b56..1adfa68bf 100644
--- a/modemm17/ClockRecovery.h
+++ b/modemm17/ClockRecovery.h
@@ -1,4 +1,4 @@
-// Copyright 2021 modemm17 LLC.
+// Copyright 2021 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/Convolution.h b/modemm17/Convolution.h
index 30cc84070..29b1c8ab6 100644
--- a/modemm17/Convolution.h
+++ b/modemm17/Convolution.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/Correlator.h b/modemm17/Correlator.h
index f199297a6..430fc75cc 100644
--- a/modemm17/Correlator.h
+++ b/modemm17/Correlator.h
@@ -1,4 +1,4 @@
-// Copyright 2021 Rob Riggs <rob@modemm17.com>
+// Copyright 2021 Rob Riggs <rob@mobilinkd.com>
 // All rights reserved.
 
 #pragma once
diff --git a/modemm17/DataCarrierDetect.h b/modemm17/DataCarrierDetect.h
index 94b96c518..411d99b47 100644
--- a/modemm17/DataCarrierDetect.h
+++ b/modemm17/DataCarrierDetect.h
@@ -1,4 +1,4 @@
-// Copyright 2021 modemm17 LLC.
+// Copyright 2021 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/DeviationError.h b/modemm17/DeviationError.h
index b4357cc8d..ef6ce66e3 100644
--- a/modemm17/DeviationError.h
+++ b/modemm17/DeviationError.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/Filter.h b/modemm17/Filter.h
index b80911a43..094dad979 100644
--- a/modemm17/Filter.h
+++ b/modemm17/Filter.h
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 modemm17 LLC.
+// Copyright 2015-2021 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/FirFilter.h b/modemm17/FirFilter.h
index cff378bee..dfb284159 100644
--- a/modemm17/FirFilter.h
+++ b/modemm17/FirFilter.h
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 modemm17 LLC.
+// Copyright 2015-2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/FreqDevEstimator.h b/modemm17/FreqDevEstimator.h
index 284c91c7b..8b5c0119c 100644
--- a/modemm17/FreqDevEstimator.h
+++ b/modemm17/FreqDevEstimator.h
@@ -1,4 +1,4 @@
-// Copyright 2021 Rob Riggs <rob@modemm17.com>
+// Copyright 2021 Rob Riggs <rob@mobilinkd.com>
 // All rights reserved.
 
 #pragma once
diff --git a/modemm17/FrequencyError.h b/modemm17/FrequencyError.h
index e6ffbfb9c..0da9163fc 100644
--- a/modemm17/FrequencyError.h
+++ b/modemm17/FrequencyError.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/Fsk4Demod.h b/modemm17/Fsk4Demod.h
index 88d21fdef..2aba0a26a 100644
--- a/modemm17/Fsk4Demod.h
+++ b/modemm17/Fsk4Demod.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/Golay24.h b/modemm17/Golay24.h
index fe07166ad..c6fbe5bdd 100644
--- a/modemm17/Golay24.h
+++ b/modemm17/Golay24.h
@@ -1,4 +1,4 @@
-// Copyright 2020 Rob Riggs <rob@modemm17.com>
+// Copyright 2020 Rob Riggs <rob@mobilinkd.com>
 // All rights reserved.
 
 #pragma once
diff --git a/modemm17/IirFilter.h b/modemm17/IirFilter.h
index 38a9bffe1..5da1f4357 100644
--- a/modemm17/IirFilter.h
+++ b/modemm17/IirFilter.h
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 modemm17 LLC.
+// Copyright 2015-2021 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/LinkSetupFrame.h b/modemm17/LinkSetupFrame.h
index 816ce1c9e..a56d66f6c 100644
--- a/modemm17/LinkSetupFrame.h
+++ b/modemm17/LinkSetupFrame.h
@@ -1,11 +1,11 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
 #include <array>
 #include <cstdint>
 #include <cmath>
-#include <string_view> // Don't have std::span in C++17.
+// #include <string_view> // Don't have std::span in C++17.
 #include <stdexcept>
 #include <algorithm>
 
@@ -56,11 +56,11 @@ struct LinkSetupFrame
         for (auto c : callsign)
         {
             encoded *= 40;
-            if (c >= 'A' and c <= 'Z')
+            if ((c >= 'A') && (c <= 'Z'))
             {
                 encoded += c - 'A' + 1;
             }
-            else if (c >= '0' and c <= '9')
+            else if ((c >= '0') && (c <= '9'))
             {
                 encoded += c - '0' + 27;
             }
@@ -112,6 +112,7 @@ struct LinkSetupFrame
         // decode each base-40 digit and map them to the appriate character.
         result.fill(0);
         size_t index = 0;
+
         while (encoded)
         {
             result[index++] = callsign_map[encoded % 40];
diff --git a/modemm17/M17Demodulator.h b/modemm17/M17Demodulator.h
index 338a0732a..a18790c00 100644
--- a/modemm17/M17Demodulator.h
+++ b/modemm17/M17Demodulator.h
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 Rob Riggs <rob@modemm17.com>
+// Copyright 2020-2021 Rob Riggs <rob@mobilinkd.com>
 // All rights reserved.
 
 #pragma once
diff --git a/modemm17/M17FrameDecoder.h b/modemm17/M17FrameDecoder.h
index 5464d302b..6a58e7eb5 100644
--- a/modemm17/M17FrameDecoder.h
+++ b/modemm17/M17FrameDecoder.h
@@ -1,4 +1,4 @@
-// Copyright 2021 modemm17 LLC.
+// Copyright 2021 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/M17Framer.h b/modemm17/M17Framer.h
index 419b3e4f4..3b6e21c1c 100644
--- a/modemm17/M17Framer.h
+++ b/modemm17/M17Framer.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/M17Randomizer.h b/modemm17/M17Randomizer.h
index 8b1deb850..b7996023a 100644
--- a/modemm17/M17Randomizer.h
+++ b/modemm17/M17Randomizer.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/M17Synchronizer.h b/modemm17/M17Synchronizer.h
index 065df20ad..7c4f50b35 100644
--- a/modemm17/M17Synchronizer.h
+++ b/modemm17/M17Synchronizer.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/PhaseEstimator.h b/modemm17/PhaseEstimator.h
index 2e504b48b..dcd852ef6 100644
--- a/modemm17/PhaseEstimator.h
+++ b/modemm17/PhaseEstimator.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/PolynomialInterleaver.h b/modemm17/PolynomialInterleaver.h
index 75dad5717..55960df68 100644
--- a/modemm17/PolynomialInterleaver.h
+++ b/modemm17/PolynomialInterleaver.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/SlidingDFT.h b/modemm17/SlidingDFT.h
index d02b6839e..534683efc 100644
--- a/modemm17/SlidingDFT.h
+++ b/modemm17/SlidingDFT.h
@@ -1,4 +1,4 @@
-// Copyright 2021 modemm17 LLC.
+// Copyright 2021 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/SymbolEvm.h b/modemm17/SymbolEvm.h
index 4737a1d4f..5c38b7d94 100644
--- a/modemm17/SymbolEvm.h
+++ b/modemm17/SymbolEvm.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/Trellis.h b/modemm17/Trellis.h
index 5998cb7ef..cf8d6fafb 100644
--- a/modemm17/Trellis.h
+++ b/modemm17/Trellis.h
@@ -1,4 +1,4 @@
-// Copyright 2020-2021 modemm17 LLC.
+// Copyright 2020-2021 Mobilinkd LLC.
 
 // make CXXFLAGS="$(pkg-config --cflags gtest) $(pkg-config --libs gtest) -I. -O3" tests/TrellisTest
 
diff --git a/modemm17/Util.h b/modemm17/Util.h
index 76b755bf7..295fe0d41 100644
--- a/modemm17/Util.h
+++ b/modemm17/Util.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/Viterbi.h b/modemm17/Viterbi.h
index 8c7b23fa4..525fe04db 100644
--- a/modemm17/Viterbi.h
+++ b/modemm17/Viterbi.h
@@ -1,4 +1,4 @@
-// Copyright 2020 modemm17 LLC.
+// Copyright 2020 Mobilinkd LLC.
 
 #pragma once
 
diff --git a/modemm17/ax25_frame.h b/modemm17/ax25_frame.h
index 7bf764252..5a68d9daa 100644
--- a/modemm17/ax25_frame.h
+++ b/modemm17/ax25_frame.h
@@ -1,4 +1,4 @@
-// Copyright 2012-2021 Rob Riggs <rob@modemm17.com>
+// Copyright 2012-2021 Rob Riggs <rob@mobilinkd.com>
 // All rights reserved.
 
 #pragma once