Fix namespaces to match the convention used by the filesystem TS