protocol naming fix