renaming changes because of core/core.h