all: standardise on file hash var names