Renaming a few things to make more sense and to stick to conventions.