Migrate some core stuff to camelCase