Rename for clarity.
Added options to the mapping categories.