Merge "[Manual] Rename methods and classes"