giza: fixing naming