mostly renaming and some refactoring, i.e. move constraint issues to
constraintManager