refactor of Rect names