Modify Names and add more copyright info
Finish name changes