Change subquery names