Fixed names that didn't adhere to convention.