some doc/renaming fixes