Fixed namespace consistency