Use lower case notation for objects consistently

To complete #483. I hope I caught all of them now.