[CLEANUP] Use class aliases

Use class aliases where possible

Change-Id: I24a0ed933349ce72d84261362b20006618f23a86
Releases: 0.4.0
Resolves: #59156
Merge "[CLEANUP] Use class aliases"