Minor changes in filename conventions