Fixed labels of composite commands.

Change-Id: I14a8f3e7186998489ed014f120ea0743910630e7