Change constant naming and doc

Change constant naming and doc