Some Naming convention changes