- renaming some files and id's

Change-Id: Id35affee802748f88f0fe504a4fe556931174195