refactor decl wrapper names ast/symtab