diff --git a/g13d/action.h b/g13d/action.h
index 424ecea..99042db 100644
--- a/g13d/action.h
+++ b/g13d/action.h
@@ -54,7 +54,7 @@ class Action_Keys : public Action {
   virtual void act(Device &, bool is_down);
   virtual void dump(std::ostream &) const;
 
-  std::vector<LINUX_KEY_VALUE> _keys;
+  std::vector<linux_keyvalue> _keys;
 };
 
 /*!
diff --git a/g13d/g13.h b/g13d/g13.h
index 1595b6e..df68edf 100644
--- a/g13d/g13.h
+++ b/g13d/g13.h
@@ -35,17 +35,19 @@ enum stick_mode_t {
   STICK_CALNORTH
 };
 
-typedef int LINUX_KEY_VALUE;
-const LINUX_KEY_VALUE BAD_KEY_VALUE = -1;
+typedef int linux_keyvalue;
+const linux_keyvalue BAD_KEY_VALUE = -1;
 
-typedef int G13_KEY_INDEX;
+typedef int g13_keyindex;
 
 class CommandException : public std::exception {
  public:
   CommandException(const std::string &reason) : _reason(reason) {
   }
+
   virtual ~CommandException() throw() {
   }
+
   virtual const char *what() const throw() {
     return _reason.c_str();
   }
diff --git a/g13d/manager.cc b/g13d/manager.cc
index 4214db9..d7c0eaa 100644
--- a/g13d/manager.cc
+++ b/g13d/manager.cc
@@ -229,7 +229,7 @@ void Manager::init_keynames() {
   BOOST_PP_SEQ_FOR_EACH(ADD_KB_KEY_MAPPING, _, KB_INPUT_KEY_SEQ);
 }
 
-LINUX_KEY_VALUE
+linux_keyvalue
 Manager::find_g13_key_value(const std::string &keyname) const {
   auto i = g13_name_to_key.find(keyname);
   if (i == g13_name_to_key.end()) {
@@ -238,7 +238,7 @@ Manager::find_g13_key_value(const std::string &keyname) const {
   return i->second;
 }
 
-LINUX_KEY_VALUE
+linux_keyvalue
 Manager::find_input_key_value(const std::string &keyname) const {
   // if there is a KEY_ prefix, strip it off
   if (!strncmp(keyname.c_str(), "KEY_", 4)) {
@@ -252,7 +252,7 @@ Manager::find_input_key_value(const std::string &keyname) const {
   return i->second;
 }
 
-std::string Manager::find_input_key_name(LINUX_KEY_VALUE v) const {
+std::string Manager::find_input_key_name(linux_keyvalue v) const {
   try {
     return find_or_throw(input_key_to_name, v);
   } catch (...) {
@@ -260,7 +260,7 @@ std::string Manager::find_input_key_name(LINUX_KEY_VALUE v) const {
   }
 }
 
-std::string Manager::find_g13_key_name(G13_KEY_INDEX v) const {
+std::string Manager::find_g13_key_name(g13_keyindex v) const {
   try {
     return find_or_throw(g13_key_to_name, v);
   } catch (...) {
diff --git a/g13d/manager.h b/g13d/manager.h
index f5dea10..d3c94ee 100644
--- a/g13d/manager.h
+++ b/g13d/manager.h
@@ -17,11 +17,11 @@ class Manager {
  public:
   Manager();
 
-  G13_KEY_INDEX find_g13_key_value(const std::string &keyname) const;
-  std::string find_g13_key_name(G13_KEY_INDEX) const;
+  g13_keyindex find_g13_key_value(const std::string &keyname) const;
+  std::string find_g13_key_name(g13_keyindex) const;
 
-  LINUX_KEY_VALUE find_input_key_value(const std::string &keyname) const;
-  std::string find_input_key_name(LINUX_KEY_VALUE) const;
+  linux_keyvalue find_input_key_value(const std::string &keyname) const;
+  std::string find_input_key_name(linux_keyvalue) const;
 
   void set_logo(const std::string &fn) {
     logo_filename = fn;
@@ -49,10 +49,10 @@ class Manager {
   libusb_context *ctx;
   std::vector<Device *> g13s;
 
-  std::map<G13_KEY_INDEX, std::string> g13_key_to_name;
-  std::map<std::string, G13_KEY_INDEX> g13_name_to_key;
-  std::map<LINUX_KEY_VALUE, std::string> input_key_to_name;
-  std::map<std::string, LINUX_KEY_VALUE> input_name_to_key;
+  std::map<g13_keyindex, std::string> g13_key_to_name;
+  std::map<std::string, g13_keyindex> g13_name_to_key;
+  std::map<linux_keyvalue, std::string> input_key_to_name;
+  std::map<std::string, linux_keyvalue> input_name_to_key;
 
   std::map<std::string, std::string> _string_config_values;
 
diff --git a/g13d/profile.h b/g13d/profile.h
index ab8908d..8d190e7 100644
--- a/g13d/profile.h
+++ b/g13d/profile.h
@@ -52,7 +52,7 @@ class Profile;
 class Key : public Actionable<Profile> {
  public:
   void dump(std::ostream &o) const;
-  G13_KEY_INDEX index() const {
+  g13_keyindex index() const {
     return _index.index;
   }