s: inv and fun namespaces changed