Also need to change name, same for Bridge