Created by: reyoung

Also, change the labels to label for api consistency

Fix #6144 (closed) Fix #6145 (closed)