Getting rid of module names