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

Renaming