fix warnings fix (actually use changed names)