Make the code compile again by renaming accordingly, adding prototypes to headers...