Update #1

name changes, P1 changes
Merge pull request #1 from JimiPedros/First-edit

Update #1