Updated variable definitions

 following up on 53878e9b8242300462f89cd0fa8b96fbc3baea9b