Rename some functions to match scheme
Add resolve via prompt