Cleaned up file naming