Change from SOFTWARE_NAME macro to SOFTWARE_AND_VERSION in dirs.in. Add SOFTWARE_AND_VERSION to NAME_REFEX in build-scripts/configuration-information.sh.