diff --git a/lib/state_machines/yard/handlers.rb b/lib/state_machines/yard/handlers.rb
index 7c34daf..91098db 100644
--- a/lib/state_machines/yard/handlers.rb
+++ b/lib/state_machines/yard/handlers.rb
@@ -1,4 +1,4 @@
-module StateMachine
+module StateMachines
   module YARD
     # YARD custom handlers for integrating the state_machine DSL with the
     # YARD documentation system
diff --git a/lib/state_machines/yard/handlers/base.rb b/lib/state_machines/yard/handlers/base.rb
index ad72773..0d6e0e2 100644
--- a/lib/state_machines/yard/handlers/base.rb
+++ b/lib/state_machines/yard/handlers/base.rb
@@ -1,4 +1,4 @@
-module StateMachine
+module StateMachines
   module YARD
     module Handlers
       # Handles and processes nodes
diff --git a/lib/state_machines/yard/handlers/event.rb b/lib/state_machines/yard/handlers/event.rb
index 3d566d4..409d516 100644
--- a/lib/state_machines/yard/handlers/event.rb
+++ b/lib/state_machines/yard/handlers/event.rb
@@ -1,4 +1,4 @@
-module StateMachine
+module StateMachines
   module YARD
     module Handlers
       # Handles and processes #event
diff --git a/lib/state_machines/yard/handlers/machine.rb b/lib/state_machines/yard/handlers/machine.rb
index c34e0ca..c6f4835 100644
--- a/lib/state_machines/yard/handlers/machine.rb
+++ b/lib/state_machines/yard/handlers/machine.rb
@@ -1,4 +1,4 @@
-module StateMachine
+module StateMachines
   module YARD
     module Handlers
       # Handles and processes #state_machine
diff --git a/lib/state_machines/yard/handlers/state.rb b/lib/state_machines/yard/handlers/state.rb
index 8da77ec..a513554 100644
--- a/lib/state_machines/yard/handlers/state.rb
+++ b/lib/state_machines/yard/handlers/state.rb
@@ -1,4 +1,4 @@
-module StateMachine
+module StateMachines
   module YARD
     module Handlers
       # Handles and processes #state
diff --git a/lib/state_machines/yard/handlers/transition.rb b/lib/state_machines/yard/handlers/transition.rb
index 4710342..7ba0467 100644
--- a/lib/state_machines/yard/handlers/transition.rb
+++ b/lib/state_machines/yard/handlers/transition.rb
@@ -1,4 +1,4 @@
-module StateMachine
+module StateMachines
   module YARD
     module Handlers
       # Handles and processes #transition
@@ -13,7 +13,7 @@ def process
             ast = statement.parameters.first
             ast.children.each do |assoc|
               # Skip conditionals
-              next if %w(if unless).include?(assoc[0].jump(:ident).source)
+              next if %w(if :if unless :unless).include?(assoc[0].jump(:ident).source)
 
               options[extract_requirement(assoc[0])] = extract_requirement(assoc[1])
             end