Change module names to better reflect their purpose.