Update to project code conventions.

I left some thing unchanged because I dont want to unintentionally break the code.