Fixed some composed variable names