[BUGFIX] Suffix all interfaces with Interface