Fix response var names, move decs