Fixed to generate resolvable enzyme URI
import cleanup
Handle duplicate names