Fix include parth and rename fail