A couple of name changes