Rename more instances of 'devise'