[TASK] Migrate to using namespace core class names