Rename CAYL to Amber (part 2)