add expression and scope to autocomplete
rename functions