Module name changes

To make more sense