rename some constants to be shorter and update doc