updated naming tasks <-> activities