Let users pick from anywhere.
Renamed some things.