Add Rect and Some Renaming