diff --git a/internal/cld2_generated_deltaoctachrome20141015.cc b/internal/cld2_generated_deltaoctachrome20141015.cc
index fbce443..fc37d2b 100644
--- a/internal/cld2_generated_deltaoctachrome20141015.cc
+++ b/internal/cld2_generated_deltaoctachrome20141015.cc
@@ -4260,6 +4260,7 @@ static const IndirectProbBucket4 kDeltaOctaChrome1015[kDeltaOctaChrome1015Size]
   // table_hash = 3eb2-6696, unused_entries = 1062 (6.48%)
 
 static const uint32 kDeltaOctaChrome1015SizeOne = 988;    // Bucket count one-lang
+extern const uint32 kDeltaOctaIndSize = kDeltaOctaChrome1015SizeOne; // Source-agnostic named constant
 static const uint32 kDeltaOctaChrome1015Ind[988] = {
   // [0000]
   0x00000000, 0x00000000, 0x00001324, 0x00000e1c,   // -- --  bh.un.un_900 is.un.un_800 
@@ -4594,6 +4595,7 @@ static const IndirectProbBucket4 kDeltaOctaChrome1015_2[kDeltaOctaChrome1015_2Si
   // table_hash = ffff-ffff, unused_entries = 0 (0.00%)
 
 static const uint32 kDeltaOctaChrome1015_2SizeOne = 2;    // Bucket count one-lang
+extern const uint32 kDeltaOcta2IndSize = kDeltaOctaChrome1015_2SizeOne; // Source-agnostic named constant
 static const uint32 kDeltaOctaChrome1015_2Ind[2] = {
   // [0000] --- double_langprob_start=0002 ---
   0x00000000, 0x00000000,                           // -- --  
diff --git a/internal/cld2_generated_distinctoctachrome20141015.cc b/internal/cld2_generated_distinctoctachrome20141015.cc
index 877ee82..f507faf 100644
--- a/internal/cld2_generated_distinctoctachrome20141015.cc
+++ b/internal/cld2_generated_distinctoctachrome20141015.cc
@@ -2136,6 +2136,7 @@ static const IndirectProbBucket4 kDistinctOctaChrome1015[kDistinctOctaChrome1015
   // table_hash = eb69-5560, unused_entries = 3978 (48.56%)
 
 static const uint32 kDistinctOctaChrome1015SizeOne = 75;    // Bucket count one-lang
+extern const uint32 kDistinctOctaIndSize = kDistinctOctaChrome1015SizeOne; // Source-agnostic named constant
 static const uint32 kDistinctOctaChrome1015Ind[75] = {
   // [0000]
   0x00000000, 0x00000000, 0x00000b03, 0x00001c03,   // -- --  es.un.un_300 id.un.un_300 
@@ -2185,6 +2186,7 @@ static const IndirectProbBucket4 kDistinctOctaChrome1015_2[kDistinctOctaChrome10
   // table_hash = ffff-ffff, unused_entries = 0 (0.00%)
 
 static const uint32 kDistinctOctaChrome1015_2SizeOne = 2;    // Bucket count one-lang
+extern const uint32 kDistinctOcta2IndSize = kDistinctOctaChrome1015_2SizeOne; // Source-agnostic named constant
 static const uint32 kDistinctOctaChrome1015_2Ind[2] = {
   // [0000] --- double_langprob_start=0002 ---
   0x00000000, 0x00000000,                           // -- --  
diff --git a/internal/cld2_generated_quadchrome20141015_2.cc b/internal/cld2_generated_quadchrome20141015_2.cc
index c248274..eba7584 100644
--- a/internal/cld2_generated_quadchrome20141015_2.cc
+++ b/internal/cld2_generated_quadchrome20141015_2.cc
@@ -65758,6 +65758,7 @@ static const IndirectProbBucket4 kQuadChrome1015_2[kQuadChrome1015_2Size] = {
   // table_hash = e161-1b58, unused_entries = 13696 (5.22%)
 
 static const uint32 kQuadChrome1015_2SizeOne = 59652;    // Bucket count one-lang
+extern const uint32 kQuadChromeIndSize = kQuadChrome1015_2SizeOne; // Source-agnostic named constant
 static const uint32 kQuadChrome1015_2Ind[59652] = {
   // [0000]
   0x00000000, 0x00000000, 0x08040709, 0x06000c13,   // -- --  bg.ru.uk_444 sv.de.un_650 
@@ -84483,6 +84484,7 @@ static const IndirectProbBucket4 kQuadChrome1015_2_2[kQuadChrome1015_2_2Size] =
   // table_hash = ffff-ffff, unused_entries = 0 (0.00%)
 
 static const uint32 kQuadChrome1015_2_2SizeOne = 2;    // Bucket count one-lang
+extern const uint32 kQuadChrome2IndSize = kQuadChrome1015_2_2SizeOne; // Source-agnostic named constant
 static const uint32 kQuadChrome1015_2_2Ind[2] = {
   // [0000] --- double_langprob_start=0002 ---
   0x00000000, 0x00000000,                           // -- --  
diff --git a/internal/cld_generated_score_quad_octa_20141015_2.cc b/internal/cld_generated_score_quad_octa_20141015_2.cc
index 83f0004..76996f9 100644
--- a/internal/cld_generated_score_quad_octa_20141015_2.cc
+++ b/internal/cld_generated_score_quad_octa_20141015_2.cc
@@ -25,7 +25,7 @@
 namespace CLD2 {
 
 // Average score per 1024 bytes
-static const int kAvgDeltaOctaScoreSize = 614 * 4;
+extern const int kAvgDeltaOctaScoreSize = 614 * 4;
 extern const short kAvgDeltaOctaScore[kAvgDeltaOctaScoreSize] = {
 // Latn  Cyrl  Arab  Other script
 // Updated 20140204 for CLD2 full
diff --git a/internal/compile_dynamic.sh b/internal/compile_dynamic.sh
index ecb3047..ca45dc6 100755
--- a/internal/compile_dynamic.sh
+++ b/internal/compile_dynamic.sh
@@ -26,8 +26,8 @@ g++ -O2 -m64 cld2_dynamic_data_tool.cc \
   tote.cc utf8statetable.cc  \
   cld_generated_cjk_uni_prop_80.cc cld2_generated_cjk_compatible.cc  \
   cld_generated_cjk_delta_bi_4.cc generated_distinct_bi_0.cc  \
-  cld2_generated_quadchrome0122_2.cc cld2_generated_deltaoctachrome0122.cc \
-  cld2_generated_distinctoctachrome0122.cc  cld_generated_score_quad_octa_0122_2.cc  \
+  cld2_generated_quadchrome20141015_2.cc cld2_generated_deltaoctachrome20141015.cc \
+  cld2_generated_distinctoctachrome20141015.cc  cld_generated_score_quad_octa_20141015_2.cc  \
   -o cld2_dynamic_data_tool
 echo "  cld2_dynamic_data_tool compiled"