Changed names on the modules