Renaming and code review fixes
More code review fixes