Changed a variable name in common-defs for clarification