some renaming and cleanup.
Merge branch 'master' of github.com:itsatony/nodebase