naming improvements ctnd