add names to type declarations to ease debug