[SR-Dev] git:janakj/flatstore: - fix link entity names, patch from Carsten Gross