diff --git a/pokemon_app.cpp b/pokemon_app.c
similarity index 98%
rename from pokemon_app.cpp
rename to pokemon_app.c
index aa0d9acce60..98a1d6639d3 100644
--- a/pokemon_app.cpp
+++ b/pokemon_app.c
@@ -1,8 +1,8 @@
 #include <furi_hal_light.h>
 #include <pokemon_icons.h>
 
-#include "views/trade.hpp"
-#include "views/select_pokemon.hpp"
+#include "views/trade.h"
+#include "views/select_pokemon.h"
 #include "pokemon_app.h"
 
 const PokemonTable pokemon_table[] = {
@@ -265,7 +265,7 @@ void free_app(PokemonFap* pokemon_fap) {
     pokemon_fap = NULL;
 }
 
-extern "C" int32_t pokemon_app(void* p) {
+int32_t pokemon_app(void* p) {
     UNUSED(p);
     //App* app = (App*)pokemon_alloc();
     PokemonFap* pokemon_fap = pokemon_alloc();
diff --git a/views/select_pokemon.cpp b/views/select_pokemon.c
similarity index 97%
rename from views/select_pokemon.cpp
rename to views/select_pokemon.c
index 20c96f297c7..69b0f923149 100644
--- a/views/select_pokemon.cpp
+++ b/views/select_pokemon.c
@@ -121,8 +121,8 @@ View* select_pokemon_alloc(PokemonFap* pokemon_fap) {
 
     view_set_context(view, pokemon_fap);
     view_allocate_model(view, ViewModelTypeLockFree, sizeof(PokemonFap**));
-    with_view_model_cpp(
-        view, PokemonFap**, model_fap, { *model_fap = pokemon_fap; }, false);
+    with_view_model(
+        view, PokemonFap** model_fap, { *model_fap = pokemon_fap; }, false);
 
     view_set_draw_callback(view, select_pokemon_render_callback);
     view_set_input_callback(view, select_pokemon_input_callback);
diff --git a/views/select_pokemon.hpp b/views/select_pokemon.h
similarity index 65%
rename from views/select_pokemon.hpp
rename to views/select_pokemon.h
index 37335c453eb..e4b936283c3 100644
--- a/views/select_pokemon.hpp
+++ b/views/select_pokemon.h
@@ -1,5 +1,5 @@
-#ifndef SELECCT_POKEMON_HPP
-#define SELECCT_POKEMON_HPP
+#ifndef SELECCT_POKEMON_H
+#define SELECCT_POKEMON_H
 
 #pragma once
 
@@ -10,4 +10,4 @@ View* select_pokemon_alloc(PokemonFap* pokemon_fap);
 
 void select_pokemon_free(PokemonFap* pokemon_fap);
 
-#endif /* SELECCT_POKEMON_HPP */
+#endif /* SELECCT_POKEMON_H */
diff --git a/views/trade.cpp b/views/trade.c
similarity index 99%
rename from views/trade.cpp
rename to views/trade.c
index 2ce7c0f24e4..e99ffb4db97 100644
--- a/views/trade.cpp
+++ b/views/trade.c
@@ -457,8 +457,8 @@ View* trade_alloc(PokemonFap* pokemon_fap) {
 
     view_set_context(view, pokemon_fap);
     view_allocate_model(view, ViewModelTypeLockFree, sizeof(PokemonFap**));
-    with_view_model_cpp(
-        view, PokemonFap**, model_fap, { *model_fap = pokemon_fap; }, false);
+    with_view_model(
+        view, PokemonFap** model_fap, { *model_fap = pokemon_fap; }, false);
 
     view_set_draw_callback(view, trade_draw_callback);
     view_set_input_callback(view, trade_input_callback);
diff --git a/views/trade.hpp b/views/trade.h
similarity index 72%
rename from views/trade.hpp
rename to views/trade.h
index 4a40f1031b4..2c7774b46b3 100644
--- a/views/trade.hpp
+++ b/views/trade.h
@@ -1,5 +1,5 @@
-#ifndef TRADE_HPP
-#define TRADE_HPP
+#ifndef TRADE_H
+#define TRADE_H
 
 #pragma once
 
@@ -10,4 +10,4 @@ View* trade_alloc(PokemonFap* pokemon_fap);
 
 void trade_free(PokemonFap* pokemon_fap);
 
-#endif /* TRADE_HPP */
+#endif /* TRADE_H */