New build filename handling

Change-Id: I06ec68e4e2a062614b7e0c2fe2f8363256aab92b