updates to naming, autocompletion