Improve module search and identity so moduels with the same base name can co-exist