Changed the naming setup...

Change-Id: Idd964ba65f75c98dce2e6ed301ebedefc1d36796