Fixed namespace convention