HSEARCH-472 Renaming variables