Rename variables and constants.
README updated