@emir-hasanbegovic/@anthony-tarantini [#68569190] made name changes in Sample App