Allow more complex fieldname to use underscore case which is cleaner
Allow mapping without prefix