update naming on files according to code