misc. renamings and adding search methods