Fix up names. Add starter for fetcher.