fixes after name changes