Fix more dumb naming and commenting conventions