Fixed Core names + types