Better name parsing and namespace handling
Fix merging bugs