fixes in Namers and Typers (compilable version)