Remove deprecated and duplicate keywords from paramNameRemap
Fixes, updates and improvements