some renames and func sig updates.