annotate protocol + use new aliases