oops, looks like ee2c4b73ac5e0d6220ee52a1baa2198d304867c7 was wrong and the words were already at the right buildings ... or, more likely, I've jumbled them up :worried:
switch from CloudMade to Mapbox (alas, poor CloudMade)