Incremental commit: rename MAP2 to MAP and Map2 to Make (the functor)

Signed-off-by: David Scott <dave.scott@eu.citrix.com>