diff --git a/lua/scl/auto_prefix.lua b/lua/scl/auto_prefix.lua
index 511ed33..e861493 100644
--- a/lua/scl/auto_prefix.lua
+++ b/lua/scl/auto_prefix.lua
@@ -38,11 +38,9 @@ local keywords = {
   "CONSTANT", "RETAIN", "NON_RETAIN",
 }
 
--- Keywords that need semicolon after them (when at end of statement)
+-- Keywords that need semicolon after them (control structure ends only)
 local end_keywords = {
   "END_IF", "END_FOR", "END_WHILE", "END_REPEAT", "END_CASE",
-  "END_VAR", "END_FUNCTION", "END_FUNCTION_BLOCK", "END_ORGANIZATION_BLOCK",
-  "END_TYPE", "END_STRUCT", "END_DATA_BLOCK", "END_REGION",
 }
 
 -- Map lowercase to uppercase for auto-conversion