Some style & naming updates