Changed names in gatt.c