Finished replacing old references of 'base_' methods