Databases names updated to more generic ones