Small rename of fetch
More renames