take easier to understand guard/handler spec names

hopefully