Variable names fix