naming convention restored