Fixed id syntax and file names