Minor updates regarding naming convention.