Fixed namespace resolution