--- a/sbin/check-ports	Sun Nov 03 19:37:43 2019 +0100
+++ b/sbin/check-ports	Sun Nov 03 19:44:43 2019 +0100
@@ -80,7 +80,7 @@
 }
 
 
-get_index_directory() {
+get_ports_index_directory() {
     : 'Ask the packager configuration for the `INDEXDIR` and/or `PORTSDIR`
     configuration value: either `INDEXDIR` or -- if `INDEXDIR` is empty --
     `PORTSDIR` is used.
@@ -99,7 +99,7 @@
 }
 
 
-get_immediate_index_version() {
+get_ports_index_version() {
     : 'Determine for package `_package` the version of the package in the
     local ports index.
 
@@ -124,7 +124,7 @@
 #    immediate_index_version=${_val##*-}
     #    return ${_rv}
 
-    _indexdir="$(get_index_directory)"
+    _indexdir="$(get_ports_index_directory)"
     _indexfile="$(pkg config INDEXFILE)"
 
     if [ -r "${_indexdir}/${_indexfile}" ] ; then
@@ -368,7 +368,7 @@
             if [ -n "${_print_detail}" ]; then
                 print_title "${_ipackage}" "${_iversion}" "${_irepo}"
                 if [ -n "${_local_index_exists}" ]; then
-                    _index_version="$(get_immediate_index_version "${_ipackage}")"
+                    _index_version="$(get_ports_index_version "${_ipackage}")"
                     print_detail_item "INDEX" "${_index_version}" "${_index_label}" "${_index_descr}"
                 fi
                 if [ -n "${option_alldata_FreeBSD}" -o "${_remote_label_FreeBSD}" != '?' ]; then
@@ -391,7 +391,7 @@
                 if [ -n "${_mapped_package_name}" ] ; then
 	            printf '%18s %s %s (%s)\n' "--------------->" "${_mapped_package_name}" "$(pkg rquery -U '%v' "${_mapped_package_name}")" "$(pkg rquery -U '%R' "${_mapped_package_name}")"
                     if [ -n "${_local_index_exists}" ]; then
-                        print_detail_item "INDEX" "$(get_immediate_index_version "${_mapped_package_name}")" "" ""
+                        print_detail_item "INDEX" "$(get_ports_index_version "${_mapped_package_name}")" "" ""
                     fi
                     print_detail_item "${FREEBSD_REPO}" "$(pkg rquery -U -r "${FREEBSD_REPO}" '%v' "${_mapped_package_name}")" "" ""
                     print_detail_item "${LOCALBSDPORTS_REPO}" "$(pkg rquery -U -r "${LOCALBSDPORTS_REPO}" '%v' "${_mapped_package_name}")" "" ""
@@ -430,7 +430,7 @@
                 read -r _dummy _label _descr <<EOF_INDEX
 $(pkg version -U -I -n "${_package}" -v)
 EOF_INDEX
-                _version="$(get_immediate_index_version "${_package}")"
+                _version="$(get_ports_index_version "${_package}")"
                 print_detail_item "INDEX" "${_version}" "${_label}" "${_descr}"
             fi
             for _repo in "${FREEBSD_REPO}" "${LOCALBSDPORTS_REPO}" "${SHARED_LOCAL_REPO}" "${LOCAL_REPO}"; do
@@ -444,7 +444,7 @@
             if [ -n "${_mapped_package_name}" ] ; then
                 printf '%18s %s %s (%s)\n' "--------------->" "${_mapped_package_name}" "$(pkg rquery -U '%v' "${_mapped_package_name}")" "$(pkg rquery -U '%R' "${_mapped_package_name}")"
                 if [ -n "${_local_index_exists}" ]; then
-                    print_detail_item "INDEX" "$(get_immediate_index_version "${_mapped_package_name}")" "" ""
+                    print_detail_item "INDEX" "$(get_ports_index_version "${_mapped_package_name}")" "" ""
                 fi
                 for _repo in "${FREEBSD_REPO}" "${LOCALBSDPORTS_REPO}" "${SHARED_LOCAL_REPO}" "${LOCAL_REPO}"; do
                     print_detail_item "${_repo}" "$(pkg rquery -U -r "${_repo}" '%v' "${_mapped_package_name}")" "" ""