enhance constant naming