Correct the id scheme of entries.
Rename data source to fix casing compilation problem.