Changed file names
Make legacy header reference old code.