Change "Core" to "Nucleus".  Code cleanup.