Remove explicit cycle names

Change-Id: If938e327ec08a7507133f7767fec74ebee3bfc33