diff --git a/vendor/action/companies/companies_save.php b/vendor/action/companies/companies_save.php
index 84d663f..fd28415 100644
--- a/vendor/action/companies/companies_save.php
+++ b/vendor/action/companies/companies_save.php
@@ -17,16 +17,18 @@ try{
         $type                = isset($_POST['type'])                 ? (string)filter_input(INPUT_POST, 'type', FILTER_SANITIZE_SPECIAL_CHARS)                 : '';
         $student             = isset($_POST['student'])              ? (string)filter_input(INPUT_POST, 'student', FILTER_SANITIZE_SPECIAL_CHARS)              : '';
         $companyId           = isset($_POST['company_id'])           ? (int)filter_input(INPUT_POST, 'company_id', FILTER_SANITIZE_NUMBER_INT)                 : 0;
+        $cityId              = isset($_POST['city_id'])              ? (int)filter_input(INPUT_POST, 'city_id', FILTER_SANITIZE_NUMBER_INT)                    : 0;
+        $stateId             = isset($_POST['state_id'])             ? (int)filter_input(INPUT_POST, 'state_id', FILTER_SANITIZE_SPECIAL_CHARS)                : 0;
         $clientName          = isset($_POST['client_name'])          ? (string)filter_input(INPUT_POST, 'client_name', FILTER_SANITIZE_SPECIAL_CHARS)          : '';
         $fantasyName         = isset($_POST['fantasy_name'])         ? (string)filter_input(INPUT_POST, 'fantasy_name', FILTER_SANITIZE_SPECIAL_CHARS)         : '';
-        $document            = isset($_POST['document'])             ? (string)filter_input(INPUT_POST, 'document', FILTER_SANITIZE_SPECIAL_CHARS)             : '';
-        $zipCode             = isset($_POST['zip_code'])             ? (string)filter_input(INPUT_POST, 'zip_code', FILTER_SANITIZE_SPECIAL_CHARS)             : '';
+        $cnpj                = isset($_POST['cnpj'])                 ? (string)filter_input(INPUT_POST, 'cnpj', FILTER_SANITIZE_SPECIAL_CHARS)                 : '';
+        $cep                 = isset($_POST['cep'])                  ? (string)filter_input(INPUT_POST, 'cep', FILTER_SANITIZE_SPECIAL_CHARS)                  : '';
         $adress              = isset($_POST['adress'])               ? (string)filter_input(INPUT_POST, 'adress', FILTER_SANITIZE_SPECIAL_CHARS)               : '';
         $number              = isset($_POST['number'])               ? (string)filter_input(INPUT_POST, 'number', FILTER_SANITIZE_SPECIAL_CHARS)               : '';
         $complement          = isset($_POST['complement'])           ? (string)filter_input(INPUT_POST, 'complement', FILTER_SANITIZE_SPECIAL_CHARS)           : '';
         $district            = isset($_POST['district'])             ? (string)filter_input(INPUT_POST, 'district', FILTER_SANITIZE_SPECIAL_CHARS)             : '';
-        $city                = isset($_POST['city'])                 ? (string)filter_input(INPUT_POST, 'city', FILTER_SANITIZE_SPECIAL_CHARS)                 : '';
-        $stateInitials       = isset($_POST['state_initials'])       ? (string)filter_input(INPUT_POST, 'state_initials', FILTER_SANITIZE_SPECIAL_CHARS)       : '';
+       
+        
         $active              = isset($_POST['active'])               ? (string)filter_input(INPUT_POST, 'active', FILTER_SANITIZE_SPECIAL_CHARS)               : '';
         $reference           = isset($_POST['reference'])            ? (string)filter_input(INPUT_POST, 'reference', FILTER_SANITIZE_SPECIAL_CHARS)            : '';
         $responsible         = isset($_POST['responsible'])          ? (string)filter_input(INPUT_POST, 'responsible', FILTER_SANITIZE_SPECIAL_CHARS)          : '';
@@ -42,14 +44,14 @@ try{
         $CompaniesValidate->setCompanyId($companyId);
         $CompaniesValidate->setClientName($clientName);
         $CompaniesValidate->setFantasyName($fantasyName);
-        $CompaniesValidate->setDocument($document);
-        $CompaniesValidate->setZipCode($zipCode);
+        $CompaniesValidate->setCnpj($cnpj);
+        $CompaniesValidate->setCep($cep);
         $CompaniesValidate->setAdress($adress);
         $CompaniesValidate->setNumber($number);
         $CompaniesValidate->setComplement($complement);
         $CompaniesValidate->setDistrict($district);
-        $CompaniesValidate->setCity($city);
-        $CompaniesValidate->setStateInitials($stateInitials);
+        $CompaniesValidate->setCityId($cityId);
+        $CompaniesValidate->setStateId($stateId);
         $CompaniesValidate->setActive($active);
         $CompaniesValidate->setReference($reference);
         $CompaniesValidate->setResponsible($responsible);
@@ -76,14 +78,14 @@ try{
             if($Companies->Save($CompaniesValidate->getCompanyId(), 
                               $CompaniesValidate->getClientName(), 
                               $CompaniesValidate->getFantasyName(), 
-                              $CompaniesValidate->getDocument(), 
-                              $CompaniesValidate->getZipCode(), 
+                              $CompaniesValidate->getCnpj(), 
+                              $CompaniesValidate->getCep(), 
                               $CompaniesValidate->getAdress(), 
                               $CompaniesValidate->getNumber(), 
                               $CompaniesValidate->getComplement(), 
                               $CompaniesValidate->getDistrict(), 
-                              $CompaniesValidate->getCity(), 
-                              $CompaniesValidate->getStateInitials(), 
+                              $CompaniesValidate->getCityId(), 
+                              $CompaniesValidate->getStateId(), 
                               $CompaniesValidate->getActive(), 
                               $CompaniesValidate->getType(), 
                               $CompaniesValidate->getStudent(), 
diff --git a/vendor/controller/companies/CompaniesValidate.class.php b/vendor/controller/companies/CompaniesValidate.class.php
index 022204e..37c3cf3 100644
--- a/vendor/controller/companies/CompaniesValidate.class.php
+++ b/vendor/controller/companies/CompaniesValidate.class.php
@@ -132,23 +132,23 @@ class CompaniesValidate
 	}
 
 	/** Método trata campo document */
-	public function setDocument(string $document) : void
+	public function setCnpj(string $cnpj) : void
 	{
 
 		/** Trata a entrada da informação  */
-		$this->document = isset($document) ? $this->Main->antiInjection($document) : null;
+		$this->cnpj = isset($cnpj) ? $this->Main->antiInjection($cnpj) : null;
 
 		/** Verifica se a informação foi informada */
-		if(empty($this->document))
+		if(empty($this->cnpj))
 		{
 
 			/** Adição de elemento */
-			array_push($this->errors, 'O campo "CPF/CNPJ" deve ser informado');
+			array_push($this->errors, 'O campo "CNPJ" deve ser informado');
 
 		} elseif(!$this->Main->cpfj($this->document)) {/** Verifica se o CPF/CNPJ informado são válidos */
 
 			/** Adição de elemento */
-			array_push($this->errors, 'O "CPF/CNPJ" informado é inválido');
+			array_push($this->errors, 'O "CNPJ" informado é inválido');
 
 		}
 
@@ -178,14 +178,14 @@ class CompaniesValidate
 	}	
 
 	/** Método trata campo zip_code */
-	public function setZipCode(string $zipCode) : void
+	public function setCep(string $cep) : void
 	{
 
 		/** Trata a entrada da informação  */
-		$this->zipCode = isset($zipCode) ? $this->Main->antiInjection($zipCode) : null;
+		$this->cep = isset($cep) ? $this->Main->antiInjection($cep) : null;
 
 		/** Verifica se a informação foi informada */
-		if(empty($this->zipCode))
+		if(empty($this->cep))
 		{
 
 			/** Adição de elemento */
@@ -322,14 +322,14 @@ class CompaniesValidate
 	}
 
 	/** Método trata campo state_initials */
-	public function setStateInitials(string $stateInitials) : void
+	public function setStateId(string $stateId) : void
 	{
 
 		/** Trata a entrada da informação  */
-		$this->stateInitials = isset($stateInitials) ? $this->Main->antiInjection($stateInitials) : null;
+		$this->stateId = isset($stateId) ? $this->Main->antiInjection($stateId) : null;
 
 		/** Verifica se a informação foi informada */
-		if(empty($this->stateInitials))
+		if(empty($this->stateId))
 		{
 
 			/** Adição de elemento */
@@ -568,11 +568,11 @@ class CompaniesValidate
 	}
 
 	/** Método retorna campo document */
-	public function getDocument() : ? string
+	public function getCnpj() : ? string
 	{
 
 		/** Retorno da informação */
-		return $this->document;
+		return $this->cnpj;
 
 	}
 
@@ -595,11 +595,11 @@ class CompaniesValidate
 	}	
 
 	/** Método retorna campo zip_code */
-	public function getZipCode() : ? string
+	public function getCep() : ? string
 	{
 
 		/** Retorno da informação */
-		return $this->zipCode;
+		return $this->cep;
 
 	}
 
diff --git a/vendor/view/companies/companies_form.php b/vendor/view/companies/companies_form.php
index 7deffe5..db30f20 100644
--- a/vendor/view/companies/companies_form.php
+++ b/vendor/view/companies/companies_form.php
@@ -176,10 +176,10 @@ try{
                             
                             <div class="col-sm-3 mb-2">
 
-                                <label for="city">Cidade:</label>
+                                <label for="city_id">Cidade:</label>
                                 
                                 
-                                <select class="form-control form-control" id="state_id " name="state_id">
+                                <select class="form-control form-control" id="city_id " name="city_id">
 
                                 <?php
                                     /** Lista os estados */