Merge "Removes unnecessary class prefixes for cleaner code referencing" into main