Fix naming of phantoms

Change-Id: I60e925ee83fa2670eeabc5b690928f6f029b2eb4
Merge "Fix naming of phantoms"