fix names and sql requests