Fixed more namespace fuck-ups