Changes suggested by jamtur01 (plural, mapping)

Signed-off-by: Dan Cotora <d@bluevision.ro>