Rename files
Change API, it didn't make sense before