bitcoin address support; more name refactoring