various naming convention changes