Updates to naming on VFBs