draw: Use register names more consistently.