Oosaka-fu Oosaka-shi . "Masu" is favorable.
We will use the updated information as reference for updating.