renamed files and objects to better support auto-compl
Merge branch 'master' of github.com:mwaylabs/TMP2