File name and linebreak fixes

cc @gbinal