Renaming a few things that have bothering me.