Changed hash-related names to avoid conflicts