Issue #670282 by amateescu: Change all references to 'nodequeue' to queue and subqueue where appropriate.