Bug Fix variable names