Merge "[Magnifier-69] Some cleanup in API names and docs"