#251 Rename modules