[!!!][TASK] Remove deprecated class aliases