A few name improvements for everyday stuff