Need Editor Help: How do I buff villagers properly?

Because the villagers lose the buffs as soon as they are made to perform a task, such as collecting resources or building something.

I think it has to do with the fact that the game renames the unit to LumberJack, Forager or Builder etc.

Any help is appreciated, thanks.