fixes to grinder_files and grinder_utils
rename