rename: want -> Project, specific -> Task

plus some code cleanup