Refactor: few renames in renderer