Fix the product short_names in queries_* templates.

Signed-off-by: Daira Hopwood <daira@leastauthority.com>