Adjujst names, remove not needed interface stuff