Tweak the task plugin system and rename some classes