To make integration and testing easier keeping references and tests unchanged. Change-Id: Ie808eaf0ffb754ba9c6be13810cfec2385d8de36