Rename several modules to have better names.