Conform to naming conventions a bit better