Fixed core names