Remove compatibility names

These names are not used anymore, all usage has been adapted.

Change-Id: I8bf369956fbdd55a2696e28ae033837c6513fcca