tidy and minor renaming
Merge branch 'master' of https://github.com/Valtech-NAS/Beta