rename property names as avos protocol