diff --git a/infraestrutura.sql b/infraestrutura.sql
index 1ac404d619d70e73655643ac0d546bea4a0be8d1..fbe953dc9a78be3341b2580bc58a7326b58bfaa4 100644
--- a/infraestrutura.sql
+++ b/infraestrutura.sql
@@ -265,7 +265,7 @@ WITH tabela_base AS(
 		'Coleta de esgoto' AS "scholar_dependency_name",
 		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 THEN 1 ELSE 0 END AS "total_schools",
 		0 AS "total_no_dependency",
-		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND (esgoto_rede_publica=1OR esgoto_fossa_septica=1) THEN 1 ELSE 0 END AS "total_with_dependency"
+		CASE WHEN local_func_predio_escolar=1 AND dependencia_adm_id=3 AND (esgoto_rede_publica=1 OR esgoto_fossa_septica=1) THEN 1 ELSE 0 END AS "total_with_dependency"
 	FROM
 		filtros_etapas_1_estadual),
 
@@ -289,53 +289,53 @@ WITH tabela_base AS(
 	FROM
 		filtros_etapas_1_estadual)
 
-	SELECT * FROM 1_biblioteca
+	SELECT * FROM biblioteca_1
 	UNION ALL
-	SELECT * FROM 2_sala_de_leitura
+	SELECT * FROM sala_de_leitura_2
 	UNION ALL
-	SELECT * FROM 3_laboratorio_de_informatica
+	SELECT * FROM laboratorio_de_informatica_3
 	UNION ALL
-	SELECT * FROM 4_laboratorio_de_ciencias
+	SELECT * FROM laboratorio_de_ciencias_4
 	UNION ALL
-	SELECT * FROM 5_parque_infantil
+	SELECT * FROM parque_infantil_5
 	UNION ALL
-	SELECT * FROM 6_quadra_poliesportiva
+	SELECT * FROM quadra_poliesportiva_6
 	UNION ALL
-	SELECT * FROM 7_quadras_a_serem_cobertas
+	SELECT * FROM quadras_a_serem_cobertas_7
 	UNION ALL
-	SELECT * FROM 8_patio
+	SELECT * FROM patio_8
 	UNION ALL
-	SELECT * FROM 9_patios_a_serem_cobertos
+	SELECT * FROM patios_a_serem_cobertos_9
 	UNION ALL
-	SELECT * FROM 10_sala_de_direcao_
+	SELECT * FROM sala_de_direcao_10
 	UNION ALL
-	SELECT * FROM 11_secretaria
+	SELECT * FROM secretaria_11
 	UNION ALL
-	SELECT * FROM 12_sala_de_professores
+	SELECT * FROM sala_de_professores_12
 	UNION ALL
-	SELECT * FROM 13_cozinha
+	SELECT * FROM cozinha_13
 	UNION ALL
-	SELECT * FROM 14_despensa
+	SELECT * FROM despensa_14
 	UNION ALL
-	SELECT * FROM 15_almoxarifado
+	SELECT * FROM almoxarifado_15
 	UNION ALL
-	SELECT * FROM 16_internet
+	SELECT * FROM internet_16
 	UNION ALL
-	SELECT * FROM 17_internet_banda_larga
+	SELECT * FROM internet_banda_larga_17
 	UNION ALL
-	SELECT * FROM 18_banheiro_dentro_do_predio
+	SELECT * FROM banheiro_dentro_do_predio_18
 	UNION ALL
-	SELECT * FROM 19_banheiro_adequado_para_educacao_infantil_dentro_do_predio
+	SELECT * FROM banheiro_adequado_para_educacao_infantil_dentro_do_predio_19
 	UNION ALL
-	SELECT * FROM 20_fornecimento_de_energia
+	SELECT * FROM fornecimento_de_energia_20
 	UNION ALL
-	SELECT * FROM 21_abastecimento_de_agua
+	SELECT * FROM abastecimento_de_agua_21
 	UNION ALL
-	SELECT * FROM 22_agua_filtrada
+	SELECT * FROM agua_filtrada_22
 	UNION ALL
-	SELECT * FROM 23_coleta_de_esgoto
+	SELECT * FROM coleta_de_esgoto_23
 	UNION ALL
-	SELECT * FROM 24_dependencias_adaptadas_para_pessoas_com_deficiencias
+	SELECT * FROM dependencias_adaptadas_para_pessoas_com_deficiencias_24
 	UNION ALL
-	SELECT * FROM 25_banheiros_adaptados_para_pessoas_com_deficiencias
+	SELECT * FROM banheiros_adaptados_para_pessoas_com_deficiencias_25
 );