[TASK] Adjust nodetype to new naming convention