Variable renaming to accomplish standards
Merge branch 'develop' of github.com:srv/srv_tools into develop