Complete refactor to rename capability-collector