renaming
a bit more testing
adding elements to interfaces