more renaming, to align my current working file with its proper scope