The rest of the renaming
Fix specs for new name