Rest of style nits
File name updates