diff --git a/src/libs/routes_v2/api.js b/src/libs/routes_v2/api.js
index cb19b9a4fa94e95c5073f1debdd9ff3cb9d3da63..f680458493cd8cbea407c9d9730a4eb7498a113b 100644
--- a/src/libs/routes_v2/api.js
+++ b/src/libs/routes_v2/api.js
@@ -136,7 +136,7 @@ const courseStudents = require(`${libs}/routes_v2/courseStudents`);
 
 const simcaqFirstReport = require(`${libs}/routes_v2/simcaqFirstReport`);
 
-const enrollmentDiagnosis = require(`${libs}/routes_v2/enrollment_diagnosis`);
+const simcaqEnrollmentDiagnosis = require(`${libs}/routes_v2/simcaqEnrollmentDiagnosis`);
 
 const simcaqSecondReport = require(`${libs}/routes_v2/simcaqSecondReport`);
 
@@ -199,7 +199,7 @@ api.use('/universityLocalOffer', universityLocalOffer);
 api.use('/message', message);
 api.use('/course_students', courseStudents);
 api.use('/simcaq_first_report', simcaqFirstReport);
-api.use('/enrollment_diagnosis', enrollmentDiagnosis);
+api.use('/simcaq_enrollment_diagnosis', simcaqEnrollmentDiagnosis);
 api.use('/simcaq_second_report', simcaqSecondReport);
 
 module.exports = api;
diff --git a/src/libs/routes_v2/enrollment_diagnosis.js b/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js
similarity index 93%
rename from src/libs/routes_v2/enrollment_diagnosis.js
rename to src/libs/routes_v2/simcaqEnrollmentDiagnosis.js
index 221549e581a2a83868de4bfb6356e314df79acba..bd23cf2538f67893aa5faed62a00903655cec796 100644
--- a/src/libs/routes_v2/enrollment_diagnosis.js
+++ b/src/libs/routes_v2/simcaqEnrollmentDiagnosis.js
@@ -20,7 +20,7 @@ along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
 
 const express = require('express');
 
-const enrollmentDiagnosisApp = express.Router();
+const simcaqEnrollmentDiagnosisApp = express.Router();
 
 const libs = `${process.cwd()}/libs`;
 
@@ -40,7 +40,7 @@ const cache = require('apicache').options({ debug: config.debug, statusCodes: {i
 
 let rqf = new ReqQueryFields();
 
-enrollmentDiagnosisApp.use(cache('15 day'));
+simcaqEnrollmentDiagnosisApp.use(cache('15 day'));
 
 rqf.addField({
     name: 'filter',
@@ -76,11 +76,11 @@ rqf.addField({
 }).addValue({
     name: 'school',
     table: 'simcaq_diagnostico_de_matricula',
-    tableField: 'id',
+    tableField: 'escola_id',
     where: {
         relation: '=',
         type: 'integer',
-        field: 'id'
+        field: 'escola_id'
     }
 }).addValue({
     name: 'stage',
@@ -111,7 +111,7 @@ rqf.addField({
     }
 });
 
-enrollmentDiagnosisApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
+simcaqEnrollmentDiagnosisApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
     req.sql.from('simcaq_diagnostico_de_matricula')
         .field('simcaq_diagnostico_de_matricula.etapa', 'stage')
         .field('SUM(simcaq_diagnostico_de_matricula.total)', 'total')
@@ -125,9 +125,7 @@ enrollmentDiagnosisApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
         .field('SUM(simcaq_diagnostico_de_matricula.matriculas_urbana)', 'urban_enrollments')
         .field('SUM(simcaq_diagnostico_de_matricula.matriculas_rural)', 'rural_enrollments')
         .group('simcaq_diagnostico_de_matricula.etapa');
-
-    console.log(req.sql.toString());
     next();
 }, query, response('enrollmentDiagnosis'));
 
-module.exports = enrollmentDiagnosisApp;
+module.exports = simcaqEnrollmentDiagnosisApp;
diff --git a/src/libs/routes_v2/simcaqFirstReport.js b/src/libs/routes_v2/simcaqFirstReport.js
index db300da53a36c308186aedc30def6a5cbecf2163..b6bde1645d2da66359295b0d36cc7488f7e37a2c 100644
--- a/src/libs/routes_v2/simcaqFirstReport.js
+++ b/src/libs/routes_v2/simcaqFirstReport.js
@@ -85,11 +85,11 @@ rqf.addField({
 }).addValue({
     name: 'school',
     table: 'simcaq_relatorio_1',
-    tableField: 'id',
+    tableField: 'escola_id',
     where: {
         relation: '=',
         type: 'integer',
-        field: 'id'
+        field: 'escola_id'
     }
 }).addValue({
     name: 'location',
diff --git a/src/libs/routes_v2/simcaqSecondReport.js b/src/libs/routes_v2/simcaqSecondReport.js
index 6babe38356292fbf5db56003af921c20eb089fca..fdd583d6e82792a64f9c89031cde005308ac0d74 100644
--- a/src/libs/routes_v2/simcaqSecondReport.js
+++ b/src/libs/routes_v2/simcaqSecondReport.js
@@ -58,11 +58,11 @@ rqf.addField({
 }).addValue({
     name: 'school',
     table: 'simcaq_relatorio_2',
-    tableField: 'id',
+    tableField: 'escola_id',
     where: {
         relation: '=',
         type: 'integer',
-        field: 'id'
+        field: 'escola_id'
     }
 }).addValue({
     name: 'city',