Fix naming path issue by renaming path for forced includes