fixing db related names conflict