Better hanling file name

Change-Id: If8bae9cd1c40766aec802b34e2d47404774fea51