Look, let me explain something to you. I'm not Mr. Lebowski. You're Mr. Lebowski. I'm the Dude.

 - Additional fixes to d8068b0ef2d8bb5cbba605d8a0f806ce93e8fb15 to integrate UI and slot name changes