Update demos and docs to reflect VA/FV change