Index: openacs-4/packages/acs-tcl/lib/check-installed.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/check-installed.tcl,v
diff -u -r1.3.2.8 -r1.3.2.9
--- openacs-4/packages/acs-tcl/lib/check-installed.tcl	28 Jul 2024 12:15:00 -0000	1.3.2.8
+++ openacs-4/packages/acs-tcl/lib/check-installed.tcl	28 Jul 2024 16:27:54 -0000	1.3.2.9
@@ -21,7 +21,7 @@
     set download_url [ad_conn url]/download
 }
 
-set version_dir [::util::resources::version_dir -resource_info $resource_info]
+set version_segment [::util::resources::version_segment -resource_info $resource_info]
 set newest_version [::util::resources::cdnjs_get_newest_version -resource_info $resource_info]
 
 #
@@ -73,20 +73,20 @@
 #
 set is_installed [::util::resources::is_installed_locally \
                       -resource_info $resource_info \
-                      -version_dir $version_dir ]
+                      -version_segment $version_segment ]
 if {$is_installed} {
     #
     # Tell the users, where the resources are installed.
     #
-    set resources $resource_dir/$version_dir
+    set resources $resource_dir/$version_segment
     
 } else {
     #
     # Check, if we can install the resources locally.
     #
     set writable [util::resources::can_install_locally \
                       -resource_info $resource_info \
-                      -version_dir $version_dir]
+                      -version_segment $version_segment]
     
     if {!$writable} {
         #
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.189.2.184 -r1.189.2.185
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	28 Jul 2024 12:15:00 -0000	1.189.2.184
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	28 Jul 2024 16:27:54 -0000	1.189.2.185
@@ -4067,20 +4067,20 @@
 
     ad_proc -public ::util::resources::is_installed_locally {
         -resource_info:required
-        {-version_dir ""}
+        {-version_segment ""}
     } {
 
         Check, if the required resource files are installed locally.
-        When there should not be a version_dir segment used, provide
+        When there should not be a version_segment segment used, provide
         an empty one via resource_info.
 
         @param resource_info a dict containing resourceDir, cssFiles, jsFiles, and extraFiles
-        @param version_dir an optional directory, under the resource directory
+        @param version_segment an optional directory, under the resource directory
 
         @author Gustaf Neumann
     } {
-        if {$version_dir eq ""} {
-            set version_dir [::util::resources::version_dir -resource_info $resource_info]
+        if {$version_segment eq ""} {
+            set version_segment [::util::resources::version_segment -resource_info $resource_info]
         }
         
         set installed 1
@@ -4103,10 +4103,10 @@
         #ns_log notice "check files <$files>"
 
         foreach file $files {
-            if {$version_dir eq ""} {
+            if {$version_segment eq ""} {
                 set path $resource_dir/$file
             } else {
-                set path $resource_dir/$version_dir/$file
+                set path $resource_dir/$version_segment/$file
             }
             #ns_log notice "... check $path -> [ad_file readable $path]"
             if {![ad_file readable $path]} {
@@ -4119,14 +4119,14 @@
 
     ad_proc -public ::util::resources::can_install_locally {
         {-resource_info:required}
-        {-version_dir ""}
+        {-version_segment ""}
     } {
 
         Check, whether the operating system's permissions allow us to
         install in the configured directories.
 
         @param resource_info a dict containing at least resourceDir
-        @param version_dir an optional directory, under the resource directory
+        @param version_segment an optional directory, under the resource directory
 
         @author Gustaf Neumann
     } {
@@ -4140,8 +4140,8 @@
                 set can_install 0
             }
         }
-        if {$can_install && $version_dir ne ""} {
-            set path $resource_dir/$version_dir
+        if {$can_install && $version_segment ne ""} {
+            set path $resource_dir/$version_segment
             if {![ad_file isdirectory $path]} {
                 try {
                     file mkdir $path
@@ -4199,13 +4199,13 @@
 
     ad_proc -public ::util::resources::download {
         {-resource_info:required}
-        {-version_dir ""}
+        {-version_segment ""}
     } {
 
         Download resources typically from a CDN and install it for local usage.
         The installed files are as well gzipped for faster delivery, when gzip is available.-
 
-        @param version_dir an optional directory, under the resource directory
+        @param version_segment an optional directory, under the resource directory
         @param resource_info a dict containing resourceDir, cdn, cssFiles, jsFiles, and extraFiles
 
         @author Gustaf Neumann
@@ -4215,21 +4215,21 @@
         #
         #   "resourceDir" is the absolute path in the filesystem
         #   "resourceUrl" is the URL path provided to the request processor
-        #   "versionDir" is the optional version-specific element both in the
+        #   "versionSegment" is the optional version-specific element both in the
         #                URL and in the filesystem.
         #
         set version [dict get $resource_info installedVersion]
         set resource_dir [dict get $resource_info resourceDir]
 
-        if {$version_dir eq "" && [dict exists $resource_info versionDir]} {
-            set version_dir [dict get $resource_info versionDir]
-        } elseif {$version_dir eq ""} {
-            set version_dir $version
+        if {$version_segment eq "" && [dict exists $resource_info versionSegment]} {
+            set version_segment [dict get $resource_info versionSegment]
+        } elseif {$version_segment eq ""} {
+            set version_segment $version
         }
-        ns_log notice "::util::resources::download" version $version resource_dir $resource_dir version_dir $version_dir
+        ns_log notice "::util::resources::download" version $version resource_dir $resource_dir version_segment $version_segment
         set can_install [::util::resources::can_install_locally \
                              -resource_info $resource_info \
-                             -version_dir $version_dir]
+                             -version_segment $version_segment]
         if {!$can_install} {
             error "Cannot download resources to $resource_dir due to permissions"
         }
@@ -4241,9 +4241,9 @@
         set download_prefix https:[dict get $resource_info cdn]
         set local_path $resource_dir
 
-        if {$version_dir ne ""} {
-            append local_path /$version_dir
-            append download_prefix /$version_dir
+        if {$version_segment ne ""} {
+            append local_path /$version_segment
+            append download_prefix /$version_segment
         }
         if {![ad_file writable $local_path]} {
             file mkdir $local_path
@@ -4315,14 +4315,14 @@
         }
     }
 
-    ad_proc -public ::util::resources::version_dir {
+    ad_proc -public ::util::resources::version_segment {
         -resource_info:required
     } {
         Return the partial directory, where a certain version is/will be installed.
     } {        
         return [expr {
-                      [dict exists $resource_info versionDir]
-                      ? [dict get $resource_info versionDir]
+                      [dict exists $resource_info versionSegment]
+                      ? [dict get $resource_info versionSegment]
                       : [dict get $resource_info installedVersion]
                   }]
     }
Index: openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl,v
diff -u -r1.12.2.13 -r1.12.2.14
--- openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl	25 Jul 2024 14:24:26 -0000	1.12.2.13
+++ openacs-4/packages/cookie-consent/tcl/cookie-consent-procs.tcl	28 Jul 2024 16:27:54 -0000	1.12.2.14
@@ -303,7 +303,7 @@
         #
         #   "resourceDir" is the absolute path in the filesystem
         #   "resourceUrl" is the URL path provided to the request processor
-        #   "versionDir" is the version-specific element both in the
+        #   "versionSegment" is the version-specific element both in the
         #                URL and in the filesystem.
         
         set resourceDir [acs_package_root_dir cookie-consent/www/resources]
Index: openacs-4/packages/highcharts/tcl/resource-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/highcharts/tcl/resource-procs.tcl,v
diff -u -r1.1.2.14 -r1.1.2.15
--- openacs-4/packages/highcharts/tcl/resource-procs.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.14
+++ openacs-4/packages/highcharts/tcl/resource-procs.tcl	28 Jul 2024 16:27:54 -0000	1.1.2.15
@@ -112,7 +112,7 @@
         #
         set resource_info [resource_info -version $version]
         set resourceDir [dict get $resource_info resourceDir]
-        set versionDir [::util::resources::version_dir -resource_info $resource_info]
+        set versionSegment [::util::resources::version_segment -resource_info $resource_info]
         
         ::util::resources::download -resource_info $resource_info
         
@@ -141,8 +141,8 @@
             set fn [file tail $url]
             util::unzip \
                 -overwrite \
-                -source $resourceDir/$versionDir/$fn \
-                -destination $resourceDir/$versionDir
+                -source $resourceDir/$versionSegment/$fn \
+                -destination $resourceDir/$versionSegment
         }
     }
 
Index: openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl,v
diff -u -r1.1.2.15 -r1.1.2.16
--- openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl	28 Jul 2024 12:15:01 -0000	1.1.2.15
+++ openacs-4/packages/openacs-bootstrap5-theme/tcl/resource-procs.tcl	28 Jul 2024 16:27:54 -0000	1.1.2.16
@@ -25,16 +25,16 @@
         #
         #   "resourceDir" is the absolute path in the filesystem
         #   "resourceUrl" is the URL path provided to the request processor
-        #   "versionDir" is the version-specific element both in the
+        #   "versionSegment" is the version-specific element both in the
         #                URL and in the filesystem.
         #
         set resourceDir   [acs_package_root_dir openacs-bootstrap5-theme/www/resources/bootstrap]
         set resourceUrl   /resources/openacs-bootstrap5-theme/bootstrap
         
-        set versionDir    $version
+        set versionSegment    $version
         set cdn           //cdnjs.cloudflare.com/ajax/libs/bootstrap
 
-        if {[file exists $resourceDir/$versionDir]} {
+        if {[file exists $resourceDir/$versionSegment]} {
             set prefix  $resourceUrl/$version
             set cdnHost ""
         } else {
@@ -48,7 +48,7 @@
         lappend result \
             resourceName "Bootstrap 5" \
             resourceDir $resourceDir \
-            versionDir $versionDir \
+            versionSegment $versionSegment \
             cdn $cdn \
             cdnHost $cdnHost \
             prefix $prefix \