Rename files for consistency
Rename object to match filename