Update import and include file names, due to file formatting update