fix autocompleter
update names and structure
update names and structure