Updated obsolete references
Completed list of builtincontenttypes
Merge pull request #173 from erwinvanhunen/CoreFixes

Renamed obsolete references