Fix leftovers after rename