Rename all occurences and adjust file names as well Change-Id: I6e5f3ee393390aa9075dbd1ec6ae1c20e90fd7ee