Fix CottonCastle name. Update logic a bit.