Fixed the namespace of ContentTypes
Merge origin/master