Fix namespaces and filename references