Fix variables names for ports