Some minor name and interface changes