Better terminologicals for no-IP case