Fix spaces in binding names

Change-Id: Icdf9845e5cf2cff6cceb2ca56606335912319fb3