Small fixes for naming consistency.