more node naming changes