Renamed squares in rectangles

- I'm not detecting squares, but rectangles... so, refactoring!