diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java b/processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java
index 4b3527838..7601c6b88 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java
@@ -42,82 +42,85 @@ public class Conversions {
         this.enumType = typeUtils.getDeclaredType( elementUtils.getTypeElement( Enum.class.getCanonicalName() ) );
         this.stringType = typeUtils.getDeclaredType( elementUtils.getTypeElement( String.class.getCanonicalName() ) );
 
-        registerNumberConversion( byte.class, Byte.class );
-        registerNumberConversion( byte.class, short.class );
-        registerNumberConversion( byte.class, Short.class );
-        registerNumberConversion( byte.class, int.class );
-        registerNumberConversion( byte.class, Integer.class );
-        registerNumberConversion( byte.class, long.class );
-        registerNumberConversion( byte.class, Long.class );
-        registerNumberConversion( byte.class, float.class );
-        registerNumberConversion( byte.class, Float.class );
-        registerNumberConversion( byte.class, double.class );
-        registerNumberConversion( byte.class, Double.class );
+        registerNativeTypeConversion( byte.class, Byte.class );
+        registerNativeTypeConversion( byte.class, short.class );
+        registerNativeTypeConversion( byte.class, Short.class );
+        registerNativeTypeConversion( byte.class, int.class );
+        registerNativeTypeConversion( byte.class, Integer.class );
+        registerNativeTypeConversion( byte.class, long.class );
+        registerNativeTypeConversion( byte.class, Long.class );
+        registerNativeTypeConversion( byte.class, float.class );
+        registerNativeTypeConversion( byte.class, Float.class );
+        registerNativeTypeConversion( byte.class, double.class );
+        registerNativeTypeConversion( byte.class, Double.class );
 
-        registerNumberConversion( Byte.class, short.class );
-        registerNumberConversion( Byte.class, Short.class );
-        registerNumberConversion( Byte.class, int.class );
-        registerNumberConversion( Byte.class, Integer.class );
-        registerNumberConversion( Byte.class, long.class );
-        registerNumberConversion( Byte.class, Long.class );
-        registerNumberConversion( Byte.class, float.class );
-        registerNumberConversion( Byte.class, Float.class );
-        registerNumberConversion( Byte.class, double.class );
-        registerNumberConversion( Byte.class, Double.class );
+        registerNativeTypeConversion( Byte.class, short.class );
+        registerNativeTypeConversion( Byte.class, Short.class );
+        registerNativeTypeConversion( Byte.class, int.class );
+        registerNativeTypeConversion( Byte.class, Integer.class );
+        registerNativeTypeConversion( Byte.class, long.class );
+        registerNativeTypeConversion( Byte.class, Long.class );
+        registerNativeTypeConversion( Byte.class, float.class );
+        registerNativeTypeConversion( Byte.class, Float.class );
+        registerNativeTypeConversion( Byte.class, double.class );
+        registerNativeTypeConversion( Byte.class, Double.class );
 
-        registerNumberConversion( short.class, Short.class );
-        registerNumberConversion( short.class, int.class );
-        registerNumberConversion( short.class, Integer.class );
-        registerNumberConversion( short.class, long.class );
-        registerNumberConversion( short.class, Long.class );
-        registerNumberConversion( short.class, float.class );
-        registerNumberConversion( short.class, Float.class );
-        registerNumberConversion( short.class, double.class );
-        registerNumberConversion( short.class, Double.class );
+        registerNativeTypeConversion( short.class, Short.class );
+        registerNativeTypeConversion( short.class, int.class );
+        registerNativeTypeConversion( short.class, Integer.class );
+        registerNativeTypeConversion( short.class, long.class );
+        registerNativeTypeConversion( short.class, Long.class );
+        registerNativeTypeConversion( short.class, float.class );
+        registerNativeTypeConversion( short.class, Float.class );
+        registerNativeTypeConversion( short.class, double.class );
+        registerNativeTypeConversion( short.class, Double.class );
 
-        registerNumberConversion( Short.class, int.class );
-        registerNumberConversion( Short.class, Integer.class );
-        registerNumberConversion( Short.class, long.class );
-        registerNumberConversion( Short.class, Long.class );
-        registerNumberConversion( Short.class, float.class );
-        registerNumberConversion( Short.class, Float.class );
-        registerNumberConversion( Short.class, double.class );
-        registerNumberConversion( Short.class, Double.class );
+        registerNativeTypeConversion( Short.class, int.class );
+        registerNativeTypeConversion( Short.class, Integer.class );
+        registerNativeTypeConversion( Short.class, long.class );
+        registerNativeTypeConversion( Short.class, Long.class );
+        registerNativeTypeConversion( Short.class, float.class );
+        registerNativeTypeConversion( Short.class, Float.class );
+        registerNativeTypeConversion( Short.class, double.class );
+        registerNativeTypeConversion( Short.class, Double.class );
 
-        registerNumberConversion( int.class, Integer.class );
-        registerNumberConversion( int.class, long.class );
-        registerNumberConversion( int.class, Long.class );
-        registerNumberConversion( int.class, float.class );
-        registerNumberConversion( int.class, Float.class );
-        registerNumberConversion( int.class, double.class );
-        registerNumberConversion( int.class, Double.class );
+        registerNativeTypeConversion( int.class, Integer.class );
+        registerNativeTypeConversion( int.class, long.class );
+        registerNativeTypeConversion( int.class, Long.class );
+        registerNativeTypeConversion( int.class, float.class );
+        registerNativeTypeConversion( int.class, Float.class );
+        registerNativeTypeConversion( int.class, double.class );
+        registerNativeTypeConversion( int.class, Double.class );
 
-        registerNumberConversion( Integer.class, long.class );
-        registerNumberConversion( Integer.class, Long.class );
-        registerNumberConversion( Integer.class, float.class );
-        registerNumberConversion( Integer.class, Float.class );
-        registerNumberConversion( Integer.class, double.class );
-        registerNumberConversion( Integer.class, Double.class );
+        registerNativeTypeConversion( Integer.class, long.class );
+        registerNativeTypeConversion( Integer.class, Long.class );
+        registerNativeTypeConversion( Integer.class, float.class );
+        registerNativeTypeConversion( Integer.class, Float.class );
+        registerNativeTypeConversion( Integer.class, double.class );
+        registerNativeTypeConversion( Integer.class, Double.class );
 
-        registerNumberConversion( long.class, Long.class );
-        registerNumberConversion( long.class, float.class );
-        registerNumberConversion( long.class, Float.class );
-        registerNumberConversion( long.class, double.class );
-        registerNumberConversion( long.class, Double.class );
+        registerNativeTypeConversion( long.class, Long.class );
+        registerNativeTypeConversion( long.class, float.class );
+        registerNativeTypeConversion( long.class, Float.class );
+        registerNativeTypeConversion( long.class, double.class );
+        registerNativeTypeConversion( long.class, Double.class );
 
-        registerNumberConversion( Long.class, float.class );
-        registerNumberConversion( Long.class, Float.class );
-        registerNumberConversion( Long.class, double.class );
-        registerNumberConversion( Long.class, Double.class );
+        registerNativeTypeConversion( Long.class, float.class );
+        registerNativeTypeConversion( Long.class, Float.class );
+        registerNativeTypeConversion( Long.class, double.class );
+        registerNativeTypeConversion( Long.class, Double.class );
 
-        registerNumberConversion( float.class, Float.class );
-        registerNumberConversion( float.class, double.class );
-        registerNumberConversion( float.class, Double.class );
+        registerNativeTypeConversion( float.class, Float.class );
+        registerNativeTypeConversion( float.class, double.class );
+        registerNativeTypeConversion( float.class, Double.class );
 
-        registerNumberConversion( Float.class, double.class );
-        registerNumberConversion( Float.class, Double.class );
+        registerNativeTypeConversion( Float.class, double.class );
+        registerNativeTypeConversion( Float.class, Double.class );
 
-        registerNumberConversion( double.class, Double.class );
+        registerNativeTypeConversion( double.class, Double.class );
+
+        registerNativeTypeConversion( boolean.class, Boolean.class );
+        registerNativeTypeConversion( char.class, Character.class );
 
         registerToStringConversion( byte.class );
         registerToStringConversion( Byte.class );
@@ -139,7 +142,7 @@ public class Conversions {
         register( Enum.class, String.class, new EnumStringConversion() );
     }
 
-    private void registerNumberConversion(Class<?> sourceType, Class<?> targetType) {
+    private void registerNativeTypeConversion(Class<?> sourceType, Class<?> targetType) {
         if ( sourceType.isPrimitive() && targetType.isPrimitive() ) {
             register( sourceType, targetType, new PrimitiveToPrimitiveConversion( sourceType ) );
         }
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java
index 7edce71c7..4198532e3 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java
@@ -18,30 +18,12 @@
  */
 package org.mapstruct.ap.conversion;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.mapstruct.ap.model.Type;
+import org.mapstruct.ap.util.NativeTypes;
 import org.mapstruct.ap.util.Strings;
 
 public class PrimitiveToStringConversion implements Conversion {
 
-    private final static Map<Class<?>, Class<?>> primitiveToWrapperTypes;
-
-    static {
-        Map<Class<?>, Class<?>> tmp = new HashMap<Class<?>, Class<?>>();
-        tmp.put( byte.class, Byte.class );
-        tmp.put( short.class, Short.class );
-        tmp.put( int.class, Integer.class );
-        tmp.put( long.class, Long.class );
-        tmp.put( float.class, Float.class );
-        tmp.put( double.class, Double.class );
-        tmp.put( boolean.class, Boolean.class );
-
-        primitiveToWrapperTypes = Collections.unmodifiableMap( tmp );
-    }
-
     private final Class<?> sourceType;
     private final Class<?> wrapperType;
 
@@ -51,7 +33,7 @@ public class PrimitiveToStringConversion implements Conversion {
         }
 
         this.sourceType = sourceType;
-        this.wrapperType = primitiveToWrapperTypes.get( sourceType );
+        this.wrapperType = NativeTypes.getWrapperType( sourceType );
     }
 
     @Override
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToWrapperConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToWrapperConversion.java
index e60eb18db..dba75a816 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToWrapperConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToWrapperConversion.java
@@ -18,28 +18,11 @@
  */
 package org.mapstruct.ap.conversion;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.mapstruct.ap.model.Type;
+import org.mapstruct.ap.util.NativeTypes;
 
 public class PrimitiveToWrapperConversion implements Conversion {
 
-    private final static Map<Class<?>, Class<?>> wrapperToPrimitiveTypes;
-
-    static {
-        Map<Class<?>, Class<?>> tmp = new HashMap<Class<?>, Class<?>>();
-        tmp.put( Byte.class, byte.class );
-        tmp.put( Short.class, short.class );
-        tmp.put( Integer.class, int.class );
-        tmp.put( Long.class, long.class );
-        tmp.put( Float.class, float.class );
-        tmp.put( Double.class, double.class );
-
-        wrapperToPrimitiveTypes = Collections.unmodifiableMap( tmp );
-    }
-
     private final Class<?> sourceType;
     private final Class<?> targetType;
 
@@ -52,7 +35,7 @@ public class PrimitiveToWrapperConversion implements Conversion {
         }
 
         this.sourceType = sourceType;
-        this.targetType = wrapperToPrimitiveTypes.get( targetType );
+        this.targetType = NativeTypes.getPrimitiveType( targetType );
     }
 
     @Override
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java
index f6ef9766f..3a2b720f5 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java
@@ -18,30 +18,12 @@
  */
 package org.mapstruct.ap.conversion;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.mapstruct.ap.model.Type;
+import org.mapstruct.ap.util.NativeTypes;
 import org.mapstruct.ap.util.Strings;
 
 public class WrapperToStringConversion implements Conversion {
 
-    private final static Map<Class<?>, Class<?>> wrapperToPrimitiveTypes;
-
-    static {
-        Map<Class<?>, Class<?>> tmp = new HashMap<Class<?>, Class<?>>();
-        tmp.put( Byte.class, byte.class );
-        tmp.put( Short.class, short.class );
-        tmp.put( Integer.class, int.class );
-        tmp.put( Long.class, long.class );
-        tmp.put( Float.class, float.class );
-        tmp.put( Double.class, double.class );
-        tmp.put( Boolean.class, boolean.class );
-
-        wrapperToPrimitiveTypes = Collections.unmodifiableMap( tmp );
-    }
-
     private final Class<?> sourceType;
     private final Class<?> primitiveType;
 
@@ -51,7 +33,7 @@ public class WrapperToStringConversion implements Conversion {
         }
 
         this.sourceType = sourceType;
-        this.primitiveType = wrapperToPrimitiveTypes.get( sourceType );
+        this.primitiveType = NativeTypes.getPrimitiveType( sourceType );
     }
 
     @Override
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToWrapperConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToWrapperConversion.java
index cee114ae6..aa6a98c6d 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToWrapperConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToWrapperConversion.java
@@ -18,28 +18,11 @@
  */
 package org.mapstruct.ap.conversion;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.mapstruct.ap.model.Type;
+import org.mapstruct.ap.util.NativeTypes;
 
 public class WrapperToWrapperConversion implements Conversion {
 
-    private final static Map<Class<?>, Class<?>> wrapperToPrimitiveTypes;
-
-    static {
-        Map<Class<?>, Class<?>> tmp = new HashMap<Class<?>, Class<?>>();
-        tmp.put( Byte.class, byte.class );
-        tmp.put( Short.class, short.class );
-        tmp.put( Integer.class, int.class );
-        tmp.put( Long.class, long.class );
-        tmp.put( Float.class, float.class );
-        tmp.put( Double.class, double.class );
-
-        wrapperToPrimitiveTypes = Collections.unmodifiableMap( tmp );
-    }
-
     private final Class<?> sourceType;
     private final Class<?> targetType;
 
@@ -51,8 +34,8 @@ public class WrapperToWrapperConversion implements Conversion {
             throw new IllegalArgumentException( targetType + " is no wrapper type." );
         }
 
-        this.sourceType = wrapperToPrimitiveTypes.get( sourceType );
-        this.targetType = wrapperToPrimitiveTypes.get( targetType );
+        this.sourceType = NativeTypes.getPrimitiveType( sourceType );
+        this.targetType = NativeTypes.getPrimitiveType( targetType );
     }
 
     @Override
diff --git a/processor/src/main/java/org/mapstruct/ap/util/NativeTypes.java b/processor/src/main/java/org/mapstruct/ap/util/NativeTypes.java
new file mode 100644
index 000000000..92a4e8956
--- /dev/null
+++ b/processor/src/main/java/org/mapstruct/ap/util/NativeTypes.java
@@ -0,0 +1,71 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.util;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class NativeTypes {
+
+    private final static Map<Class<?>, Class<?>> wrapperToPrimitiveTypes;
+    private final static Map<Class<?>, Class<?>> primitiveToWrapperTypes;
+
+    static {
+        Map<Class<?>, Class<?>> tmp = new HashMap<Class<?>, Class<?>>();
+        tmp.put( Byte.class, byte.class );
+        tmp.put( Short.class, short.class );
+        tmp.put( Integer.class, int.class );
+        tmp.put( Long.class, long.class );
+        tmp.put( Float.class, float.class );
+        tmp.put( Double.class, double.class );
+        tmp.put( Boolean.class, boolean.class );
+        tmp.put( Character.class, char.class );
+
+        wrapperToPrimitiveTypes = Collections.unmodifiableMap( tmp );
+
+        tmp = new HashMap<Class<?>, Class<?>>();
+        tmp.put( byte.class, Byte.class );
+        tmp.put( short.class, Short.class );
+        tmp.put( int.class, Integer.class );
+        tmp.put( long.class, Long.class );
+        tmp.put( float.class, Float.class );
+        tmp.put( double.class, Double.class );
+        tmp.put( boolean.class, Boolean.class );
+        tmp.put( char.class, Character.class );
+
+        primitiveToWrapperTypes = Collections.unmodifiableMap( tmp );
+    }
+
+    public static Class<?> getWrapperType(Class<?> clazz) {
+        if ( !clazz.isPrimitive() ) {
+            throw new IllegalArgumentException( clazz + " is no primitive type." );
+        }
+
+        return primitiveToWrapperTypes.get( clazz );
+    }
+
+    public static Class<?> getPrimitiveType(Class<?> clazz) {
+        if ( clazz.isPrimitive() ) {
+            throw new IllegalArgumentException( clazz + " is no wrapper type." );
+        }
+
+        return wrapperToPrimitiveTypes.get( clazz );
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java
new file mode 100644
index 000000000..298a8e32f
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java
@@ -0,0 +1,55 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.conversion.nativetypes;
+
+import org.mapstruct.ap.testutil.MapperTestBase;
+import org.mapstruct.ap.testutil.WithClasses;
+import org.testng.annotations.Test;
+
+import static org.fest.assertions.Assertions.assertThat;
+
+@WithClasses({
+    BooleanSource.class,
+    BooleanTarget.class,
+    BooleanMapper.class
+})
+public class BooleanConversionTest extends MapperTestBase {
+
+    @Test
+    public void shouldApplyBooleanConversion() {
+        BooleanSource source = new BooleanSource();
+        source.setBool( true );
+
+        BooleanTarget target = BooleanMapper.INSTANCE.sourceToTarget( source );
+
+        assertThat( target ).isNotNull();
+        assertThat( target.getBool() ).isEqualTo( Boolean.TRUE );
+    }
+
+    @Test
+    public void shouldApplyReverseBooleanConversion() {
+        BooleanTarget target = new BooleanTarget();
+        target.setBool( Boolean.TRUE );
+
+        BooleanSource source = BooleanMapper.INSTANCE.targetToSource( target );
+
+        assertThat( source ).isNotNull();
+        assertThat( source.getBool() ).isEqualTo( true );
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanMapper.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanMapper.java
new file mode 100644
index 000000000..baa767754
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanMapper.java
@@ -0,0 +1,32 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.conversion.nativetypes;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mappers;
+
+@Mapper
+public interface BooleanMapper {
+
+    public static BooleanMapper INSTANCE = Mappers.getMapper( BooleanMapper.class );
+
+    BooleanTarget sourceToTarget(BooleanSource source);
+
+    BooleanSource targetToSource(BooleanTarget target);
+}
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/IntegerStringConversion.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanSource.java
similarity index 65%
rename from processor/src/main/java/org/mapstruct/ap/conversion/IntegerStringConversion.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanSource.java
index 64d1594f9..daa6c692f 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/IntegerStringConversion.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanSource.java
@@ -16,19 +16,17 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.conversion;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
-import org.mapstruct.ap.model.Type;
+public class BooleanSource {
 
-public class IntegerStringConversion implements Conversion {
+    private boolean bool;
 
-    @Override
-    public String to(String sourcePropertyAccessor, Type type) {
-        return "String.valueOf( " + sourcePropertyAccessor + " )";
+    public boolean getBool() {
+        return bool;
     }
 
-    @Override
-    public String from(String targetPropertyAccessor, Type type) {
-        return "Integer.parseInt( " + targetPropertyAccessor + " )";
+    public void setBool(boolean bool) {
+        this.bool = bool;
     }
 }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanTarget.java
new file mode 100644
index 000000000..fa3e7496d
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanTarget.java
@@ -0,0 +1,32 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.conversion.nativetypes;
+
+public class BooleanTarget {
+
+    private Boolean bool;
+
+    public Boolean getBool() {
+        return bool;
+    }
+
+    public void setBool(Boolean bool) {
+        this.bool = bool;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteSource.java
index d10a76a8b..232cfae93 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class ByteSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteTarget.java
index 37a9e2e77..14214a073 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class ByteTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteWrapperSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteWrapperSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteWrapperSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteWrapperSource.java
index 860aeb1c1..3dc1eadbf 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteWrapperSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteWrapperSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class ByteWrapperSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteWrapperTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteWrapperTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteWrapperTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteWrapperTarget.java
index de7f74c5a..9c409fe95 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ByteWrapperTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ByteWrapperTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class ByteWrapperTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java
new file mode 100644
index 000000000..2f4485d28
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java
@@ -0,0 +1,55 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.conversion.nativetypes;
+
+import org.mapstruct.ap.testutil.MapperTestBase;
+import org.mapstruct.ap.testutil.WithClasses;
+import org.testng.annotations.Test;
+
+import static org.fest.assertions.Assertions.assertThat;
+
+@WithClasses({
+    CharSource.class,
+    CharTarget.class,
+    CharMapper.class
+})
+public class CharConversionTest extends MapperTestBase {
+
+    @Test
+    public void shouldApplyCharConversion() {
+        CharSource source = new CharSource();
+        source.setC( 'G' );
+
+        CharTarget target = CharMapper.INSTANCE.sourceToTarget( source );
+
+        assertThat( target ).isNotNull();
+        assertThat( target.getC() ).isEqualTo( Character.valueOf( 'G' ) );
+    }
+
+    @Test
+    public void shouldApplyReverseCharConversion() {
+        CharTarget target = new CharTarget();
+        target.setC( Character.valueOf( 'G' ) );
+
+        CharSource source = CharMapper.INSTANCE.targetToSource( target );
+
+        assertThat( source ).isNotNull();
+        assertThat( source.getC() ).isEqualTo( 'G' );
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharMapper.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharMapper.java
new file mode 100644
index 000000000..b1eaa86be
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharMapper.java
@@ -0,0 +1,32 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.conversion.nativetypes;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mappers;
+
+@Mapper
+public interface CharMapper {
+
+    public static CharMapper INSTANCE = Mappers.getMapper( CharMapper.class );
+
+    CharTarget sourceToTarget(CharSource source);
+
+    CharSource targetToSource(CharTarget target);
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharSource.java
new file mode 100644
index 000000000..f9e189847
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharSource.java
@@ -0,0 +1,32 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.conversion.nativetypes;
+
+public class CharSource {
+
+    private char c;
+
+    public char getC() {
+        return c;
+    }
+
+    public void setC(char c) {
+        this.c = c;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharTarget.java
new file mode 100644
index 000000000..ebdd96f40
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharTarget.java
@@ -0,0 +1,32 @@
+/**
+ *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.conversion.nativetypes;
+
+public class CharTarget {
+
+    private Character c;
+
+    public Character getC() {
+        return c;
+    }
+
+    public void setC(Character c) {
+        this.c = c;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleSource.java
index fcccb9c70..fc51138ff 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class DoubleSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleTarget.java
index 2e0105408..0564ddce1 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class DoubleTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleWrapperSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleWrapperSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleWrapperSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleWrapperSource.java
index 9231fc7b7..5d9d6e854 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleWrapperSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleWrapperSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class DoubleWrapperSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleWrapperTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleWrapperTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleWrapperTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleWrapperTarget.java
index 678e9087d..9a177da46 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/DoubleWrapperTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/DoubleWrapperTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class DoubleWrapperTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatSource.java
index 2436d6501..98e799289 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class FloatSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatTarget.java
index 09109103c..1889ccddf 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class FloatTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatWrapperSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatWrapperSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatWrapperSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatWrapperSource.java
index 0ee85010a..bb2668878 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatWrapperSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatWrapperSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class FloatWrapperSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatWrapperTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatWrapperTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatWrapperTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatWrapperTarget.java
index d0f812ac6..7772e78fd 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/FloatWrapperTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/FloatWrapperTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class FloatWrapperTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntSource.java
index fd101e0bd..47552e8d5 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class IntSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntTarget.java
index 890e42bd4..979a721b2 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class IntTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntWrapperSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntWrapperSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntWrapperSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntWrapperSource.java
index 3625e0cc3..ba7aeae56 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntWrapperSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntWrapperSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class IntWrapperSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntWrapperTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntWrapperTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntWrapperTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntWrapperTarget.java
index 963f7c4db..e9b2fb6e9 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/IntWrapperTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/IntWrapperTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class IntWrapperTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongSource.java
index 4e2bce0a1..c302b4631 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class LongSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongTarget.java
index 318534105..478611fa4 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class LongTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongWrapperSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongWrapperSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongWrapperSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongWrapperSource.java
index 21d828c79..d50e1c074 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongWrapperSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongWrapperSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class LongWrapperSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongWrapperTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongWrapperTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongWrapperTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongWrapperTarget.java
index a7b2a6a5e..e2f5c4bd9 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/LongWrapperTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/LongWrapperTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class LongWrapperTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/NumberConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
similarity index 99%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/NumberConversionTest.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
index e240c9a68..c86f1dc25 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/NumberConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 import org.mapstruct.ap.testutil.MapperTestBase;
 import org.mapstruct.ap.testutil.WithClasses;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortSource.java
index 4ceb652be..8b2464f96 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class ShortSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortTarget.java
index 6762094b4..c96faa6ce 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class ShortTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortWrapperSource.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortWrapperSource.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortWrapperSource.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortWrapperSource.java
index 1f8992765..7b133fd6a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortWrapperSource.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortWrapperSource.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class ShortWrapperSource {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortWrapperTarget.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortWrapperTarget.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortWrapperTarget.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortWrapperTarget.java
index 8ae66f1b3..beaa3d7af 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/ShortWrapperTarget.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/ShortWrapperTarget.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 public class ShortWrapperTarget {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/SourceTargetMapper.java
similarity index 97%
rename from processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/SourceTargetMapper.java
rename to processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/SourceTargetMapper.java
index 9ff1fdbee..1a71d74da 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/numbers/SourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/SourceTargetMapper.java
@@ -16,7 +16,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.mapstruct.ap.test.conversion.numbers;
+package org.mapstruct.ap.test.conversion.nativetypes;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mappers;