Updated names for consistency in NodeBase heirarchy