pegparser: Separate out typename and file name