Renaming MapB and CollectB

Dropping the B suffix