diff --git a/resources/functionMap.php b/resources/functionMap.php
index f55becba80..486ac29d3d 100644
--- a/resources/functionMap.php
+++ b/resources/functionMap.php
@@ -249,7 +249,7 @@
 'apd_set_session_trace' => ['void', 'debug_level'=>'int', 'dump_directory='=>'string'],
 'apd_set_session_trace_socket' => ['bool', 'tcp_server'=>'string', 'socket_type'=>'int', 'port'=>'int', 'debug_level'=>'int'],
 'AppendIterator::__construct' => ['void'],
-'AppendIterator::append' => ['void', 'iterator'=>'iterator'],
+'AppendIterator::append' => ['void', 'iterator'=>'Iterator'],
 'AppendIterator::current' => ['mixed'],
 'AppendIterator::getArrayIterator' => ['ArrayIterator'],
 'AppendIterator::getInnerIterator' => ['iterator'],
@@ -491,7 +491,7 @@
 'bzopen' => ['resource|false', 'file'=>'string|resource', 'mode'=>'string'],
 'bzread' => ['string|false', 'bz'=>'resource', 'length='=>'int'],
 'bzwrite' => ['int|false', 'bz'=>'resource', 'data'=>'string', 'length='=>'int'],
-'CachingIterator::__construct' => ['void', 'iterator'=>'iterator', 'flags='=>''],
+'CachingIterator::__construct' => ['void', 'iterator'=>'Iterator', 'flags='=>''],
 'CachingIterator::__toString' => ['string'],
 'CachingIterator::count' => ['0|positive-int'],
 'CachingIterator::current' => ['mixed'],
@@ -924,7 +924,7 @@
 'call_user_func_array' => ['mixed', 'function'=>'callable', 'parameters'=>'array<int,mixed>'],
 'call_user_method' => ['mixed', 'method_name'=>'string', 'obj'=>'object', 'parameter='=>'mixed', '...args='=>'mixed'],
 'call_user_method_array' => ['mixed', 'method_name'=>'string', 'obj'=>'object', 'params'=>'array<int,mixed>'],
-'CallbackFilterIterator::__construct' => ['void', 'iterator'=>'iterator', 'func'=>'callable'],
+'CallbackFilterIterator::__construct' => ['void', 'iterator'=>'Iterator', 'func'=>'callable'],
 'CallbackFilterIterator::accept' => ['bool'],
 'CallbackFilterIterator::current' => ['mixed'],
 'CallbackFilterIterator::getInnerIterator' => ['iterator'],
@@ -2970,7 +2970,7 @@
 'filter_list' => ['array'],
 'filter_var' => ['mixed', 'variable'=>'mixed', 'filter='=>'int', 'options='=>'mixed'],
 'filter_var_array' => ['array|false|null', 'data'=>'array', 'definition='=>'mixed', 'add_empty='=>'bool'],
-'FilterIterator::__construct' => ['void', 'iterator'=>'iterator'],
+'FilterIterator::__construct' => ['void', 'iterator'=>'Iterator'],
 'FilterIterator::accept' => ['bool'],
 'FilterIterator::current' => ['mixed'],
 'FilterIterator::getInnerIterator' => ['Iterator'],
@@ -5280,7 +5280,7 @@
 'inclued_get_data' => ['array'],
 'inet_ntop' => ['string|false', 'in_addr'=>'string'],
 'inet_pton' => ['string|false', 'ip_address'=>'string'],
-'InfiniteIterator::__construct' => ['void', 'iterator'=>'iterator'],
+'InfiniteIterator::__construct' => ['void', 'iterator'=>'Iterator'],
 'InfiniteIterator::next' => ['void'],
 'inflate_add' => ['string|false', 'context'=>'resource', 'encoded_data'=>'string', 'flush_mode='=>'int'],
 'inflate_get_read_len' => ['int|false', 'resource'=>'resource'],
@@ -7102,11 +7102,11 @@
 'mt_rand\'1' => ['int'],
 'mt_srand' => ['void', 'seed='=>'int', 'mode='=>'int'],
 'MultipleIterator::__construct' => ['void', 'flags='=>'int'],
-'MultipleIterator::attachIterator' => ['void', 'iterator'=>'iterator', 'infos='=>'string'],
-'MultipleIterator::containsIterator' => ['bool', 'iterator'=>'iterator'],
+'MultipleIterator::attachIterator' => ['void', 'iterator'=>'Iterator', 'infos='=>'string'],
+'MultipleIterator::containsIterator' => ['bool', 'iterator'=>'Iterator'],
 'MultipleIterator::countIterators' => ['int'],
 'MultipleIterator::current' => ['array'],
-'MultipleIterator::detachIterator' => ['void', 'iterator'=>'iterator'],
+'MultipleIterator::detachIterator' => ['void', 'iterator'=>'Iterator'],
 'MultipleIterator::getFlags' => ['int'],
 'MultipleIterator::key' => ['array'],
 'MultipleIterator::next' => ['void'],
@@ -7749,7 +7749,7 @@
 'ngettext' => ['string', 'msgid1'=>'string', 'msgid2'=>'string', 'n'=>'int'],
 'nl2br' => ['string', 'str'=>'string', 'is_xhtml='=>'bool'],
 'nl_langinfo' => ['string|false', 'item'=>'int'],
-'NoRewindIterator::__construct' => ['void', 'iterator'=>'iterator'],
+'NoRewindIterator::__construct' => ['void', 'iterator'=>'Iterator'],
 'NoRewindIterator::current' => ['mixed'],
 'NoRewindIterator::getInnerIterator' => ['iterator'],
 'NoRewindIterator::key' => ['mixed'],
@@ -8607,7 +8607,7 @@
 'Phar::addFromString' => ['', 'localname'=>'string', 'contents'=>'string'],
 'Phar::apiVersion' => ['string'],
 'Phar::buildFromDirectory' => ['array', 'base_dir'=>'string', 'regex='=>'string'],
-'Phar::buildFromIterator' => ['array', 'iter'=>'iterator', 'base_directory='=>'string'],
+'Phar::buildFromIterator' => ['array', 'iter'=>'Iterator', 'base_directory='=>'string'],
 'Phar::canCompress' => ['bool', 'method='=>'int'],
 'Phar::canWrite' => ['bool'],
 'Phar::compress' => ['Phar', 'compression'=>'int', 'extension='=>'string'],
@@ -8664,7 +8664,7 @@
 'PharData::addFile' => ['', 'file'=>'string', 'localname='=>'string'],
 'PharData::addFromString' => ['bool', 'localname'=>'string', 'contents'=>'string'],
 'PharData::buildFromDirectory' => ['array', 'base_dir'=>'string', 'regex='=>'string'],
-'PharData::buildFromIterator' => ['array', 'iter'=>'iterator', 'base_directory='=>'string'],
+'PharData::buildFromIterator' => ['array', 'iter'=>'Iterator', 'base_directory='=>'string'],
 'PharData::compress' => ['PharData', 'compression'=>'int', 'extension='=>'string'],
 'PharData::compressFiles' => ['bool', 'compression'=>'int'],
 'PharData::convertToData' => ['PharData', 'format='=>'int', 'compression='=>'int', 'extension='=>'string'],
@@ -9855,7 +9855,7 @@
 'ReflectionZendExtension::getVersion' => ['string'],
 'Reflector::__toString' => ['string'],
 'Reflector::export' => ['?string'],
-'RegexIterator::__construct' => ['void', 'iterator'=>'iterator', 'regex'=>'string', 'mode='=>'int', 'flags='=>'int', 'preg_flags='=>'int'],
+'RegexIterator::__construct' => ['void', 'iterator'=>'Iterator', 'regex'=>'string', 'mode='=>'int', 'flags='=>'int', 'preg_flags='=>'int'],
 'RegexIterator::accept' => ['bool'],
 'RegexIterator::getFlags' => ['int'],
 'RegexIterator::getMode' => ['int'],