Add operator node

Plus rename some other nodes for consistency.