Fix a number of style and name issues