CDB-788 #fixes Renames our custom layers