Rename "Type" to "Field"
Small fixes