Audit function argument/class attribute names for consistency

[dwachsmuth]

E.g. do we refer to the file paths as "x_file", "x_name", "x_path", "x_files", etc?