Update core file names, an some other small code fixes