fix issue with name clash DataFeed