Variable names fixed