Reformat API_DRAFT, rename command to listener