Change class name, work on constraints interfaces interactions