Rename the objects according to the new name of the project. Change-Id: Iaf018c6e5b49b3a7a0b0c2ee26a52669961b6673