#261 Consistent use of _ in file names