refactored simple labels which should really be tree labels

Signed-off-by: Tim Henderson <tim.tadh@gmail.com>