Updated routines and file names to use "V3" convention