Rename X core base class to Basic