Variable names fixed for consistency