minor renamings and doc comments