naming convection fix
Database fix
removed unique index