Fixed calculated variable names