Changed strings "this" and "name" into subject/selector keys.