Fix types and name conflicts
Oldfiles