Merge "Unify the rect names according to the coordinates" into jb-dev