Updates in naming and a few other fixes
Fixing conflicts.