diff --git a/README.md b/README.md
index 5ceb95c..cc7c6d9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# AVRRFM
+# librfm
 
 ## About
 
diff --git a/librfm.h b/librfm.h
index 332d475..949cc86 100644
--- a/librfm.h
+++ b/librfm.h
@@ -97,19 +97,19 @@
 
 /**
  * Turns the radio on by pulling its reset pin LOW.
- * PORT_RFM &= ~(1 << PIN_RRST);
+ * PORTB &= ~(1 << PB0);
  */
 void _rfmOn(void);
 
 /**
  * Selects the radio to talk to via SPI.
- * PORT_RFM &= ~(1 << PIN_RCS);
+ * PORTB &= ~(1 << PB1);
  */
 void _rfmSel(void);
 
 /**
  * Deselects the radio to talk to via SPI.
- * PORT_RFM |= (1 << PIN_RCS);
+ * PORTB |= (1 << PB1);
  */
 void _rfmDes(void);
 
diff --git a/nbproject/Makefile-Custom.mk b/nbproject/Makefile-Custom.mk
index 50bf3ef..a9a3378 100644
--- a/nbproject/Makefile-Custom.mk
+++ b/nbproject/Makefile-Custom.mk
@@ -56,13 +56,11 @@
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/liblibrfm.a
+	"${MAKE}"  -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/librfm
 
-${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/liblibrfm.a: ${OBJECTFILES}
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/librfm: ${OBJECTFILES}
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
-	${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/liblibrfm.a
-	${AR} -rv ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/liblibrfm.a ${OBJECTFILES} 
-	$(RANLIB) ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/liblibrfm.a
+	${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/librfm ${OBJECTFILES} ${LDLIBSOPTIONS}
 
 ${OBJECTDIR}/_ext/5ac08470/librfm.o: /home/dode/dev/librfm/librfm.c
 	${MKDIR} -p ${OBJECTDIR}/_ext/5ac08470
diff --git a/nbproject/Makefile-variables.mk b/nbproject/Makefile-variables.mk
index 2c19f0b..b2721e4 100644
--- a/nbproject/Makefile-variables.mk
+++ b/nbproject/Makefile-variables.mk
@@ -9,8 +9,8 @@
 # Custom configuration
 CND_PLATFORM_Custom=AVR-Linux
 CND_ARTIFACT_DIR_Custom=dist/Custom/AVR-Linux
-CND_ARTIFACT_NAME_Custom=liblibrfm.a
-CND_ARTIFACT_PATH_Custom=dist/Custom/AVR-Linux/liblibrfm.a
+CND_ARTIFACT_NAME_Custom=librfm
+CND_ARTIFACT_PATH_Custom=dist/Custom/AVR-Linux/librfm
 CND_PACKAGE_DIR_Custom=dist/Custom/AVR-Linux/package
 CND_PACKAGE_NAME_Custom=librfm.tar
 CND_PACKAGE_PATH_Custom=dist/Custom/AVR-Linux/package/librfm.tar
diff --git a/nbproject/Package-Custom.bash b/nbproject/Package-Custom.bash
index 63e73d6..3a6cf36 100644
--- a/nbproject/Package-Custom.bash
+++ b/nbproject/Package-Custom.bash
@@ -13,8 +13,8 @@
 CND_DLIB_EXT=so
 NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/liblibrfm.a
-OUTPUT_BASENAME=liblibrfm.a
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/librfm
+OUTPUT_BASENAME=librfm
 PACKAGE_TOP_DIR=librfm/
 
 # Functions
@@ -60,8 +60,8 @@
 
 # Copy files and create directories and links
 cd "${TOP}"
-makeDirectory "${NBTMPDIR}/librfm/lib"
-copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
+makeDirectory "${NBTMPDIR}/librfm/bin"
+copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
 
 
 # Generate tar file
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 150f8b5..18bdf72 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -18,15 +18,13 @@
   </sourceRootList>
   <projectmakefile>/home/dode/dev/librfm/Makefile</projectmakefile>
   <confs>
-    <conf name="Custom" type="3">
+    <conf name="Custom" type="1">
       <toolsSet>
         <compilerSet>AVR|GNU</compilerSet>
         <dependencyChecking>false</dependencyChecking>
         <rebuildPropChanged>false</rebuildPropChanged>
       </toolsSet>
       <compileType>
-        <archiverTool>
-        </archiverTool>
       </compileType>
       <item path="/home/dode/dev/librfm/librfm.c" ex="false" tool="0" flavor2="0">
       </item>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index bb4b63c..969067c 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -15,7 +15,7 @@
             <confList>
                 <confElem>
                     <name>Custom</name>
-                    <type>3</type>
+                    <type>1</type>
                 </confElem>
             </confList>
             <formatting>