renamed most elementary functors (adding `Fun` suffix)