fixed wrong namespace declarations