added missing "Affero" in several files

(This one adresses partially issues adressed already in #262, and some newly introduced inconsistencies )