Changed geometry structre names (Rect, Size)