more renames, fix spacing
Merge branch 'master' of https://github.com/patricelliG/java_sys_script