Respect existing parameter names and fix some exceptions #KT-19439 Fixed #KT-20402 Fixed #KT-20403 Fixed