Add bridge names and better lock names

This little commit adds bridge names (bridge_ref and bridge_name concatenated), and changes lock names to the same format.