Fix more Naming Conventions