bug: Towards fix diagram creation with different-than-model name