Two bad file names
Some interfaces has been fixed