migrate from named functions to function expressions

Change-Id: I6669a043e653d207153e6feb4eae7ef7dd24e12c