consistent use of - and _ in file names