Aligning naming convention.