Added rename/changed some copy