fix broken decorations, add explanation about naming rule