Fixed issue with core object naming