Fixed namespace qualifiers