naming review and comments update