Clarify future plans and terminology