Code Review: Short name consistency.