Fix spaces in binding names

Change-Id: If63fc144559147907f0d9bc2abaf1c115f0106b1