Fixed minor renaming bugs

Due to refactoring there resulted a wrong naming for some interfaces.