Small stuff, mostly renaming
Merge branch 'master' of https://github.com/1000000000/N-tinaTester