added AZh and renamed ana-types to make it more clear
Merge pull request #559 from ffrensch/master

added AZh and renamed ana-types to make it more clear