[FOLLOWUP][TASK] Shorten namespaces in ContentObjects