More consitent naming of world database names