Move interactive function aliases to base
Add query-replace alias