Fixed unintentional class renames