fix layer name references to use new names