Hello,

Changing the amenity type is okay but please do not add address tags on places.

We work hard to clean up the address system and avoid duplication inside the database.  OSM is a geographical database, a lot of information like this is automatically obtained by querying related objects.

Happy mapping.