Context rename and minor updates.