Fix Farm naming

Change-Id: Ibced092fc241f813b83865e3450ce2668e9fefbb
Merge "Fix Farm naming"