Rename this to possibly fix roomservice

Change-Id: Ib9cfb0c2be41c970b01e6eda301ec999df9ffc99