Change: Small renames in comp/render code for consistency.