Typenames is some not quite right places...

...for compilation on the mac...