Rename file
Rename some methods