Refactoring assembly.id and name.space