VE-742 Updates from code review
Code review changes:
 * Rename variables
 * Add constant and rename preference