Remap account/organization -> organization