Filename fixes to go with rename