Better names
Fixing Merge Conflict.