Fix name issues and import only one node