code cleanup with better names for dynamic nodes