GCP-5157 (refactor classname)