Fixed bug, that new name-resolution was not used for define and changed that it will be used for every reference to the class / define name.