fix bug, rename variables in core