Altered variable names so we no longer used system reserved names