diff --git a/resources/functionMap.php b/resources/functionMap.php
index 6952138ea7..2e6e971876 100644
--- a/resources/functionMap.php
+++ b/resources/functionMap.php
@@ -927,7 +927,7 @@
 'CallbackFilterIterator::__construct' => ['void', 'iterator'=>'Iterator', 'func'=>'callable'],
 'CallbackFilterIterator::accept' => ['bool'],
 'CallbackFilterIterator::current' => ['mixed'],
-'CallbackFilterIterator::getInnerIterator' => ['iterator'],
+'CallbackFilterIterator::getInnerIterator' => ['Iterator'],
 'CallbackFilterIterator::key' => ['mixed'],
 'CallbackFilterIterator::next' => ['void'],
 'CallbackFilterIterator::rewind' => ['void'],
@@ -7751,7 +7751,7 @@
 'nl_langinfo' => ['string|false', 'item'=>'int'],
 'NoRewindIterator::__construct' => ['void', 'iterator'=>'Iterator'],
 'NoRewindIterator::current' => ['mixed'],
-'NoRewindIterator::getInnerIterator' => ['iterator'],
+'NoRewindIterator::getInnerIterator' => ['Iterator'],
 'NoRewindIterator::key' => ['mixed'],
 'NoRewindIterator::next' => ['void'],
 'NoRewindIterator::rewind' => ['void'],
@@ -8163,7 +8163,7 @@
 'overload' => ['', 'class_name'=>'string'],
 'override_function' => ['bool', 'function_name'=>'string', 'function_args'=>'string', 'function_code'=>'string'],
 'pack' => ['string', 'format'=>'string', '...args='=>'mixed'],
-'ParentIterator::__construct' => ['void', 'iterator'=>'recursiveiterator'],
+'ParentIterator::__construct' => ['void', 'iterator'=>'RecursiveIterator'],
 'ParentIterator::accept' => ['bool'],
 'ParentIterator::getChildren' => ['ParentIterator'],
 'ParentIterator::hasChildren' => ['bool'],
@@ -9176,7 +9176,7 @@
 'RecursiveCachingIterator::__construct' => ['void', 'iterator'=>'Iterator', 'flags'=>''],
 'RecursiveCachingIterator::getChildren' => ['RecursiveCachingIterator'],
 'RecursiveCachingIterator::hasChildren' => ['bool'],
-'RecursiveCallbackFilterIterator::__construct' => ['void', 'iterator'=>'recursiveiterator', 'func'=>'callable'],
+'RecursiveCallbackFilterIterator::__construct' => ['void', 'iterator'=>'RecursiveIterator', 'func'=>'callable'],
 'RecursiveCallbackFilterIterator::getChildren' => ['RecursiveCallbackFilterIterator'],
 'RecursiveCallbackFilterIterator::hasChildren' => ['void'],
 'RecursiveDirectoryIterator::__construct' => ['void', 'path'=>'string', 'flags='=>'int'],
@@ -9187,7 +9187,7 @@
 'RecursiveDirectoryIterator::key' => ['string'],
 'RecursiveDirectoryIterator::next' => ['void'],
 'RecursiveDirectoryIterator::rewind' => ['void'],
-'RecursiveFilterIterator::__construct' => ['void', 'iterator'=>'recursiveiterator'],
+'RecursiveFilterIterator::__construct' => ['void', 'iterator'=>'RecursiveIterator'],
 'RecursiveFilterIterator::getChildren' => ['RecursiveFilterIterator'],
 'RecursiveFilterIterator::hasChildren' => ['bool'],
 'RecursiveIterator::getChildren' => ['RecursiveIterator'],
@@ -9210,10 +9210,10 @@
 'RecursiveIteratorIterator::rewind' => ['void'],
 'RecursiveIteratorIterator::setMaxDepth' => ['void', 'max_depth='=>'int'],
 'RecursiveIteratorIterator::valid' => ['bool'],
-'RecursiveRegexIterator::__construct' => ['void', 'iterator'=>'recursiveiterator', 'regex='=>'string', 'mode='=>'int', 'flags='=>'int', 'preg_flags='=>'int'],
+'RecursiveRegexIterator::__construct' => ['void', 'iterator'=>'RecursiveIterator', 'regex='=>'string', 'mode='=>'int', 'flags='=>'int', 'preg_flags='=>'int'],
 'RecursiveRegexIterator::getChildren' => ['RecursiveRegexIterator'],
 'RecursiveRegexIterator::hasChildren' => ['bool'],
-'RecursiveTreeIterator::__construct' => ['void', 'iterator'=>'recursiveiterator|iteratoraggregate', 'flags='=>'int', 'cit_flags='=>'int', 'mode='=>'int'],
+'RecursiveTreeIterator::__construct' => ['void', 'iterator'=>'RecursiveIterator|IteratorAggregate', 'flags='=>'int', 'cit_flags='=>'int', 'mode='=>'int'],
 'RecursiveTreeIterator::beginChildren' => ['void'],
 'RecursiveTreeIterator::beginIteration' => ['RecursiveIterator'],
 'RecursiveTreeIterator::callGetChildren' => ['RecursiveIterator'],
@@ -9667,7 +9667,7 @@
 'ReflectionClass::hasConstant' => ['bool', 'name'=>'string'],
 'ReflectionClass::hasMethod' => ['bool', 'name'=>'string'],
 'ReflectionClass::hasProperty' => ['bool', 'name'=>'string'],
-'ReflectionClass::implementsInterface' => ['bool', 'interface_name'=>'string|reflectionclass'],
+'ReflectionClass::implementsInterface' => ['bool', 'interface_name'=>'string|ReflectionClass'],
 'ReflectionClass::inNamespace' => ['bool'],
 'ReflectionClass::isAbstract' => ['bool'],
 'ReflectionClass::isAnonymous' => ['bool'],
@@ -9679,7 +9679,7 @@
 'ReflectionClass::isInternal' => ['bool'],
 'ReflectionClass::isIterable' => ['bool'],
 'ReflectionClass::isIterateable' => ['bool'],
-'ReflectionClass::isSubclassOf' => ['bool', 'class'=>'string|reflectionclass'],
+'ReflectionClass::isSubclassOf' => ['bool', 'class'=>'string|ReflectionClass'],
 'ReflectionClass::isTrait' => ['bool'],
 'ReflectionClass::isUserDefined' => ['bool'],
 'ReflectionClass::newInstance' => ['object', 'args='=>'mixed', '...args='=>'mixed'],
@@ -11345,7 +11345,7 @@
 'spliti' => ['array', 'pattern'=>'string', 'string'=>'string', 'limit='=>'int'],
 'SplMaxHeap::compare' => ['int', 'a'=>'mixed', 'b'=>'mixed'],
 'SplMinHeap::compare' => ['int', 'a'=>'mixed', 'b'=>'mixed'],
-'SplObjectStorage::addAll' => ['void', 'os'=>'splobjectstorage'],
+'SplObjectStorage::addAll' => ['void', 'os'=>'SplObjectStorage'],
 'SplObjectStorage::attach' => ['void', 'obj'=>'object', 'inf='=>'mixed'],
 'SplObjectStorage::contains' => ['bool', 'obj'=>'object'],
 'SplObjectStorage::count' => ['0|positive-int'],
@@ -11359,14 +11359,14 @@
 'SplObjectStorage::offsetGet' => ['mixed', 'obj'=>'object'],
 'SplObjectStorage::offsetSet' => ['object', 'object'=>'object', 'data='=>'mixed'],
 'SplObjectStorage::offsetUnset' => ['object', 'object'=>'object'],
-'SplObjectStorage::removeAll' => ['void', 'os'=>'splobjectstorage'],
-'SplObjectStorage::removeAllExcept' => ['void', 'os'=>'splobjectstorage'],
+'SplObjectStorage::removeAll' => ['void', 'os'=>'SplObjectStorage'],
+'SplObjectStorage::removeAllExcept' => ['void', 'os'=>'SplObjectStorage'],
 'SplObjectStorage::rewind' => ['void'],
 'SplObjectStorage::serialize' => ['string'],
 'SplObjectStorage::setInfo' => ['void', 'inf'=>'mixed'],
 'SplObjectStorage::unserialize' => ['void', 'serialized'=>'string'],
 'SplObjectStorage::valid' => ['bool'],
-'SplObserver::update' => ['void', 'subject'=>'splsubject'],
+'SplObserver::update' => ['void', 'subject'=>'SplSubject'],
 'SplPriorityQueue::compare' => ['int', 'a'=>'mixed', 'b'=>'mixed'],
 'SplPriorityQueue::count' => ['0|positive-int'],
 'SplPriorityQueue::current' => ['mixed'],
@@ -11385,8 +11385,8 @@
 'SplQueue::enqueue' => ['void', 'value'=>'mixed'],
 'SplQueue::setIteratorMode' => ['void', 'mode'=>'int'],
 'SplStack::setIteratorMode' => ['void', 'mode'=>'int'],
-'SplSubject::attach' => ['void', 'observer'=>'splobserver'],
-'SplSubject::detach' => ['void', 'observer'=>'splobserver'],
+'SplSubject::attach' => ['void', 'observer'=>'SplObserver'],
+'SplSubject::detach' => ['void', 'observer'=>'SplObserver'],
 'SplSubject::notify' => ['void'],
 'SplTempFileObject::__construct' => ['void', 'max_memory='=>'int'],
 'SplType::__construct' => ['void', 'initial_value='=>'mixed', 'strict='=>'bool'],