[TASK] Shorten namespaces in ContentObjects