Rename cap classes better; associate with tasks.