Use stronger language
Prevent possible confusion
Move definitions to the proper section