Updating names to use lower case.

Also working on merge, currently broken.