[SR-Dev] git:janakj/bdb: - updated some old entity names