diff --git a/devices/mcp492x.h b/devices/mcp492x.h
index 4bea3c6..44fcc68 100755
--- a/devices/mcp492x.h
+++ b/devices/mcp492x.h
@@ -34,7 +34,7 @@ enum DacVoltageReference {
   UNBUFFERED_REFERENCE
 };
 
-template<uint8_t slave_select_pin,
+template<typename slave_select,
          DacVoltageReference voltage_reference = UNBUFFERED_REFERENCE,
          uint8_t gain = 1>
 class Dac {
@@ -70,7 +70,7 @@ class Dac {
   }
 
  private:
-  typedef SPIMaster<slave_select_pin, MSB_FIRST, kDacSpeed> DacInterface;
+  typedef SpiMaster<slave_select, MSB_FIRST, kDacSpeed> DacInterface;
 };
 
 }  // namespace avrlib
diff --git a/spi.h b/spi.h
index 9c89fed..c5563da 100644
--- a/spi.h
+++ b/spi.h
@@ -41,7 +41,7 @@ typedef BitInRegister<SPSRRegister, SPIF> TransferComplete;
 template<typename SlaveSelect,
          DataOrder order = MSB_FIRST,
          uint8_t speed = 4>
-class SPIMaster {
+class SpiMaster {
  public:
   enum {
     buffer_size = 0,
@@ -105,7 +105,7 @@ class SPIMaster {
 template<typename SlaveSelect,
          DataOrder order = MSB_FIRST,
          bool enable_interrupt = false>
-class SPISlave {
+class SpiSlave {
  public:
   enum {
     buffer_size = 128,