Changed make_key to make_name.
Added __iter__ support for variables.
Added iteritems support for variables.