Some renaming, integrated Interface.py