Update entities to match by name for forward compatibility