Change old use of module creation to new proper use.