Updated to new core (package and name changes).