Made bookmarks machine-name-independent.