Fix up namespace naming/project naming issues