Reverting core rename, since it doesn't work yet. And switched to new versioning.