Fix includes after file renaming
Changed varchar in db