SC-24 Change model name uniquness method signature