more fixes for new name.