Updated naming to folow some of Google'sstyle guidelines.