changed node types to new names