Revert "More renaming"

This reverts commit d928bbcce88beaa5c798f08f5e8f3257546bd6f4.
Revert renaming
Merge branch 'develop' into bitshares