Refactored node naming.