Improve <Plug> names