diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 368cd1bcba5..0088f576f02 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -8816,7 +8816,7 @@
 	<constants>
 	</constants>
 </class>
-<class name="ColorFrame" inherits="Control" category="Core">
+<class name="ColorRect" inherits="Control" category="Core">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -26354,7 +26354,7 @@
 		</constant>
 	</constants>
 </class>
-<class name="Patch9Frame" inherits="Control" category="Core">
+<class name="Patch9Rect" inherits="Control" category="Core">
 	<brief_description>
 	</brief_description>
 	<description>
@@ -32557,7 +32557,7 @@
 	<constants>
 	</constants>
 </class>
-<class name="ReferenceFrame" inherits="Control" category="Core">
+<class name="ReferenceRect" inherits="Control" category="Core">
 	<brief_description>
 		Reference frame for GUI.
 	</brief_description>
diff --git a/main/tests/test_gui.cpp b/main/tests/test_gui.cpp
index ab3df3b022e..da0ff5d1ca6 100644
--- a/main/tests/test_gui.cpp
+++ b/main/tests/test_gui.cpp
@@ -46,7 +46,7 @@
 #include "scene/gui/tab_container.h"
 #include "scene/gui/tree.h"
 #include "scene/gui/rich_text_label.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
 #include "io/image_loader.h"
 #include "print_string.h"
 #include "scene/2d/sprite.h"
diff --git a/scene/gui/color_picker.h b/scene/gui/color_picker.h
index bb8a4a8dbd3..b6f9e9a0700 100644
--- a/scene/gui/color_picker.h
+++ b/scene/gui/color_picker.h
@@ -36,7 +36,7 @@
 #include "scene/gui/button.h"
 #include "scene/gui/popup.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/check_button.h"
 
diff --git a/scene/gui/color_rect.cpp b/scene/gui/color_rect.cpp
index ce12a274609..99797aa9c1a 100644
--- a/scene/gui/color_rect.cpp
+++ b/scene/gui/color_rect.cpp
@@ -1,8 +1,34 @@
+/*************************************************************************/
+/*  color_rect.cpp                                                       */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
 #include "color_rect.h"
 
 
-
-
 void ColorRect::set_frame_color(const Color& p_color) {
 
 	color=p_color;
@@ -33,4 +59,3 @@ ColorRect::ColorRect() {
 
 	color=Color(1,1,1);
 }
-
diff --git a/scene/gui/color_rect.h b/scene/gui/color_rect.h
index 9d8b958130e..55e413ce27a 100644
--- a/scene/gui/color_rect.h
+++ b/scene/gui/color_rect.h
@@ -1,5 +1,33 @@
-#ifndef COLORRECT_H
-#define COLORRECT_H
+/*************************************************************************/
+/*  color_rect.h                                                         */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#ifndef COLOR_RECT_H
+#define COLOR_RECT_H
 
 #include "scene/gui/control.h"
 
@@ -19,4 +47,4 @@ public:
 	ColorRect();
 };
 
-#endif // COLORRECT_H
+#endif // COLOR_RECT_H
diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h
index 86b976c4fe1..3e9944332f6 100644
--- a/scene/gui/graph_edit.h
+++ b/scene/gui/graph_edit.h
@@ -34,7 +34,7 @@
 #include "scene/gui/slider.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/spin_box.h"
-#include "texture_frame.h"
+#include "scene/gui/texture_rect.h"
 
 class GraphEdit;
 
diff --git a/scene/gui/patch_9_frame.cpp b/scene/gui/patch_9_rect.cpp
similarity index 98%
rename from scene/gui/patch_9_frame.cpp
rename to scene/gui/patch_9_rect.cpp
index 1f6145d5dbc..698d4aaf29d 100644
--- a/scene/gui/patch_9_frame.cpp
+++ b/scene/gui/patch_9_rect.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  patch_9_frame.cpp                                                    */
+/*  patch_9_rect.cpp                                                     */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,7 +26,7 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "patch_9_frame.h"
+#include "patch_9_rect.h"
 
 #include "servers/visual_server.h"
 
diff --git a/scene/gui/patch_9_frame.h b/scene/gui/patch_9_rect.h
similarity index 97%
rename from scene/gui/patch_9_frame.h
rename to scene/gui/patch_9_rect.h
index d55f4e4f691..b87f2f64ec7 100644
--- a/scene/gui/patch_9_frame.h
+++ b/scene/gui/patch_9_rect.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  patch_9_frame.h                                                      */
+/*  patch_9_rect.h                                                       */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
diff --git a/scene/gui/reference_frame.cpp b/scene/gui/reference_rect.cpp
similarity index 92%
rename from scene/gui/reference_frame.cpp
rename to scene/gui/reference_rect.cpp
index 37bc3ae6fb0..ff4cdf04fd5 100644
--- a/scene/gui/reference_frame.cpp
+++ b/scene/gui/reference_rect.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  reference_frame.cpp                                                  */
+/*  reference_rect.cpp                                                   */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,9 +26,9 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "reference_frame.h"
+#include "reference_rect.h"
 
-void ReferenceFrame::_notification(int p_what) {
+void ReferenceRect::_notification(int p_what) {
 
 	if (p_what==NOTIFICATION_DRAW) {
 
@@ -39,6 +39,6 @@ void ReferenceFrame::_notification(int p_what) {
 	}
 }
 
-ReferenceFrame::ReferenceFrame()
+ReferenceRect::ReferenceRect()
 {
 }
diff --git a/scene/gui/reference_frame.h b/scene/gui/reference_rect.h
similarity index 90%
rename from scene/gui/reference_frame.h
rename to scene/gui/reference_rect.h
index 8b4a16cb433..be493f346cb 100644
--- a/scene/gui/reference_frame.h
+++ b/scene/gui/reference_rect.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  reference_frame.h                                                    */
+/*  reference_rect.h                                                     */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,20 +26,20 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef REFERENCE_FRAME_H
-#define REFERENCE_FRAME_H
+#ifndef REFERENCE_RECT_H
+#define REFERENCE_RECT_H
 
 #include "scene/gui/control.h"
 
-class ReferenceFrame : public Control {
+class ReferenceRect : public Control {
 
-	GDCLASS( ReferenceFrame, Control);
+	GDCLASS( ReferenceRect, Control);
 
 protected:
 
 	void _notification(int p_what);
 public:
-	ReferenceFrame();
+	ReferenceRect();
 };
 
-#endif // REFERENCE_FRAME_H
+#endif // REFERENCE_RECT_H
diff --git a/scene/gui/texture_frame.cpp b/scene/gui/texture_rect.cpp
similarity index 98%
rename from scene/gui/texture_frame.cpp
rename to scene/gui/texture_rect.cpp
index 6556e487f18..68755c0ac24 100644
--- a/scene/gui/texture_frame.cpp
+++ b/scene/gui/texture_rect.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  texture_frame.cpp                                                    */
+/*  texture_rect.cpp                                                     */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,7 +26,7 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "texture_frame.h"
+#include "texture_rect.h"
 #include "servers/visual_server.h"
 
 void TextureRect::_notification(int p_what) {
diff --git a/scene/gui/texture_frame.h b/scene/gui/texture_rect.h
similarity index 97%
rename from scene/gui/texture_frame.h
rename to scene/gui/texture_rect.h
index dea5b3b0ac1..e95d7427597 100644
--- a/scene/gui/texture_frame.h
+++ b/scene/gui/texture_rect.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  texture_frame.h                                                      */
+/*  texture_rect.h                                                       */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index ca3aef6262a..3e5af50b368 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -54,9 +54,9 @@
 #include "scene/gui/spin_box.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/color_picker.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/color_rect.h"
-#include "scene/gui/patch_9_frame.h"
+#include "scene/gui/patch_9_rect.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
@@ -81,7 +81,7 @@
 #include "scene/gui/grid_container.h"
 #include "scene/gui/split_container.h"
 #include "scene/gui/video_player.h"
-#include "scene/gui/reference_frame.h"
+#include "scene/gui/reference_rect.h"
 #include "scene/gui/graph_node.h"
 #include "scene/gui/graph_edit.h"
 #include "scene/gui/tool_button.h"
@@ -383,7 +383,7 @@ void register_scene_types() {
 	ClassDB::register_virtual_class<TreeItem>();
 	ClassDB::register_class<OptionButton>();
 	ClassDB::register_class<SpinBox>();
-	ClassDB::register_class<ReferenceFrame>();
+	ClassDB::register_class<ReferenceRect>();
 	ClassDB::register_class<ColorPicker>();
 	ClassDB::register_class<ColorPickerButton>();
 	ClassDB::register_class<RichTextLabel>();
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 3c6e65bf419..da8fbafde32 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -934,12 +934,12 @@ void fill_default_theme(Ref<Theme>& t, const Ref<Font> & default_font, const Ref
 	t->set_stylebox("focus","VButtonArray", focus );
 
 
-	// ReferenceFrame
+	// ReferenceRect
 
 	Ref<StyleBoxTexture> ttnc = make_stylebox( full_panel_bg_png,8,8,8,8);
 	ttnc->set_draw_center(false);
 
-	t->set_stylebox("border","ReferenceFrame", make_stylebox( reference_border_png,4,4,4,4) );
+	t->set_stylebox("border","ReferenceRect", make_stylebox( reference_border_png,4,4,4,4) );
 	t->set_stylebox("panelnc","Panel", ttnc );
 	t->set_stylebox("panelf","Panel", tc_sb );
 
diff --git a/tools/editor/animation_editor.h b/tools/editor/animation_editor.h
index 8ae706dfa8e..c4539cd7631 100644
--- a/tools/editor/animation_editor.h
+++ b/tools/editor/animation_editor.h
@@ -33,7 +33,7 @@
 #include "scene/gui/slider.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/spin_box.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/scroll_bar.h"
 #include "scene/gui/tool_button.h"
 #include "scene/gui/file_dialog.h"
diff --git a/tools/editor/editor_file_dialog.h b/tools/editor/editor_file_dialog.h
index 04ee0cc55fe..193cbc513cf 100644
--- a/tools/editor/editor_file_dialog.h
+++ b/tools/editor/editor_file_dialog.h
@@ -35,7 +35,7 @@
 #include "scene/gui/option_button.h"
 #include "os/dir_access.h"
 #include "scene/gui/box_container.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/tool_button.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
diff --git a/tools/editor/editor_log.h b/tools/editor/editor_log.h
index e59b877ea07..914b5d0c57b 100644
--- a/tools/editor/editor_log.h
+++ b/tools/editor/editor_log.h
@@ -36,7 +36,7 @@
 //#include "scene/gui/empty_control.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/tool_button.h"
 #include "pane_drag.h"
 #include "os/thread.h"
diff --git a/tools/editor/editor_profiler.h b/tools/editor/editor_profiler.h
index ec1cd9fb5bb..52b38cdae84 100644
--- a/tools/editor/editor_profiler.h
+++ b/tools/editor/editor_profiler.h
@@ -3,7 +3,7 @@
 
 
 #include "scene/gui/box_container.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/button.h"
 #include "scene/gui/label.h"
 #include "scene/gui/tree.h"
diff --git a/tools/editor/icons/2x/icon_patch_9_frame.png b/tools/editor/icons/2x/icon_patch_9_rect.png
similarity index 100%
rename from tools/editor/icons/2x/icon_patch_9_frame.png
rename to tools/editor/icons/2x/icon_patch_9_rect.png
diff --git a/tools/editor/icons/2x/icon_reference_frame.png b/tools/editor/icons/2x/icon_reference_rect.png
similarity index 100%
rename from tools/editor/icons/2x/icon_reference_frame.png
rename to tools/editor/icons/2x/icon_reference_rect.png
diff --git a/tools/editor/icons/2x/icon_texture_frame.png b/tools/editor/icons/2x/icon_texture_rect.png
similarity index 100%
rename from tools/editor/icons/2x/icon_texture_frame.png
rename to tools/editor/icons/2x/icon_texture_rect.png
diff --git a/tools/editor/icons/icon_patch_9_frame.png b/tools/editor/icons/icon_patch_9_rect.png
similarity index 100%
rename from tools/editor/icons/icon_patch_9_frame.png
rename to tools/editor/icons/icon_patch_9_rect.png
diff --git a/tools/editor/icons/icon_reference_frame.png b/tools/editor/icons/icon_reference_rect.png
similarity index 100%
rename from tools/editor/icons/icon_reference_frame.png
rename to tools/editor/icons/icon_reference_rect.png
diff --git a/tools/editor/icons/icon_texture_frame.png b/tools/editor/icons/icon_texture_rect.png
similarity index 100%
rename from tools/editor/icons/icon_texture_frame.png
rename to tools/editor/icons/icon_texture_rect.png
diff --git a/tools/editor/icons/source/icon_patch_9_frame.svg b/tools/editor/icons/source/icon_patch_9_rect.svg
similarity index 99%
rename from tools/editor/icons/source/icon_patch_9_frame.svg
rename to tools/editor/icons/source/icon_patch_9_rect.svg
index f12789c19e5..c5a09603a61 100644
--- a/tools/editor/icons/source/icon_patch_9_frame.svg
+++ b/tools/editor/icons/source/icon_patch_9_rect.svg
@@ -18,7 +18,7 @@
    inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_center_container.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docname="icon_patch_9_frame.svg">
+   sodipodi:docname="icon_patch_9_rect.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
diff --git a/tools/editor/icons/source/icon_reference_frame.svg b/tools/editor/icons/source/icon_reference_rect.svg
similarity index 98%
rename from tools/editor/icons/source/icon_reference_frame.svg
rename to tools/editor/icons/source/icon_reference_rect.svg
index 76c3247f1ba..cee814360d6 100644
--- a/tools/editor/icons/source/icon_reference_frame.svg
+++ b/tools/editor/icons/source/icon_reference_rect.svg
@@ -18,7 +18,7 @@
    inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_center_container.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docname="icon_reference_frame.svg">
+   sodipodi:docname="icon_reference_rect.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
diff --git a/tools/editor/icons/source/icon_texture_frame.svg b/tools/editor/icons/source/icon_texture_rect.svg
similarity index 98%
rename from tools/editor/icons/source/icon_texture_frame.svg
rename to tools/editor/icons/source/icon_texture_rect.svg
index afab41de41f..88d9b4081fa 100644
--- a/tools/editor/icons/source/icon_texture_frame.svg
+++ b/tools/editor/icons/source/icon_texture_rect.svg
@@ -18,7 +18,7 @@
    inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_center_container.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   sodipodi:docname="icon_texture_frame.svg">
+   sodipodi:docname="icon_texture_rect.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp
index 45f97383a39..65fdababbde 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp
@@ -41,7 +41,7 @@
 #include "os/input.h"
 #include "tools/editor/editor_settings.h"
 #include "scene/gui/grid_container.h"
-#include "scene/gui/patch_9_frame.h"
+#include "scene/gui/patch_9_rect.h"
 #include "tools/editor/animation_editor.h"
 #include "tools/editor/plugins/animation_player_editor_plugin.h"
 #include "tools/editor/script_editor_debugger.h"
@@ -3767,7 +3767,7 @@ void CanvasItemEditorViewport::_create_nodes(Node* parent, Node* child, String&
 	editor_data->get_undo_redo().add_do_property(child,property,texture);
 
 	// make visible for certain node type
-	if (default_type=="Patch9Frame") {
+	if (default_type=="Patch9Rect") {
 		editor_data->get_undo_redo().add_do_property(child,"rect/size",texture_size);
 	} else if (default_type=="Polygon2D") {
 		PoolVector<Vector2> list;
@@ -3785,7 +3785,7 @@ void CanvasItemEditorViewport::_create_nodes(Node* parent, Node* child, String&
 	}
 	Transform2D trans=canvas->get_canvas_transform();
 	Point2 target_pos = (p_point-trans.get_origin())/trans.get_scale().x-pos;
-	if (default_type=="Polygon2D" || default_type=="TouchScreenButton" || default_type=="TextureRect" || default_type=="Patch9Frame") {
+	if (default_type=="Polygon2D" || default_type=="TouchScreenButton" || default_type=="TextureRect" || default_type=="Patch9Rect") {
 		target_pos -= texture_size/2;
 	}
 	editor_data->get_undo_redo().add_do_method(child,"set_pos",target_pos);
@@ -3857,8 +3857,8 @@ void CanvasItemEditorViewport::_perform_drop_data(){
 			else if (default_type=="Particles2D")       child=memnew(Particles2D);
 			else if (default_type=="Polygon2D")         child=memnew(Polygon2D);
 			else if (default_type=="TouchScreenButton") child=memnew(TouchScreenButton);
-			else if (default_type=="TextureRect")      child=memnew(TextureRect);
-			else if (default_type=="Patch9Frame")       child=memnew(NinePatchRect);
+			else if (default_type=="TextureRect")       child=memnew(TextureRect);
+			else if (default_type=="Patch9Rect")        child=memnew(NinePatchRect);
 			else child=memnew(Sprite); // default
 
 			_create_nodes(target_node, child, path, drop_pos);
@@ -3993,7 +3993,7 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasIte
 	types.push_back("TouchScreenButton");
 	// Control
 	types.push_back("TextureRect");
-	types.push_back("Patch9Frame");
+	types.push_back("Patch9Rect");
 
 	target_node=NULL;
 	editor=p_node;
diff --git a/tools/editor/plugins/style_box_editor_plugin.h b/tools/editor/plugins/style_box_editor_plugin.h
index b2288b8e746..29e98efd8b8 100644
--- a/tools/editor/plugins/style_box_editor_plugin.h
+++ b/tools/editor/plugins/style_box_editor_plugin.h
@@ -30,7 +30,7 @@
 #define STYLE_BOX_EDITOR_PLUGIN_H
 
 #include "scene/resources/style_box.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/option_button.h"
 #include "tools/editor/editor_node.h"
 
diff --git a/tools/editor/plugins/texture_region_editor_plugin.cpp b/tools/editor/plugins/texture_region_editor_plugin.cpp
index ca49684063b..1ad880c4d66 100644
--- a/tools/editor/plugins/texture_region_editor_plugin.cpp
+++ b/tools/editor/plugins/texture_region_editor_plugin.cpp
@@ -935,7 +935,7 @@ void TextureRegionEditorPlugin::edit(Object *p_node)
 
 bool TextureRegionEditorPlugin::handles(Object *p_obj) const
 {
-	return p_obj->is_class("Sprite") || p_obj->is_class("Patch9Frame") || p_obj->is_class("StyleBoxTexture") || p_obj->is_class("AtlasTexture");
+	return p_obj->is_class("Sprite") || p_obj->is_class("Patch9Rect") || p_obj->is_class("StyleBoxTexture") || p_obj->is_class("AtlasTexture");
 }
 
 void TextureRegionEditorPlugin::make_visible(bool p_visible)
diff --git a/tools/editor/plugins/texture_region_editor_plugin.h b/tools/editor/plugins/texture_region_editor_plugin.h
index c529e54dd1c..35c0f18efa8 100644
--- a/tools/editor/plugins/texture_region_editor_plugin.h
+++ b/tools/editor/plugins/texture_region_editor_plugin.h
@@ -36,7 +36,7 @@
 #include "tools/editor/editor_plugin.h"
 #include "tools/editor/editor_node.h"
 #include "scene/2d/sprite.h"
-#include "scene/gui/patch_9_frame.h"
+#include "scene/gui/patch_9_rect.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
 
diff --git a/tools/editor/plugins/theme_editor_plugin.h b/tools/editor/plugins/theme_editor_plugin.h
index 0af9128bf20..9251da8e070 100644
--- a/tools/editor/plugins/theme_editor_plugin.h
+++ b/tools/editor/plugins/theme_editor_plugin.h
@@ -30,7 +30,7 @@
 #define THEME_EDITOR_PLUGIN_H
 
 #include "scene/resources/theme.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/gui/check_box.h"
diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp
index da12e8d6713..01dca396c8f 100644
--- a/tools/editor/project_manager.cpp
+++ b/tools/editor/project_manager.cpp
@@ -42,7 +42,7 @@
 #include "scene/gui/center_container.h"
 #include "io/stream_peer_ssl.h"
 
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/margin_container.h"
 #include "io/resource_saver.h"
 
diff --git a/tools/editor/property_editor.h b/tools/editor/property_editor.h
index 305da055a42..900d06497f7 100644
--- a/tools/editor/property_editor.h
+++ b/tools/editor/property_editor.h
@@ -37,7 +37,7 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/color_picker.h"
 #include "scene/gui/menu_button.h"
-#include "scene/gui/texture_frame.h"
+#include "scene/gui/texture_rect.h"
 #include "scene/gui/text_edit.h"
 #include "scene/gui/check_button.h"
 #include "scene/gui/split_container.h"