Fixed renaming from cuckoo maintream