Improved importName and added test