Rename delimiter identifiers

This pull request mainly renames identifiers related to delimiters. In my opinion, it makes the code easier to understand.