Some renames to better reflect bitmessage protocol documentation.