Fix bugs after rename