Fixing conflicted field name

Still in the middle of Fixing Issue #3.