Renamed couple of variables in InterfaceComponent based on testing