Trebuchet : Finalize labelling

Change-Id: If09c4d7599ecbbe4adbf41def8fbd468d95377b4