Fix test and doc internal names