Improve some verbose names