Variable names have been refactored