bugfixes: unified names, removed dead comments, fixed method names
bugfixes: unified names, removed dead comments, fixed method names

Hub-of-all-Things/HAT2.0,Hub-of-all-Things/HAT2.0,Hub-of-all-Things/HAT2.0,Hub-of-all-Things/HAT2.0