That's what an agent is though isn't it? It's an entity that has some goal(s) and some measure of autonomy to achieve them.

A thermostat can be said to have a goal. Is it a person? Is it even an agent? No, but we can ascribe a goal anyway. Seems a neutral enough word.

That, and your 1) and 2) seem like a form of goal to me, actually?

Yes, we can temporarily redefine goals and motivations for the sole purpose of this conversation, such that a thermostat has goals and motivations. But when we return to the real world, will this be helpful to us? Is that actually what we want from those words?

If we redefine goals and motivations this broadly, then AI is nothing new, because we've had technology with goals and motivations for hundreds if not thousands of years. And the world of the computer age is one big animist pantheon.