Forms: swap p and q for consistency
Firedrake forms coffee: use q and p