Test: Ensure renaming still works Fixes: 37748634 Change-Id: I6a863200b1f12db857c308e3b935b0f27f20c85b