Update and rename Z-Dictionary to ZDictionary