diff --git a/lib/ugui.c3l/src/ugui_atlas.c3 b/lib/ugui.c3l/src/atlas.c3
similarity index 100%
rename from lib/ugui.c3l/src/ugui_atlas.c3
rename to lib/ugui.c3l/src/atlas.c3
diff --git a/lib/ugui.c3l/src/ugui_cmd.c3 b/lib/ugui.c3l/src/cmd.c3
similarity index 100%
rename from lib/ugui.c3l/src/ugui_cmd.c3
rename to lib/ugui.c3l/src/cmd.c3
diff --git a/lib/ugui.c3l/src/ugui_core.c3 b/lib/ugui.c3l/src/core.c3
similarity index 100%
rename from lib/ugui.c3l/src/ugui_core.c3
rename to lib/ugui.c3l/src/core.c3
diff --git a/lib/ugui.c3l/src/ugui_font.c3 b/lib/ugui.c3l/src/font.c3
similarity index 100%
rename from lib/ugui.c3l/src/ugui_font.c3
rename to lib/ugui.c3l/src/font.c3
diff --git a/lib/ugui.c3l/src/ugui_input.c3 b/lib/ugui.c3l/src/input.c3
similarity index 100%
rename from lib/ugui.c3l/src/ugui_input.c3
rename to lib/ugui.c3l/src/input.c3
diff --git a/lib/ugui.c3l/src/ugui_layout.c3 b/lib/ugui.c3l/src/layout.c3
similarity index 100%
rename from lib/ugui.c3l/src/ugui_layout.c3
rename to lib/ugui.c3l/src/layout.c3
diff --git a/lib/ugui.c3l/src/ugui_shapes.c3 b/lib/ugui.c3l/src/shapes.c3
similarity index 100%
rename from lib/ugui.c3l/src/ugui_shapes.c3
rename to lib/ugui.c3l/src/shapes.c3
diff --git a/lib/ugui.c3l/src/ugui_sprite.c3 b/lib/ugui.c3l/src/sprite.c3
similarity index 100%
rename from lib/ugui.c3l/src/ugui_sprite.c3
rename to lib/ugui.c3l/src/sprite.c3
diff --git a/lib/ugui.c3l/src/ugui_style.c3 b/lib/ugui.c3l/src/style.c3
similarity index 100%
rename from lib/ugui.c3l/src/ugui_style.c3
rename to lib/ugui.c3l/src/style.c3
diff --git a/lib/ugui.c3l/src/ugui_textedit.c3 b/lib/ugui.c3l/src/textedit.c3
similarity index 100%
rename from lib/ugui.c3l/src/ugui_textedit.c3
rename to lib/ugui.c3l/src/textedit.c3
diff --git a/lib/ugui.c3l/src/widgets/ugui_button.c3 b/lib/ugui.c3l/src/widgets/button.c3
similarity index 100%
rename from lib/ugui.c3l/src/widgets/ugui_button.c3
rename to lib/ugui.c3l/src/widgets/button.c3
diff --git a/lib/ugui.c3l/src/widgets/ugui_div.c3 b/lib/ugui.c3l/src/widgets/div.c3
similarity index 100%
rename from lib/ugui.c3l/src/widgets/ugui_div.c3
rename to lib/ugui.c3l/src/widgets/div.c3
diff --git a/lib/ugui.c3l/src/widgets/ugui_separator.c3 b/lib/ugui.c3l/src/widgets/separator.c3
similarity index 100%
rename from lib/ugui.c3l/src/widgets/ugui_separator.c3
rename to lib/ugui.c3l/src/widgets/separator.c3
diff --git a/lib/ugui.c3l/src/widgets/ugui_slider.c3 b/lib/ugui.c3l/src/widgets/slider.c3
similarity index 100%
rename from lib/ugui.c3l/src/widgets/ugui_slider.c3
rename to lib/ugui.c3l/src/widgets/slider.c3
diff --git a/lib/ugui.c3l/src/widgets/ugui_sprite.c3 b/lib/ugui.c3l/src/widgets/sprite.c3
similarity index 100%
rename from lib/ugui.c3l/src/widgets/ugui_sprite.c3
rename to lib/ugui.c3l/src/widgets/sprite.c3
diff --git a/lib/ugui.c3l/src/widgets/ugui_text.c3 b/lib/ugui.c3l/src/widgets/text.c3
similarity index 100%
rename from lib/ugui.c3l/src/widgets/ugui_text.c3
rename to lib/ugui.c3l/src/widgets/text.c3