changed name, title etc. to more neutral