Add bridge names and better lock names