diff --git a/CHANGELOG.md b/CHANGELOG.md
index c084447eb..e7e0e8fb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### Changes since v0.15
+
+- `Lucky::Exposeable` has been renamed to `Lucky::Exposable`
+- `Lucky::Routeable` has been renamed to `Lucky::Routable`
+
 ### v0.15 (2019-06-12)
 
 - Removed `Lucky::Action::Status`. Use Crystal's `HTTP::Status` enum. [#769](https://github.com/luckyframework/lucky/pull/769)
diff --git a/src/lucky/action.cr b/src/lucky/action.cr
index 2cbdca830..0e57b85dc 100644
--- a/src/lucky/action.cr
+++ b/src/lucky/action.cr
@@ -10,8 +10,8 @@ abstract class Lucky::Action
 
   include Lucky::ActionDelegates
   include Lucky::RequestTypeHelpers
-  include Lucky::Exposeable
-  include Lucky::Routeable
+  include Lucky::Exposable
+  include Lucky::Routable
   include Lucky::Renderable
   include Lucky::ParamHelpers
   include Lucky::ActionCallbacks
diff --git a/src/lucky/error_action.cr b/src/lucky/error_action.cr
index 8bd0ced43..9b43347c3 100644
--- a/src/lucky/error_action.cr
+++ b/src/lucky/error_action.cr
@@ -5,7 +5,7 @@ abstract class Lucky::ErrorAction
   include Lucky::Renderable
   include Lucky::Redirectable
   include Lucky::RequestTypeHelpers
-  include Lucky::Exposeable
+  include Lucky::Exposable
 
   getter context
 
diff --git a/src/lucky/exposeable.cr b/src/lucky/exposable.cr
similarity index 98%
rename from src/lucky/exposeable.cr
rename to src/lucky/exposable.cr
index 0facd64d3..47ef657e9 100644
--- a/src/lucky/exposeable.cr
+++ b/src/lucky/exposable.cr
@@ -1,4 +1,4 @@
-module Lucky::Exposeable
+module Lucky::Exposable
   macro included
     EXPOSURES = [] of Symbol
 
diff --git a/src/lucky/routeable.cr b/src/lucky/routable.cr
similarity index 99%
rename from src/lucky/routeable.cr
rename to src/lucky/routable.cr
index b07187a09..e72fdf077 100644
--- a/src/lucky/routeable.cr
+++ b/src/lucky/routable.cr
@@ -1,5 +1,5 @@
 # Methods for routing HTTP requests and their parameters to actions.
-module Lucky::Routeable
+module Lucky::Routable
   macro fallback
     Lucky::RouteNotFoundHandler.fallback_action = {{ @type.name.id }}
     setup_call_method({{ yield }})
diff --git a/src/lucky/route_not_found_handler.cr b/src/lucky/route_not_found_handler.cr
index 236d25674..48adaa407 100644
--- a/src/lucky/route_not_found_handler.cr
+++ b/src/lucky/route_not_found_handler.cr
@@ -4,7 +4,7 @@
 #
 # This handler should be used after the `Lucky::RouteHandler`.
 #
-# See `Lucky::Routeable.fallback` for implementing the `fallback_action`.
+# See `Lucky::Routable.fallback` for implementing the `fallback_action`.
 class Lucky::RouteNotFoundHandler
   include HTTP::Handler
   class_property fallback_action : Lucky::Action.class | Nil