Rename "type value" to "type" in most cases