more simplifications and renaming
Merge branch 'master' of github.com:INFOUND/the-test-gem