rename NilNote to RestOrBar