Issue 17 supporting model field naming conventions