a lot of renames
Merge branch 'testing' of github.com:jappeace/hw-isgp-kbs into testing