[TASK] Refactor If scope ClassAliasMap