Some of the parameters in the error messages where named without the _ (underscore) character between the words of the parameters. This patch brings those parameters into the same form. Change-Id: Ieedf2ad884f4a43f6fead8c34535a168f39a1207