#348 Consistent file names