fixed errors after rename