Renamed variable names to match UI texts