Changed the interface names and killed an unnecessary object