Update: names_etc
Aicha moved to names_etc
Updated: names_etc
Merge pull request #167 from ivandrofly/patch-18

Names update