Fix API referencing core classes