Changed node names and types