NEW: Add suffix to layer name