Refactoring of naming and interface-usage