more fixing after rename