Update functions with better nomenclature, CTP folder changed to includes