CON-24 | Fixed enabling/disabling after change name