fixes after rename