Rename to make more regular.
Made the identifiers more regular.