more cleanup; finish renaming protobuf map keys