Rename modules
Solve problem 18