removed more typenames