Fix Entity Code Overlaps