This allows to show the correct labels. Change-Id: I52f42e042af0df2d091d786c03102cec352b3a5b
This also changes the code to use the new interfaces wherever the update is not supposed to change.