Changing hash-related names to eliminate conflict (missed one)