Bug fixes after naming changes.