fix overlay rename, sync with p500

Change-Id: I3ac54e3228d0a26075f83e3fccc565242255b619