diff --git a/flextype/bootstrap.php b/flextype/bootstrap.php
index a346fd89..dd34ce63 100755
--- a/flextype/bootstrap.php
+++ b/flextype/bootstrap.php
@@ -28,7 +28,7 @@ use League\Event\Emitter;
  *
  * @var string
  */
-define('FLEXTYPE_VERSION', '0.8.3');
+define('FLEXTYPE_VERSION', '0.9.0-beta');
 
 // Start the session
 Session::start();
diff --git a/site/plugins/admin/app/Controllers/FieldsetsController.php b/site/plugins/admin/app/Controllers/FieldsetsController.php
index 53ae5150..a1836dde 100644
--- a/site/plugins/admin/app/Controllers/FieldsetsController.php
+++ b/site/plugins/admin/app/Controllers/FieldsetsController.php
@@ -109,9 +109,9 @@ class FieldsetsController extends Controller
     public function editProcess($request, $response)
     {
         if ($this->fieldsets->update($request->getParsedBody()['id'], JsonParser::decode($request->getParsedBody()['data']))) {
-            $this->flash->addMessage('success', __('admin_message_fieldsets_saved'));
+            $this->flash->addMessage('success', __('admin_message_fieldset_saved'));
         } else {
-            $this->flash->addMessage('error', __('admin_message_fieldsets_was_not_saved'));
+            $this->flash->addMessage('error', __('admin_message_fieldset_was_not_saved'));
         }
 
         return $response->withRedirect($this->router->pathFor('admin.fieldsets.index'));
diff --git a/site/plugins/admin/app/Controllers/SnippetsController.php b/site/plugins/admin/app/Controllers/SnippetsController.php
index d219eee5..f5cf84ed 100644
--- a/site/plugins/admin/app/Controllers/SnippetsController.php
+++ b/site/plugins/admin/app/Controllers/SnippetsController.php
@@ -140,9 +140,9 @@ class SnippetsController extends Controller
     public function editProcess(Request $request, Response $response) : Response
     {
         if ($this->snippets->update($request->getParsedBody()['id'], $request->getParsedBody()['data'])) {
-            $this->flash->addMessage('success', __('admin_message_snippets_saved'));
+            $this->flash->addMessage('success', __('admin_message_snippet_saved'));
         } else {
-            $this->flash->addMessage('error', __('admin_message_snippets_was_not_saved'));
+            $this->flash->addMessage('error', __('admin_message_snippet_was_not_saved'));
         }
 
         return $response->withRedirect($this->router->pathFor('admin.snippets.index'));
@@ -190,9 +190,9 @@ class SnippetsController extends Controller
             $request->getParsedBody()['id']
         )
         ) {
-            $this->flash->addMessage('success', __('admin_message_snippets_renamed'));
+            $this->flash->addMessage('success', __('admin_message_snippet_renamed'));
         } else {
-            $this->flash->addMessage('error', __('admin_message_snippets_was_not_renamed'));
+            $this->flash->addMessage('error', __('admin_message_snippet_was_not_renamed'));
         }
 
         return $response->withRedirect($this->router->pathFor('admin.snippets.index'));
@@ -209,9 +209,9 @@ class SnippetsController extends Controller
     public function deleteProcess(Request $request, Response $response) : Response
     {
         if ($this->snippets->delete($request->getParsedBody()['snippet-id'])) {
-            $this->flash->addMessage('success', __('admin_message_snippets_deleted'));
+            $this->flash->addMessage('success', __('admin_message_snippet_deleted'));
         } else {
-            $this->flash->addMessage('error', __('admin_message_snippets_was_not_deleted'));
+            $this->flash->addMessage('error', __('admin_message_snippet_was_not_deleted'));
         }
 
         return $response->withRedirect($this->router->pathFor('admin.snippets.index'));
@@ -228,9 +228,9 @@ class SnippetsController extends Controller
     public function duplicateProcess(Request $request, Response $response) : Response
     {
         if ($this->snippets->copy($request->getParsedBody()['snippet-id'], $request->getParsedBody()['snippet-id'] . '-duplicate-' . date("Ymd_His"))) {
-            $this->flash->addMessage('success', __('admin_message_snippets_duplicated'));
+            $this->flash->addMessage('success', __('admin_message_snippet_duplicated'));
         } else {
-            $this->flash->addMessage('error', __('admin_message_snippets_was_not_duplicated'));
+            $this->flash->addMessage('error', __('admin_message_snippet_was_not_duplicated'));
         }
 
         return $response->withRedirect($this->router->pathFor('admin.snippets.index'));
diff --git a/site/plugins/admin/lang/en_US.json b/site/plugins/admin/lang/en_US.json
index 1a92af4b..b83a7170 100755
--- a/site/plugins/admin/lang/en_US.json
+++ b/site/plugins/admin/lang/en_US.json
@@ -135,6 +135,11 @@
   "admin_message_template_renamed": "Template renamed",
   "admin_message_template_duplicated": "Template duplicated",
   "admin_message_template_saved": "Template saved",
+  "admin_message_template_was_not_created": "Template was not renamed",
+  "admin_message_partial_was_not_created": "Partial was not renamed",
+  "admin_message_partial_created": "Partial created",
+  "admin_message_partial_deleted": "Partial deleted",
+  "admin_message_partial_was_not_deleted": "Partial was not deleted",
   "admin_message_snippet_saved": "Snippet saved",
   "admin_message_snippet_created": "Snippet created",
   "admin_message_snippet_was_not_created": "Snippet was not created",