diff --git a/app/lib/Sage/Asset.php b/app/lib/Sage/Asset.php
index fd47a7bfa1..3508ff8729 100644
--- a/app/lib/Sage/Asset.php
+++ b/app/lib/Sage/Asset.php
@@ -1,6 +1,6 @@
 <?php namespace Roots\Sage;
 
-use Roots\Sage\Assets\IManifest;
+use Roots\Sage\Assets\ManifestInterface;
 
 /**
  * Class Template
@@ -11,14 +11,14 @@ class Asset {
 
   public static $dist = '/dist';
 
-  /** @var IManifest Currently used manifest */
+  /** @var ManifestInterface Currently used manifest */
   protected $manifest;
 
   protected $asset;
 
   protected $dir;
 
-  public function __construct($file, IManifest $manifest = null) {
+  public function __construct($file, ManifestInterface $manifest = null) {
     $this->manifest = $manifest;
     $this->asset = basename($file);
     $this->dir = dirname($file) != '.' ? dirname($file) : '';
diff --git a/app/lib/Sage/Assets/JsonManifest.php b/app/lib/Sage/Assets/JsonManifest.php
index 9b776d0452..ff9936430e 100644
--- a/app/lib/Sage/Assets/JsonManifest.php
+++ b/app/lib/Sage/Assets/JsonManifest.php
@@ -5,7 +5,7 @@
  * @package Roots\Sage
  * @author QWp6t
  */
-class JsonManifest implements IManifest {
+class JsonManifest implements ManifestInterface {
   /** @var array */
   protected $manifest = [];
 
diff --git a/app/lib/Sage/Assets/IManifest.php b/app/lib/Sage/Assets/ManifestInterface.php
similarity index 87%
rename from app/lib/Sage/Assets/IManifest.php
rename to app/lib/Sage/Assets/ManifestInterface.php
index 62b5134261..749185b0e4 100644
--- a/app/lib/Sage/Assets/IManifest.php
+++ b/app/lib/Sage/Assets/ManifestInterface.php
@@ -1,11 +1,11 @@
 <?php namespace Roots\Sage\Assets;
 
 /**
- * Interface IManifest
+ * Interface ManifestInterface
  * @package Roots\Sage
  * @author QWp6t
  */
-interface IManifest {
+interface ManifestInterface {
 
   /**
    * Get the cache-busted filename
diff --git a/app/lib/Sage/Template.php b/app/lib/Sage/Template.php
index 3655e76e44..8e828eb95b 100644
--- a/app/lib/Sage/Template.php
+++ b/app/lib/Sage/Template.php
@@ -1,6 +1,6 @@
 <?php namespace Roots\Sage;
 
-use Roots\Sage\Template\IWrapper;
+use Roots\Sage\Template\WrapperInterface;
 
 /**
  * Class Template
@@ -10,7 +10,7 @@
 class Template {
   protected static $root = 'templates/';
 
-  /** @var IWrapper[] */
+  /** @var WrapperInterface[] */
   protected static $wrappers = [];
 
   protected $templates = [];
@@ -20,11 +20,11 @@ class Template {
   protected $html = '';
 
   /**
-   * @param IWrapper $wrapper
+   * @param WrapperInterface $wrapper
    * @param array $context Variables to pass to wrapper
    * @return static Template instance of wrapper
    */
-  public static function wrap(IWrapper $wrapper, $context = []) {
+  public static function wrap(WrapperInterface $wrapper, $context = []) {
     self::$wrappers[$wrapper->getSlug()] = $wrapper;
     return new static($wrapper->getWrappers(), $context);
   }
@@ -40,7 +40,9 @@ public static function unwrap($slug = '', $context = []) {
       end(self::$wrappers);
       $slug = key(self::$wrappers);
     }
-    return new static(self::$wrappers[$slug]->getTemplate(), $context);
+    $template = new static(self::$wrappers[$slug]->getTemplate(), $context);
+    unset(self::$wrappers[$slug]);
+    return $template;
   }
 
   /**
diff --git a/app/lib/Sage/Template/Wrapper.php b/app/lib/Sage/Template/Wrapper.php
index 5ae23d8a51..009b56b07c 100644
--- a/app/lib/Sage/Template/Wrapper.php
+++ b/app/lib/Sage/Template/Wrapper.php
@@ -1,11 +1,11 @@
 <?php namespace Roots\Sage\Template;
 
 /**
- * Interface Wrapper
+ * Class Wrapper
  * @package Roots\Sage
  * @author QWp6t
  */
-class Wrapper implements IWrapper {
+class Wrapper implements WrapperInterface {
   /** @var string Wrapper slug */
   protected $slug;
 
diff --git a/app/lib/Sage/Template/IWrapper.php b/app/lib/Sage/Template/WrapperInterface.php
similarity index 80%
rename from app/lib/Sage/Template/IWrapper.php
rename to app/lib/Sage/Template/WrapperInterface.php
index d785988788..d7b900458e 100644
--- a/app/lib/Sage/Template/IWrapper.php
+++ b/app/lib/Sage/Template/WrapperInterface.php
@@ -1,11 +1,11 @@
 <?php namespace Roots\Sage\Template;
 
 /**
- * Interface IWrapper
+ * Interface WrapperInterface
  * @package Roots\Sage
  * @author QWp6t
  */
-interface IWrapper {
+interface WrapperInterface {
 
   /**
    * Get a list of potential wrappers
@@ -21,7 +21,7 @@ public function getWrappers();
   public function getTemplate();
 
   /**
-   * @return string Slug of the Wrapper; e.g., `base`
+   * @return string Slug of the WrapperInterface; e.g., `base`
    */
   public function getSlug();
 }
diff --git a/composer.json b/composer.json
index 8afb68b185..5ce018f5a7 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
     ]
   },
   "require": {
-    "php": ">=5.5.0",
+    "php": ">=5.4.0",
     "composer/installers": "~1.0"
   }
 }