Rename bridge classes