Update->Upgrade consistently
Update Documentation. Reflect all new changes.