Fixed layer name generation.