renaming beacon_arrived to arrive and geo_fence to geofence at top level entity