Fixed bug in variable name consistency