Fixed namespace declarations