Cleanup various equipment/right button code

src/Dodge/Data/RightButtonOptions.hs

@@ -12,8 +12,8 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Equipment.Misc
 
-data RightButtonOptions
-    = NoRightButtonOptions
+data RightButtonState
+    = NoRightButtonState
     | EquipOptions { _opSel :: Int }
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
@@ -40,7 +40,7 @@ data EquipmentAllocation
         }
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-makeLenses ''RightButtonOptions
+makeLenses ''RightButtonState
 makeLenses ''EquipmentAllocation
 deriveJSON defaultOptions ''EquipmentAllocation
-deriveJSON defaultOptions ''RightButtonOptions
+deriveJSON defaultOptions ''RightButtonState