Fix buffer names escaping