rename was wrong way round

missed refactor
handle attributes too