Refactor namespaces to have distinct channel & item fields