Regarding your question about the hacienda - I recently learned while I was 
in Mexico digging up materials about the village from where my husband was 
born, that many haciendas/villages were given the opportunity to change their name 
after the Mexican revolution - and many did.  The rationale was that the 
"people" were empowered with their land, and so there was an effort to erase the 
autocracy which had existed under colonial rule and before the revolution. Some 
haciendas eventually became small villages, and retained a portion of their 
original name - 

On the other hand, as what happened to me in Monterrey, the hacienda's name 
actually became a "colonia" of the expanding city of Monterrey - I don't know 
how big Pinos, Zacatecas is......perhaps that can be explored....

I hope this helps....

 I believe there is a site that may have a list of some of those 
village/hacienda name changes, perhaps someone else on the board can recall....