Changed location calculation to use name of module instead of location path