Renaming
End of renaming
Merge pull request #2 from Papiel/renaming

Renaming