naming convention changes