Remove Aelfred dependency
Handle duplicate namespaces by renaming them.