Fix names and addendum