more fixes after rename