diff --git a/app/templates/admin/customers.html b/app/templates/admin/customers.html
index 55da8ff0..0352e8a6 100644
--- a/app/templates/admin/customers.html
+++ b/app/templates/admin/customers.html
@@ -240,6 +240,6 @@
 </div>
 {% endblock %}
 
-{% block page_scripts %}
+{% block extra_scripts %}
 <script src="{{ url_for('static', path='admin/js/customers.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/notifications.html b/app/templates/admin/notifications.html
index 6e0c363c..5526572b 100644
--- a/app/templates/admin/notifications.html
+++ b/app/templates/admin/notifications.html
@@ -356,6 +356,6 @@
 </div>
 {% endblock %}
 
-{% block page_scripts %}
+{% block extra_scripts %}
 <script src="{{ url_for('static', path='admin/js/notifications.js') }}"></script>
 {% endblock %}
diff --git a/app/templates/admin/test-auth-flow.html b/app/templates/admin/test-auth-flow.html
index 4d049f26..06db2825 100644
--- a/app/templates/admin/test-auth-flow.html
+++ b/app/templates/admin/test-auth-flow.html
@@ -217,7 +217,7 @@
 </div>
 {% endblock %}
 
-{% block scripts %}
+{% block extra_scripts %}
 <script>
 function authFlowTest() {
     return {
diff --git a/app/templates/admin/test-vendors-users-migration.html b/app/templates/admin/test-vendors-users-migration.html
index 905feb39..9d5627d6 100644
--- a/app/templates/admin/test-vendors-users-migration.html
+++ b/app/templates/admin/test-vendors-users-migration.html
@@ -138,7 +138,7 @@
 </div>
 {% endblock %}
 
-{% block scripts %}
+{% block extra_scripts %}
 <script>
 function migrationTest() {
     return {
diff --git a/scripts/validate_architecture.py b/scripts/validate_architecture.py
index 40696e70..0a6a2352 100755
--- a/scripts/validate_architecture.py
+++ b/scripts/validate_architecture.py
@@ -2706,6 +2706,10 @@ class ArchitectureValidator:
             if not is_base_or_partial and not is_macro and not is_components_page:
                 self._check_number_stepper_macro_usage(file_path, content, lines)
 
+            # TPL-008: Check for invalid block names
+            if not is_base_or_partial:
+                self._check_valid_block_names(file_path, content, lines)
+
             # Skip base/partials for TPL-001 check
             if is_base_or_partial:
                 continue